tk/FreeSql
1
0
Fork 0
mirror of https://github.com/nsnail/FreeSql.git synced 2025-04-22 18:52:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

v3.2.687-preview20230119 pgsql15.0 Version 处理

Browse Source
This commit is contained in:
2881099 2023-01-17 21:37:38 +08:00
parent cecb08b977
commit c6f0e4455f
34 changed files with 89 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Directory.Build.props
View File

@ -11,7 +11,7 @@
<!--
经常出于版本交叉问题，暂时关闭，在每个项目上设置版本号
<PropertyGroup>
<Version>3.2.687-preview20230118</Version>
<Version>3.2.687-preview20230119</Version>
</PropertyGroup>
-->

2
Extensions/FreeSql.Extensions.BaseEntity/FreeSql.Extensions.BaseEntity.csproj
View File

@ -19,7 +19,7 @@
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
<DelaySign>false</DelaySign>
<LangVersion>latest</LangVersion>
<Version>3.2.687-preview20230118</Version>
<Version>3.2.687-preview20230119</Version>
</PropertyGroup>
<ItemGroup>

2
Extensions/FreeSql.Extensions.JsonMap/FreeSql.Extensions.JsonMap.csproj
View File

@ -18,7 +18,7 @@
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
<DelaySign>false</DelaySign>
<Version>3.2.687-preview20230118</Version>
<Version>3.2.687-preview20230119</Version>
</PropertyGroup>
<ItemGroup>

2
Extensions/FreeSql.Extensions.LazyLoading/FreeSql.Extensions.LazyLoading.csproj
View File

@ -15,7 +15,7 @@
<Title>$(AssemblyName)</Title>
<IsPackable>true</IsPackable>
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
<Version>3.2.687-preview20230118</Version>
<Version>3.2.687-preview20230119</Version>
</PropertyGroup>
<ItemGroup>

2
Extensions/FreeSql.Extensions.Linq/FreeSql.Extensions.Linq.csproj
View File

@ -18,7 +18,7 @@
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
<DelaySign>false</DelaySign>
<Version>3.2.687-preview20230118</Version>
<Version>3.2.687-preview20230119</Version>
</PropertyGroup>
<ItemGroup>

2
Extensions/FreeSql.Generator/FreeSql.Generator.csproj
View File

@ -13,7 +13,7 @@
<PackageProjectUrl>https://github.com/2881099/FreeSql</PackageProjectUrl>
<RepositoryUrl>https://github.com/2881099/FreeSql</RepositoryUrl>
<PackageTags>FreeSql DbFirst 实体生成器</PackageTags>
<Version>3.2.687-preview20230118</Version>
<Version>3.2.687-preview20230119</Version>
</PropertyGroup>
<ItemGroup>

2
FreeSql.All/FreeSql.All.csproj
View File

@ -17,7 +17,7 @@
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
<DelaySign>false</DelaySign>
<Version>3.2.687-preview20230118</Version>
<Version>3.2.687-preview20230119</Version>
</PropertyGroup>
<ItemGroup>

2
FreeSql.DbContext/FreeSql.DbContext.csproj
View File

@ -17,7 +17,7 @@
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
<DelaySign>false</DelaySign>
<Version>3.2.687-preview20230118</Version>
<Version>3.2.687-preview20230119</Version>
</PropertyGroup>
<ItemGroup>

2
FreeSql.Repository/FreeSql.Repository.csproj
View File

@ -17,7 +17,7 @@
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
<DelaySign>false</DelaySign>
<Version>3.2.687-preview20230118</Version>
<Version>3.2.687-preview20230119</Version>
</PropertyGroup>
<ItemGroup>

2
FreeSql/FreeSql.csproj
View File

@ -17,7 +17,7 @@
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
<DelaySign>false</DelaySign>
<Version>3.2.687-preview20230118</Version>
<Version>3.2.687-preview20230119</Version>
</PropertyGroup>
<ItemGroup>

2
Providers/FreeSql.Provider.ClickHouse/FreeSql.Provider.ClickHouse.csproj
View File

