From b915617e3afc034bbb6151fe47ab1e8fefd8f0e3 Mon Sep 17 00:00:00 2001
From: haib0 <108716495+haib0@users.noreply.github.com>
Date: Thu, 28 Dec 2023 16:52:39 +0800
Subject: [PATCH] fix the redundant space when convert to pivot table with
 multiple row selector

---
 Src/Asp.Net/SqlSugar/Utilities/DataTableExtensions.cs        | 4 +++-
 Src/Asp.NetCore2/SqlSugar/Utilities/DataTableExtensions.cs   | 4 +++-
 Src/OracleUS7ASCII/SqlSugar/Utilities/DataTableExtensions.cs | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/Src/Asp.Net/SqlSugar/Utilities/DataTableExtensions.cs b/Src/Asp.Net/SqlSugar/Utilities/DataTableExtensions.cs
index 1ffa1d148..08ee0da61 100644
--- a/Src/Asp.Net/SqlSugar/Utilities/DataTableExtensions.cs
+++ b/Src/Asp.Net/SqlSugar/Utilities/DataTableExtensions.cs
@@ -62,7 +62,9 @@ namespace SqlSugar
                 foreach (DataRow row in table.Rows)
                 {
                     var json =row[firstName];
-                    var list = json.ToString().TrimStart('{').TrimEnd('}').Split(',').Select(it=>it.Split('=')).ToList();
+                    var list = json.ToString().TrimStart('{', ' ').TrimEnd('}', ' ')
+                        .Split(new[] { ", " }, StringSplitOptions.None)
+                        .Select(it => it.Split(new[] { " = " }, StringSplitOptions.None)).ToList();
                     foreach (var item in Regex.Split(firstName, UtilConstants.ReplaceKey))
                     {
                         var x = list.First(it => it.First().Trim() == item.Trim());
diff --git a/Src/Asp.NetCore2/SqlSugar/Utilities/DataTableExtensions.cs b/Src/Asp.NetCore2/SqlSugar/Utilities/DataTableExtensions.cs
index 1ffa1d148..08ee0da61 100644
--- a/Src/Asp.NetCore2/SqlSugar/Utilities/DataTableExtensions.cs
+++ b/Src/Asp.NetCore2/SqlSugar/Utilities/DataTableExtensions.cs
@@ -62,7 +62,9 @@ namespace SqlSugar
                 foreach (DataRow row in table.Rows)
                 {
                     var json =row[firstName];
-                    var list = json.ToString().TrimStart('{').TrimEnd('}').Split(',').Select(it=>it.Split('=')).ToList();
+                    var list = json.ToString().TrimStart('{', ' ').TrimEnd('}', ' ')
+                        .Split(new[] { ", " }, StringSplitOptions.None)
+                        .Select(it => it.Split(new[] { " = " }, StringSplitOptions.None)).ToList();
                     foreach (var item in Regex.Split(firstName, UtilConstants.ReplaceKey))
                     {
                         var x = list.First(it => it.First().Trim() == item.Trim());
diff --git a/Src/OracleUS7ASCII/SqlSugar/Utilities/DataTableExtensions.cs b/Src/OracleUS7ASCII/SqlSugar/Utilities/DataTableExtensions.cs
index 1ffa1d148..08ee0da61 100644
--- a/Src/OracleUS7ASCII/SqlSugar/Utilities/DataTableExtensions.cs
+++ b/Src/OracleUS7ASCII/SqlSugar/Utilities/DataTableExtensions.cs
@@ -62,7 +62,9 @@ namespace SqlSugar
                 foreach (DataRow row in table.Rows)
                 {
                     var json =row[firstName];
-                    var list = json.ToString().TrimStart('{').TrimEnd('}').Split(',').Select(it=>it.Split('=')).ToList();
+                    var list = json.ToString().TrimStart('{', ' ').TrimEnd('}', ' ')
+                        .Split(new[] { ", " }, StringSplitOptions.None)
+                        .Select(it => it.Split(new[] { " = " }, StringSplitOptions.None)).ToList();
                     foreach (var item in Regex.Split(firstName, UtilConstants.ReplaceKey))
                     {
                         var x = list.First(it => it.First().Trim() == item.Trim());