Skip to content

Commit 39b570d

Browse files
vdaronvdaron
committed
Merge branch 'develop'
2 parents ce48f8f + aada50c commit 39b570d

File tree

9 files changed

+19
-17
lines changed

9 files changed

+19
-17
lines changed

‎src/SimpleStack.Orm.MySQL/SimpleStack.Orm.MySQL.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<Version>1.2.0-beta95</Version>
1717
<AssemblyVersion>1.2.0.0</AssemblyVersion>
1818
<FileVersion>1.2.0.0</FileVersion>
19-
<PackageVersion>1.2.0</PackageVersion>
19+
<PackageVersion>1.2.2</PackageVersion>
2020
<PackageProjectUrl>https://simplestack.org/</PackageProjectUrl>
2121
<RepositoryUrl>https://github.com/SimpleStack/simplestack.orm</RepositoryUrl>
2222
<RepositoryType>git</RepositoryType>

‎src/SimpleStack.Orm.MySQLConnector/SimpleStack.Orm.MySQLConnector.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<Version>1.2.0-beta95</Version>
1515
<AssemblyVersion>1.2.0.0</AssemblyVersion>
1616
<FileVersion>1.2.0.0</FileVersion>
17-
<PackageVersion>1.2.0</PackageVersion>
17+
<PackageVersion>1.2.2</PackageVersion>
1818
<TargetFramework>netstandard2.0</TargetFramework>
1919
<PackageProjectUrl>https://simplestack.org/</PackageProjectUrl>
2020
<RepositoryUrl>https://github.com/SimpleStack/simplestack.orm</RepositoryUrl>

‎src/SimpleStack.Orm.PostgreSQL/PostgreSQLDialectProvider.cs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -188,15 +188,16 @@ public override IEnumerable<IColumnDefinition> GetTableColumnDefinitions(IDbConn
188188
FROM pg_index i
189189
JOIN pg_attribute a ON a.attrelid = i.indrelid
190190
AND a.attnum = ANY(i.indkey)
191-
WHERE i.indrelid = '{tableName}'::regclass
191+
WHERE i.indrelid = '{table}'::regclass
192192
AND i.indisprimary;").ToArray();
193193

194194
var uniqueCols = connection.Query($@"SELECT a.attname
195195
FROM pg_index i
196196
JOIN pg_attribute a ON a.attrelid = i.indrelid
197197
AND a.attnum = ANY(i.indkey)
198-
WHERE i.indrelid = '{tableName}'::regclass
198+
WHERE i.indrelid = '{table}'::regclass
199199
AND i.indisunique;").ToArray();
200+
200201
foreach (var c in connection.Query<ColumnInformationSchema>(sqlQuery, new {
201202
TableName = NamingStrategy.GetTableName(tableName),
202203
SchemaName = schemaName == null ? null : NamingStrategy.GetTableName(schemaName) }))
@@ -248,8 +249,8 @@ protected virtual DbType GetDbType(ColumnInformationSchema c)
248249
return DbType.Time;
249250
case "date":
250251
case "timestamp without time zone":
251-
return DbType.DateTime;
252-
case "timestamp whith time zone":
252+
return DbType.DateTime2;
253+
case "timestamp with time zone":
253254
return DbType.DateTimeOffset;
254255
case "money":
255256
return DbType.Currency;

‎src/SimpleStack.Orm.PostgreSQL/SimpleStack.Orm.PostgreSQL.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
1414
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
1515
<Version>1.2.0-beta95</Version>
16-
<AssemblyVersion>1.2.0.0</AssemblyVersion>
17-
<FileVersion>1.2.0.0</FileVersion>
18-
<PackageVersion>1.2.0</PackageVersion>
16+
<AssemblyVersion>1.2.1.0</AssemblyVersion>
17+
<FileVersion>1.2.1.0</FileVersion>
18+
<PackageVersion>1.2.2</PackageVersion>
1919
<PackageProjectUrl>https://simplestack.org/</PackageProjectUrl>
2020
<RepositoryUrl>https://github.com/SimpleStack/simplestack.orm</RepositoryUrl>
2121
</PropertyGroup>
@@ -25,7 +25,7 @@
2525
</ItemGroup>
2626

2727
<ItemGroup>
28-
<PackageReference Include="Npgsql" Version="4.1.3.1" />
28+
<PackageReference Include="Npgsql" Version="4.1.4" />
2929
</ItemGroup>
3030

3131
</Project>

‎src/SimpleStack.Orm.SDSQLite/SimpleStack.Orm.SDSQLite.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Description>SQLite Provider for SimpleStack.Orm based on System.Data.Sqlite</Description>
55
<VersionPrefix>1.0.2</VersionPrefix>
66
<Authors>SimpleStack Team;NServiceKit;ServiceStack</Authors>
7-
<TargetFrameworks>netstandard2.0</TargetFrameworks>
7+
<TargetFramework>netstandard2.0</TargetFramework>
88
<AssemblyName>SimpleStack.Orm.SDSQLite</AssemblyName>
99
<PackageId>SimpleStack.Orm.SDSQLite</PackageId>
1010
<PackageTags>System.Data.Sqlite;SimpleStack;Sqlite</PackageTags>
@@ -15,7 +15,7 @@
1515
<Version>1.2.0-beta95</Version>
1616
<AssemblyVersion>1.2.0.0</AssemblyVersion>
1717
<FileVersion>1.2.0.0</FileVersion>
18-
<PackageVersion>1.2.0</PackageVersion>
18+
<PackageVersion>1.2.2</PackageVersion>
1919
<RootNamespace>SimpleStack.Orm.SDSQlite</RootNamespace>
2020
<PackageProjectUrl>https://simplestack.org/</PackageProjectUrl>
2121
<RepositoryUrl>https://github.com/SimpleStack/simplestack.orm</RepositoryUrl>

‎src/SimpleStack.Orm.SQLServer/SimpleStack.Orm.SQLServer.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<Version>1.2.0-beta95</Version>
1515
<AssemblyVersion>1.2.0.0</AssemblyVersion>
1616
<FileVersion>1.2.0.0</FileVersion>
17-
<PackageVersion>1.2.0</PackageVersion>
17+
<PackageVersion>1.2.2</PackageVersion>
1818
<TargetFramework>netstandard2.0</TargetFramework>
1919
<PackageProjectUrl>https://simplestack.org/</PackageProjectUrl>
2020
<RepositoryUrl>https://github.com/SimpleStack/simplestack.orm</RepositoryUrl>

‎src/SimpleStack.Orm.SQLServer/SqlServerOrmLiteDialectProvider.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ INNER JOIN sys.index_columns AS ic
278278
}
279279
}
280280