@ -19,7 +19,7 @@
<SignAssembly>False</SignAssembly>
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
<DelaySign>false</DelaySign>
<Version>3.2.687-preview20230118</Version>
<Version>3.2.687-preview20230119</Version>
</PropertyGroup>
<ItemGroup>

2
Providers/FreeSql.Provider.Custom/FreeSql.Provider.Custom.csproj
View File

@ -18,7 +18,7 @@
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
<DelaySign>false</DelaySign>
<Version>3.2.687-preview20230118</Version>
<Version>3.2.687-preview20230119</Version>
</PropertyGroup>
<ItemGroup>

4
Providers/FreeSql.Provider.Custom/PostgreSQL/CustomPostgreSQLCodeFirst.cs
View File

@ -89,8 +89,8 @@ namespace FreeSql.Custom.PostgreSQL
var isPg10 = (_orm.DbFirst as CustomPostgreSQLDbFirst).IsPg10;
using (var conn = _orm.Ado.MasterPool.Get(TimeSpan.FromSeconds(5)))
{
isPg95 = CustomPostgreSQLDbFirst.PgVersionIs(conn.Value.ServerVersion, 9, 5);
isPg96 = CustomPostgreSQLDbFirst.PgVersionIs(conn.Value.ServerVersion, 9, 6);
isPg95 = CustomPostgreSQLDbFirst.ParsePgVersion(conn.Value.ServerVersion, 9, 5).Item1;
isPg96 = CustomPostgreSQLDbFirst.ParsePgVersion(conn.Value.ServerVersion, 9, 6).Item1;
}
foreach (var obj in objects)

26
Providers/FreeSql.Provider.Custom/PostgreSQL/CustomPostgreSQLDbFirst.cs
View File

@ -32,7 +32,7 @@ namespace FreeSql.Custom.PostgreSQL
{
try
{
_ServerVersionValue = int.Parse(conn.Value.ServerVersion.Split('.')[0]);
_ServerVersionValue = ParsePgVersion(conn.Value.ServerVersion, 10, 0).Item2;
}
catch
{
@ -148,7 +148,7 @@ namespace FreeSql.Custom.PostgreSQL
using (var conn = _orm.Ado.MasterPool.Get(TimeSpan.FromSeconds(5)))
{
olddatabase = conn.Value.Database;
is96 = PgVersionIs(conn.Value.ServerVersion, 9, 6);
is96 = ParsePgVersion(conn.Value.ServerVersion, 9, 6).Item1;
}
string[] tbname = null;
string[] dbs = database == null || database.Any() == false ? new[] { olddatabase } : database;
@ -542,13 +542,23 @@ where a.typtype = 'e' and ns.nspname in (SELECT ""schema_name"" FROM information
return ret.Select(a => new DbEnumInfo { Name = a.Key, Labels = a.Value }).ToList();
}
public static bool PgVersionIs(string serverVersion, int version1, int version2 = 0)
public static NativeTuple<bool, int, int> ParsePgVersion(string versionString, int v1, int v2)
{
int[] version = serverVersion.Split('.').Select(a => int.TryParse(a, out var tryint) ? tryint : 0).ToArray();
if (version?.Any() != true) return true;
if (version[0] > version1) return true;
if (version[0] == version1 && version.Length > 1 && version[1] >= version2) return true;
return false;
int[] version = new int[] { 0, 0 };
var vmatch = Regex.Match(versionString, @"(\d+)\.(\d+)");
if (vmatch.Success)
{
version[0] = int.Parse(vmatch.Groups[1].Value);
version[1] = int.Parse(vmatch.Groups[2].Value);
}
else
{
vmatch = Regex.Match(versionString, @"(\d+)");
version[0] = int.Parse(vmatch.Groups[1].Value);
}
if (version[0] > v1) return NativeTuple.Create(true, version[0], version[1]);
if (version[0] == v1 && version[1] >= v2) return NativeTuple.Create(true, version[0], version[1]);
return NativeTuple.Create(false, version[0], version[1]);
}
}
}

2
Providers/FreeSql.Provider.Dameng/FreeSql.Provider.Dameng.csproj
View File

@ -15,7 +15,7 @@
<Title>$(AssemblyName)</Title>
<IsPackable>true</IsPackable>
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
<Version>3.2.687-preview20230118</Version>
<Version>3.2.687-preview20230119</Version>
</PropertyGroup>
<ItemGroup>

