NewLife
/
XCode
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/NewLifeX/NewLife.XCode 

* 'master' of https://github.com/NewLifeX/NewLife.XCode:
  修复sqlite在更新已有数据表时，会运未修改列的修改sql语句的问题
This commit is contained in:
猿人易 2025-07-25 13:23:53 +08:00
parent 67734969d6 fda0a8c3be
commit 5ff79628e6
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
XCode/DataAccessLayer/Database/SQLite.cs
View File

@ -549,12 +549,8 @@ internal class SQLiteMetaData : FileDbMetaData
return list;
}
static readonly Regex _reg = new("""
(?:^|,)\s*(\[\w+\]|\w+)
\s*(\w+(?:\(\d+(?:,\s*\d+)?\))?)
\s*([^,]*)?
""",
RegexOptions.Singleline | RegexOptions.IgnorePatternWhitespace | RegexOptions.Multiline | RegexOptions.IgnoreCase);
static readonly Regex _reg = new("""(?:^|,)\s*("[^"]+"|\[\w+\]|\w+)\s*(\w+(?:\(\d+(?:,\s*\d+)?\))?)\s*([^,]*)?""",
RegexOptions.Singleline | RegexOptions.IgnorePatternWhitespace | RegexOptions.Multiline | RegexOptions.IgnoreCase);
public void ParseColumns(IDataTable table, String sqlCreateTable)
{
if (sqlCreateTable.StartsWithIgnoreCase("create table"))
@ -579,10 +575,17 @@ internal class SQLiteMetaData : FileDbMetaData
var str = m.Groups[3].Value;
if (str.Contains("AUTOINCREMENT")) field.Identity = true;
if (str.Contains("Primary Key")) field.PrimaryKey = true;
//增加PRIMARY KEY大写判断
if (str.Contains("Primary Key") || str.Contains("PRIMARY KEY")) field.PrimaryKey = true;
if (str.Contains("NOT NULL"))
{
field.Nullable = false;
if (str.Contains("DEFAULT"))
{//增加默认值读取
field.DefaultValue = str.Split("DEFAULT")[1].Split(" ")[1].Trim('\'');
}
}
else if (str.Contains("NULL"))
field.Nullable = true;