281-
private DbType GetDbType(string dataType)
281+
protected virtual DbType GetDbType(string dataType)
282282
{
283283
switch (dataType.ToLower())
284284
{
@@ -308,6 +308,7 @@ private DbType GetDbType(string dataType)
308308
case "varbinary":
309309
return DbType.Binary;
310310
case "numeric":
311+
case "decimal":
311312
return DbType.Decimal;
312313
case "date":
313314
return DbType.Date;

‎src/SimpleStack.Orm.SQLite/SimpleStack.Orm.SQLite.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<Version>1.2.0-beta95</Version>
1616
<AssemblyVersion>1.2.0.0</AssemblyVersion>
1717
<FileVersion>1.2.0.0</FileVersion>
18-
<PackageVersion>1.2.0</PackageVersion>
18+
<PackageVersion>1.2.2</PackageVersion>
1919
<PackageProjectUrl>https://simplestack.org/</PackageProjectUrl>
2020
<RepositoryUrl>https://github.com/SimpleStack/simplestack.orm</RepositoryUrl>
2121
</PropertyGroup>

‎src/SimpleStack.Orm/SimpleStack.Orm.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<PropertyGroup>
3+
<PropertyGroup>
44
<Description>Lite ORM framework based on Dapper and SQL Query Generation from ServiceStack/NServicekit</Description>
55
<VersionPrefix>1.0.2</VersionPrefix>
66
<Authors>SimpleStack Team;NServiceKit;ServiceStack</Authors>
@@ -14,7 +14,7 @@
1414
<GeneratePackageOnBuild>False</GeneratePackageOnBuild>
1515
<AssemblyVersion>1.2.1.0</AssemblyVersion>
1616
<FileVersion>1.2.1.0</FileVersion>
17-
<PackageVersion>1.2.1</PackageVersion>
17+
<PackageVersion>1.2.2</PackageVersion>
1818
<TargetFramework>netstandard2.0</TargetFramework>
1919
<PackageProjectUrl>https://simplestack.org/</PackageProjectUrl>
2020
<RepositoryUrl>https://github.com/SimpleStack/simplestack.orm</RepositoryUrl>

0 commit comments

Comments
 (0)