From b1045def04bd5ede78c72eeb98c7291b1bf2d031 Mon Sep 17 00:00:00 2001
From: xingheng <xingheng.yu@hexagon.com>
Date: Mon, 8 Sep 2025 13:16:11 +0800
Subject: [PATCH] =?UTF-8?q?schema=E5=B7=A5=E5=85=B7=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E4=BA=86=E6=AD=A3=E5=88=99=E8=A1=A8=E8=BE=BE=E5=BC=8F=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SWSDBSchemeUpgradeTool/MainWindow.xaml.cs     |   6 +++---
 .../SWSDBSchemeUpgradeTool.csproj             |   2 +-
 ...gnTimeResolveAssemblyReferencesInput.cache | Bin 2626 -> 2660 bytes
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/SWSDBSchemeUpgradeTool/MainWindow.xaml.cs b/SWSDBSchemeUpgradeTool/MainWindow.xaml.cs
index f494959b..2b390c0b 100644
--- a/SWSDBSchemeUpgradeTool/MainWindow.xaml.cs
+++ b/SWSDBSchemeUpgradeTool/MainWindow.xaml.cs
@@ -528,8 +528,8 @@ WHERE
             var subsql = sql.Split(';');
             #region 处理
             // 正则表达式
-            string pattern = @"(?<=ALTER\s+TABLE\s+`)[^`]+";
-            string pattern2 = @"(?<=CREATE\s+TABLE\s+`)[^`]+";
+            string pattern = @"(?i)\balter\s+table\s+[`']?([a-zA-Z0-9_]+)[`']?";
+            string pattern2 = @"(?i)\bcreate\s+table\s+[`']?([a-zA-Z0-9_]+)[`']?";
             int patternType;//1是create，0是update
             foreach (var sqlstr in subsql)
             {
@@ -554,7 +554,7 @@ WHERE
                 if (match.Length == 0 )
                 {
                     //无效的sql
-                    LogInfo(baseDirectory + logFileName, $"无法从{SQLFILENAME}.sql文件中解析出正确的create table 或 update table。确保是有效的sql。文本为 {sqlstr}");
+                    LogInfo(baseDirectory + logFileName, $"无法从{SQLFILENAME}文件中解析出正确的create table 或 update table。确保是有效的sql。文本为 {sqlstr}");
                     continue;
                 }
                 var groupMatch = Regex.Matches(sqlstr, pattern);
diff --git a/SWSDBSchemeUpgradeTool/SWSDBSchemeUpgradeTool.csproj b/SWSDBSchemeUpgradeTool/SWSDBSchemeUpgradeTool.csproj
index 98abcdbc..972e5af6 100644
--- a/SWSDBSchemeUpgradeTool/SWSDBSchemeUpgradeTool.csproj
+++ b/SWSDBSchemeUpgradeTool/SWSDBSchemeUpgradeTool.csproj
@@ -20,7 +20,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
+    <OutputPath>..\..\..\..\IIS\SWS\UpgradeTool\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
diff --git a/SWSDBSchemeUpgradeTool/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/SWSDBSchemeUpgradeTool/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index e737de173c656e06f2e3d534f645b13e524dcfcb..28eef7d0345f6c92cf74aced1335a477fef4b344 100644
GIT binary patch
delta 89
zcmX>k@<e2UG^73G01g9zg2d$P#Prl+z2yA7w9IrLkl@5PnaTbfhTM(?1yJG4$&4(a
m8^1)ei;Fv3#dvxK#{`E5$AlK77bT{ohUDkxZ0_XP$p`>NW*&zC

delta 63
zcmaDNa!6!?G^57k4UCE$ddc~DX_@J!K#t_Z9vMbu5M$%b-Rz83Al767PI1np%)A(v
O)TGk%&8s<fG6Ddl>J>}?