2
Providers/FreeSql.Provider.Firebird/FreeSql.Provider.Firebird.csproj
View File

@ -18,7 +18,7 @@
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
<DelaySign>false</DelaySign>
<Version>3.2.687-preview20230118</Version>
<Version>3.2.687-preview20230119</Version>
</PropertyGroup>
<ItemGroup>

2
Providers/FreeSql.Provider.GBase/FreeSql.Provider.GBase.csproj
View File

@ -18,7 +18,7 @@
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
<DelaySign>false</DelaySign>
<Version>3.2.687-preview20230118</Version>
<Version>3.2.687-preview20230119</Version>
</PropertyGroup>
<ItemGroup>

2
Providers/FreeSql.Provider.KingbaseES/FreeSql.Provider.KingbaseES.csproj
View File

@ -15,7 +15,7 @@
<Title>$(AssemblyName)</Title>
<IsPackable>true</IsPackable>
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
<Version>3.2.687-preview20230118</Version>
<Version>3.2.687-preview20230119</Version>
</PropertyGroup>
<ItemGroup>

2
Providers/FreeSql.Provider.MsAccess/FreeSql.Provider.MsAccess.csproj
View File

@ -18,7 +18,7 @@
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
<DelaySign>false</DelaySign>
<Version>3.2.687-preview20230118</Version>
<Version>3.2.687-preview20230119</Version>
</PropertyGroup>
<ItemGroup>

2
Providers/FreeSql.Provider.MySql/FreeSql.Provider.MySql.csproj
View File

@ -18,7 +18,7 @@
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
<DelaySign>false</DelaySign>
<Version>3.2.687-preview20230118</Version>
<Version>3.2.687-preview20230119</Version>
</PropertyGroup>
<ItemGroup>

2
Providers/FreeSql.Provider.MySqlConnector/FreeSql.Provider.MySqlConnector.csproj
View File

@ -18,7 +18,7 @@
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
<DelaySign>false</DelaySign>
<Version>3.2.687-preview20230118</Version>
<Version>3.2.687-preview20230119</Version>
</PropertyGroup>
<ItemGroup>

2
Providers/FreeSql.Provider.Odbc/FreeSql.Provider.Odbc.csproj
View File

@ -18,7 +18,7 @@
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
<DelaySign>false</DelaySign>
<Version>3.2.687-preview20230118</Version>
<Version>3.2.687-preview20230119</Version>
</PropertyGroup>
<ItemGroup>

4
Providers/FreeSql.Provider.Odbc/PostgreSQL/OdbcPostgreSQLCodeFirst.cs
View File

@ -90,8 +90,8 @@ namespace FreeSql.Odbc.PostgreSQL
var isPg10 = (_orm.DbFirst as OdbcPostgreSQLDbFirst).IsPg10;
using (var conn = _orm.Ado.MasterPool.Get(TimeSpan.FromSeconds(5)))
{
isPg95 = OdbcPostgreSQLDbFirst.PgVersionIs(conn.Value.ServerVersion, 9, 5);
isPg96 = OdbcPostgreSQLDbFirst.PgVersionIs(conn.Value.ServerVersion, 9, 6);
isPg95 = OdbcPostgreSQLDbFirst.ParsePgVersion(conn.Value.ServerVersion, 9, 5).Item1;
isPg96 = OdbcPostgreSQLDbFirst.ParsePgVersion(conn.Value.ServerVersion, 9, 6).Item1;
}
foreach (var obj in objects)

26
Providers/FreeSql.Provider.Odbc/PostgreSQL/OdbcPostgreSQLDbFirst.cs
View File

