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 @@
true
full
false
- bin\Debug\
+ ..\..\..\..\IIS\SWS\UpgradeTool\
DEBUG;TRACE
prompt
4
diff --git a/SWSDBSchemeUpgradeTool/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/SWSDBSchemeUpgradeTool/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index e737de17..28eef7d0 100644
Binary files a/SWSDBSchemeUpgradeTool/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/SWSDBSchemeUpgradeTool/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