Skip to content

Commit a60c1b2

Browse files
Ahoo-WangAhoo-Wang
committed
1 parent 9413ec8 commit a60c1b2

7 files changed

Lines changed: 16 additions & 18 deletions

File tree

‎build/version.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<PropertyGroup>
33
<VersionMajor>2</VersionMajor>
44
<VersionMinor>2</VersionMinor>
5-
<VersionPatch>45</VersionPatch>
5+
<VersionPatch>46</VersionPatch>
66
<VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionPatch)</VersionPrefix>
77
</PropertyGroup>
88
</Project>

‎doc/SmartCode.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Output:
1414
Type: File
1515
Path: 'E:\SmartSql-Starter'
1616
Parameters:
17-
SmartSqlVersion: '4.0.42'
17+
SmartSqlVersion: '4.0.46'
1818
SmartSqlSchemaVersion: '4.0.42'
1919
BuildDir: 'E:\SmartSql-Starter\build'
2020
DockerImage: 'smartsql.starter'

‎src/SmartCode.App/SmartCodeOptions.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ public class SmartCodeOptions
99
{
1010
public string Name { get; } = "SmartCode";
1111
public string Author { get; } = "Ahoo Wang";
12-
public string Version { get; set; } = "1.0.0";
1312
public string Github { get; } = "https://github.com/Ahoo-Wang/SmartCode";
1413
public String ConfigPath { get; set; }
1514
public IServiceCollection Services { get; set; } = new ServiceCollection();

‎src/SmartCode.CLI/appsettings.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
}
99
},
1010
"SmartCode": {
11-
"Version": "v2.2.28",
1211
"Plugins": [
1312
{
1413
"Type": "SmartCode.IDataSource,SmartCode",

‎src/SmartCode.Db/SmartCode.Db.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="SmartSql.Options" Version="4.0.42" />
9-
<PackageReference Include="SmartSql.TypeHandler" Version="4.0.42" />
10-
<PackageReference Include="SmartSql.TypeHandler.PostgreSql" Version="4.0.42" />
11-
<PackageReference Include="System.Data.SqlClient" Version="4.6.0" />
8+
<PackageReference Include="SmartSql.Options" Version="4.0.46" />
9+
<PackageReference Include="SmartSql.TypeHandler" Version="4.0.46" />
10+
<PackageReference Include="SmartSql.TypeHandler.PostgreSql" Version="4.0.46" />
11+
<PackageReference Include="System.Data.SqlClient" Version="4.6.1" />
1212
<PackageReference Include="System.Data.SQLite" Version="1.0.110" />
1313
<PackageReference Include="MySql.Data" Version="8.0.16" />
14-
<PackageReference Include="Npgsql" Version="4.0.6" />
15-
<PackageReference Include="Oracle.ManagedDataAccess.Core" Version="2.18.6" />
14+
<PackageReference Include="Npgsql" Version="4.0.7" />
15+
<PackageReference Include="Oracle.ManagedDataAccess.Core" Version="2.19.3" />
1616
</ItemGroup>
1717

1818
<ItemGroup>

‎src/SmartCode.ETL/SmartCode.ETL.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="SmartSql.Bulk.MySql" Version="4.0.42" />
9-
<PackageReference Include="SmartSql.Bulk.PostgreSql" Version="4.0.42" />
10-
<PackageReference Include="SmartSql.Bulk.SqlServer" Version="4.0.42" />
8+
<PackageReference Include="SmartSql.Bulk.MySql" Version="4.0.46" />
9+
<PackageReference Include="SmartSql.Bulk.PostgreSql" Version="4.0.46" />
10+
<PackageReference Include="SmartSql.Bulk.SqlServer" Version="4.0.46" />
1111
</ItemGroup>
1212

1313
<ItemGroup>

‎src/SmartCode.Generator/RazorTemplates/CSharp/Repository.cshtml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
var autoIncrement = table.AutoIncrement;
1616
var dbSource = Model.GetDataSource<DbSource>();
1717

18-
var PKNameEQId = pkCol.Name == "Id";
18+
var PKNameEQId = pkCol.ConvertedName == "Id";
1919
}
2020

2121
using System;
@@ -58,22 +58,22 @@ public interface I@(table.ConvertedName)Repository : IRepository<@(table.Convert
5858
{
5959
<text>[Statement(Id = "GetEntity")]</text>
6060
@Html.NewLine()
61-
@Html.PadLeft(8) <text>new @table.ConvertedName GetById([Param("@pkCol.Name")]@primaryKeyType id);</text>
61+
@Html.PadLeft(8) <text>new @table.ConvertedName GetById([Param("@pkCol.ConvertedName")]@primaryKeyType id);</text>
6262
@Html.NewLine()
6363

6464
<text>[Statement(Id = "GetEntity")]</text>
6565
@Html.NewLine()
66-
@Html.PadLeft(8) <text>new Task<@table.ConvertedName> GetByIdAsync([Param("@pkCol.Name")]@primaryKeyType id);</text>
66+
@Html.PadLeft(8) <text>new Task<@table.ConvertedName> GetByIdAsync([Param("@pkCol.ConvertedName")]@primaryKeyType id);</text>
6767
@Html.NewLine()
6868

6969
<text>[Statement(Id = "Delete")]</text>
7070
@Html.NewLine()
71-
@Html.PadLeft(8) <text>new int DeleteById([Param("@pkCol.Name")]@primaryKeyType id);</text>
71+
@Html.PadLeft(8) <text>new int DeleteById([Param("@pkCol.ConvertedName")]@primaryKeyType id);</text>
7272
@Html.NewLine()
7373

7474
<text>[Statement(Id = "Delete")]</text>
7575
@Html.NewLine()
76-
@Html.PadLeft(8) <text>new Task<@("int")> DeleteByIdAsync([Param("@pkCol.Name")]@primaryKeyType id);</text>
76+
@Html.PadLeft(8) <text>new Task<@("int")> DeleteByIdAsync([Param("@pkCol.ConvertedName")]@primaryKeyType id);</text>
7777
@Html.NewLine()
7878

7979
}

0 commit comments

Comments
 (0)