@ -33,7 +33,7 @@ namespace FreeSql.Odbc.PostgreSQL
{
try
{
_ServerVersionValue = int.Parse(conn.Value.ServerVersion.Split('.')[0]);
_ServerVersionValue = ParsePgVersion(conn.Value.ServerVersion, 10, 0).Item2;
}
catch
{
@ -142,7 +142,7 @@ namespace FreeSql.Odbc.PostgreSQL
using (var conn = _orm.Ado.MasterPool.Get(TimeSpan.FromSeconds(5)))
{
olddatabase = conn.Value.Database;
is96 = PgVersionIs(conn.Value.ServerVersion, 9, 6);
is96 = ParsePgVersion(conn.Value.ServerVersion, 9, 6).Item1;
}
string[] tbname = null;
string[] dbs = database == null || database.Any() == false ? new[] { olddatabase } : database;
@ -536,13 +536,23 @@ where a.typtype = 'e' and ns.nspname in (SELECT ""schema_name"" FROM information
return ret.Select(a => new DbEnumInfo { Name = a.Key, Labels = a.Value }).ToList();
}
public static bool PgVersionIs(string serverVersion, int version1, int version2 = 0)
public static NativeTuple<bool, int, int> ParsePgVersion(string versionString, int v1, int v2)
{
int[] version = serverVersion.Split('.').Select(a => int.TryParse(a, out var tryint) ? tryint : 0).ToArray();
if (version?.Any() != true) return true;
if (version[0] > version1) return true;
if (version[0] == version1 && version.Length > 1 && version[1] >= version2) return true;
return false;
int[] version = new int[] { 0, 0 };
var vmatch = Regex.Match(versionString, @"(\d+)\.(\d+)");
if (vmatch.Success)
{
version[0] = int.Parse(vmatch.Groups[1].Value);
version[1] = int.Parse(vmatch.Groups[2].Value);
}
else
{
vmatch = Regex.Match(versionString, @"(\d+)");
version[0] = int.Parse(vmatch.Groups[1].Value);
}
if (version[0] > v1) return NativeTuple.Create(true, version[0], version[1]);
if (version[0] == v1 && version[1] >= v2) return NativeTuple.Create(true, version[0], version[1]);
return NativeTuple.Create(false, version[0], version[1]);
}
}
}

2
Providers/FreeSql.Provider.Oracle/FreeSql.Provider.Oracle.csproj
View File

@ -18,7 +18,7 @@
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
<DelaySign>false</DelaySign>
<Version>3.2.687-preview20230118</Version>
<Version>3.2.687-preview20230119</Version>
</PropertyGroup>
<ItemGroup>

2
Providers/FreeSql.Provider.OracleOledb/FreeSql.Provider.OracleOledb.csproj
View File

@ -18,7 +18,7 @@
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
<DelaySign>false</DelaySign>
<Version>3.2.687-preview20230118</Version>
<Version>3.2.687-preview20230119</Version>
</PropertyGroup>
<ItemGroup>

2
Providers/FreeSql.Provider.PostgreSQL/FreeSql.Provider.PostgreSQL.csproj
View File

@ -18,7 +18,7 @@
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
<DelaySign>false</DelaySign>
<Version>3.2.687-preview20230118</Version>
<Version>3.2.687-preview20230119</Version>
</PropertyGroup>
<ItemGroup>

4
Providers/FreeSql.Provider.PostgreSQL/PostgreSQLCodeFirst.cs
View File

@ -139,8 +139,8 @@ namespace FreeSql.PostgreSQL
var isPg10 = (_orm.DbFirst as PostgreSQLDbFirst).IsPg10;
using (var conn = _orm.Ado.MasterPool.Get(TimeSpan.FromSeconds(5)))
{
isPg95 = PostgreSQLDbFirst.PgVersionIs(conn.Value.ServerVersion, 9, 5);
isPg96 = PostgreSQLDbFirst.PgVersionIs(conn.Value.ServerVersion, 9, 6);
isPg95 = PostgreSQLDbFirst.ParsePgVersion(conn.Value.ServerVersion, 9, 5).Item1;
isPg96 = PostgreSQLDbFirst.ParsePgVersion(conn.Value.ServerVersion, 9, 6).Item1;
}
foreach (var obj in objects)

27
Providers/FreeSql.Provider.PostgreSQL/PostgreSQLDbFirst.cs
View File

@ -1,5 +1,6 @@
using FreeSql.DatabaseModel;
using FreeSql.Internal;
using FreeSql.Internal.Model;
using Newtonsoft.Json.Linq;
using Npgsql.LegacyPostgis;
using NpgsqlTypes;
@ -37,7 +38,7 @@ namespace FreeSql.PostgreSQL
{
try
{
_ServerVersionValue = int.Parse(conn.Value.ServerVersion.Split('.')[0]);
_ServerVersionValue = ParsePgVersion(conn.Value.ServerVersion, 10, 0).Item2;
}
catch
{
@ -250,7 +251,7 @@ namespace FreeSql.PostgreSQL
using (var conn = _orm.Ado.MasterPool.Get(TimeSpan.FromSeconds(5)))
{
olddatabase = conn.Value.Database;
is96 = PgVersionIs(conn.Value.ServerVersion, 9, 6);
is96 = ParsePgVersion(conn.Value.ServerVersion, 9, 6).Item1;
}
string[] tbname = null;
string[] dbs = database == null || database.Any() == false ? new[] { olddatabase } : database;
@ -639,13 +640,23 @@ where a.typtype = 'e' and ns.nspname in (SELECT ""schema_name"" FROM information
return ret.Select(a => new DbEnumInfo { Name = a.Key, Labels = a.Value }).ToList();
}
public static bool PgVersionIs(string serverVersion, int version1, int version2 = 0)
public static NativeTuple<bool, int, int> ParsePgVersion(string versionString, int v1, int v2)
{
int[] version = serverVersion.Split('.').Select(a => int.TryParse(a, out var tryint) ? tryint : 0).ToArray();
if (version?.Any() != true) return true;
if (version[0] > version1) return true;
if (version[0] == version1 && version.Length > 1 && version[1] >= version2) return true;
return false;
int[] version = new int[] { 0, 0 };
var vmatch = Regex.Match(versionString, @"(\d+)\.(\d+)");
if (vmatch.Success)
{
version[0] = int.Parse(vmatch.Groups[1].Value);
version[1] = int.Parse(vmatch.Groups[2].Value);
}
else
{
vmatch = Regex.Match(versionString, @"(\d+)");
version[0] = int.Parse(vmatch.Groups[1].Value);
}
if (version[0] > v1) return NativeTuple.Create(true, version[0], version[1]);
if (version[0] == v1 && version[1] >= v2) return NativeTuple.Create(true, version[0], version[1]);
return NativeTuple.Create(false, version[0], version[1]);
}
}
}

2
Providers/FreeSql.Provider.ShenTong/FreeSql.Provider.ShenTong.csproj
View File

@ -15,7 +15,7 @@
<Title>$(AssemblyName)</Title>
<IsPackable>true</IsPackable>
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
<Version>3.2.687-preview20230118</Version>
<Version>3.2.687-preview20230119</Version>
</PropertyGroup>
<ItemGroup>

2
Providers/FreeSql.Provider.SqlServer/FreeSql.Provider.SqlServer.csproj
View File

@ -18,7 +18,7 @@
<SignAssembly>true</SignAssembly>
<DelaySign>false</DelaySign>
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
<Version>3.2.687-preview20230118</Version>
<Version>3.2.687-preview20230119</Version>
</PropertyGroup>
<ItemGroup>

2
Providers/FreeSql.Provider.SqlServerForSystem/FreeSql.Provider.SqlServerForSystem.csproj
View File

@ -18,7 +18,7 @@
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
<DelaySign>false</DelaySign>
<Version>3.2.687-preview20230118</Version>
<Version>3.2.687-preview20230119</Version>
</PropertyGroup>
<ItemGroup>

2
Providers/FreeSql.Provider.Sqlite/FreeSql.Provider.Sqlite.csproj
View File

@ -18,7 +18,7 @@
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
<DelaySign>false</DelaySign>
<Version>3.2.687-preview20230118</Version>
<Version>3.2.687-preview20230119</Version>
</PropertyGroup>
<ItemGroup>

2
Providers/FreeSql.Provider.SqliteCore/FreeSql.Provider.SqliteCore.csproj
View File

@ -18,7 +18,7 @@
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
<DelaySign>false</DelaySign>
<Version>3.2.687-preview20230118</Version>
<Version>3.2.687-preview20230119</Version>
</PropertyGroup>
<ItemGroup>