Skip to content

Commit 54007e5

Browse files
Ahoo-WangAhoo-Wang
committed
- optimize Spring-Boot-Template
- update SmartSql version
1 parent 5bd6043 commit 54007e5

File tree

8 files changed

+52
-14
lines changed

8 files changed

+52
-14
lines changed

‎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>88</VersionPatch>
5+
<VersionPatch>90</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: 'D:\SmartSql-Starter'
1616
Parameters:
17-
SmartSqlVersion: '4.1.38'
17+
SmartSqlVersion: '4.1.41'
1818
SmartSqlSchemaVersion: '4.1.30'
1919
BuildDir: 'D:\SmartSql-Starter\build'
2020
DockerImage: 'smartsql.starter'

‎src/SmartCode.CLI/SmartCode.CLI.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
</PackageReleaseNotes>
1515
</PropertyGroup>
1616
<ItemGroup>
17-
<PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="2.4.2" />
17+
<PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="2.4.4" />
1818
<PackageReference Include="Microsoft.Extensions.Configuration" Version="2.2.0" />
1919
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="2.2.0" />
2020
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.2.0" />

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

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

77
<ItemGroup>
8-
<PackageReference Include="SmartSql.Options" Version="4.1.38" />
9-
<PackageReference Include="SmartSql.TypeHandler" Version="4.1.38" />
10-
<PackageReference Include="SmartSql.TypeHandler.PostgreSql" Version="4.1.38" />
8+
<PackageReference Include="SmartSql.Options" Version="4.1.41" />
9+
<PackageReference Include="SmartSql.TypeHandler" Version="4.1.41" />
10+
<PackageReference Include="SmartSql.TypeHandler.PostgreSql" Version="4.1.41" />
1111
<PackageReference Include="System.Data.SqlClient" Version="4.7.0" />
12-
<PackageReference Include="System.Data.SQLite" Version="1.0.110" />
12+
<PackageReference Include="System.Data.SQLite" Version="1.0.112" />
1313
<PackageReference Include="MySql.Data" Version="8.0.18" />
1414
<PackageReference Include="Npgsql" Version="4.1.1" />
1515
<PackageReference Include="Oracle.ManagedDataAccess.Core" Version="2.19.50" />

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="System.Data.SQLite" Version="1.0.111" />
8+
<PackageReference Include="System.Data.SQLite" Version="1.0.112" />
99
</ItemGroup>
1010

1111
<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.1.38" />
9-
<PackageReference Include="SmartSql.Bulk.PostgreSql" Version="4.1.38" />
10-
<PackageReference Include="SmartSql.Bulk.SqlServer" Version="4.1.38" />
8+
<PackageReference Include="SmartSql.Bulk.MySql" Version="4.1.41" />
9+
<PackageReference Include="SmartSql.Bulk.PostgreSql" Version="4.1.41" />
10+
<PackageReference Include="SmartSql.Bulk.SqlServer" Version="4.1.41" />
1111
</ItemGroup>
1212

1313
<ItemGroup>

‎src/SmartCode.Generator/DbTypeConverter/DbTypeMap.xml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -535,6 +535,27 @@
535535
<DbType Name="longtext" To="String"/>
536536
<DbType Name="timestamp" To="Timestamp"/>
537537
</Database>
538+
539+
<Database DbProvider="MySql" Language="Jdbc">
540+
<DbType Name="longtext" To="LONGVARCHAR"/>
541+
<DbType Name="text" To="VARCHAR"/>
542+
<DbType Name="json" To="VARCHAR"/>
543+
<DbType Name="varchar" To="VARCHAR"/>
544+
<DbType Name="date" To="DATE"/>
545+
<DbType Name="datetime" To="TIMESTAMP"/>
546+
<DbType Name="time" To="TIME"/>
547+
<DbType Name="tinyint" To="BYTE"/>
548+
<DbType Name="smallint" To="SMALLINT"/>
549+
<DbType Name="int" To="INTEGER"/>
550+
<DbType Name="bigint" To="BIGINT"/>
551+
<DbType Name="bit" To="BOOLEAN"/>
552+
<DbType Name="char" To="CHAR"/>
553+
<DbType Name="integer" To="INTEGER"/>
554+
<DbType Name="decimal" To="DECIMAL"/>
555+
<DbType Name="float" To="FLOAT"/>
556+
<DbType Name="timestamp" To="TIMESTAMP"/>
557+
<DbType Name="blob" To="BLOB"/>
558+
</Database>
538559
<!-- Java-Language End-->
539560

540561
<!-- TypeScript-Language Start-->

‎src/SmartCode.Generator/RazorTemplates/Java/SqlMap-Partials/SqlMap-ResultMaps.cshtml

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
@using SmartCode
22
@using SmartCode.Db
3+
@using SmartCode.Generator
34
@model BuildContext
5+
46
@{
57
var project = Model.Project;
68
var dbSource = Model.GetDataSource<DbSource>();
@@ -15,23 +17,38 @@
1517
{
1618
throw new SmartCodeException($"{table.Name} can not find PKColumn！");
1719
}
18-
20+
1921
if (!project.BuildTasks.TryGetValue("Entity", out var entityBuild))
2022
{
2123
throw new ArgumentException("can not find Project -> BuildTasks -> [Entity] .");
2224
}
2325

2426
var entityName = $"{project.Module}.{entityBuild.Module}.{table.ConvertedName}";
27+
IDbTypeConverter dbTypeConverter = Model.PluginManager.Resolve<IDbTypeConverter>();
28+
}
29+
30+
@functions
31+
{
32+
33+
String GetJdbcType(IDbTypeConverter dbTypeConverter, DbSource dbSource, String dbType)
34+
{
35+
var dbProvider = dbSource.DbRepository.DbProvider;
36+
var jdbcType = dbTypeConverter.LanguageType(dbProvider, "Jdbc", dbType);
37+
return String.IsNullOrEmpty(jdbcType) ? "" : $" jdbcType=\"{jdbcType}\"";
38+
}
39+
2540
}
2641

42+
2743
<resultMap id="@resultMapName" type="@entityName">
28-
<id column="@pkCol.Name" property="@pkCol.ConvertedName"></id>
44+
<id column="@pkCol.Name" property="@pkCol.ConvertedName" javaType="@pkCol.LanguageType" @GetJdbcType(dbTypeConverter, dbSource, pkCol.DbType)></id>
2945
@foreach (var col in table.Columns)
3046
{
3147
if (col.IsPrimaryKey)
3248
{
3349
continue;
3450
}
35-
<result column="@col.Name" property="@col.ConvertedName"/>
51+
52+
<result column="@col.Name" property="@col.ConvertedName" javaType="@col.LanguageType" @GetJdbcType(dbTypeConverter, dbSource, col.DbType)/>
3653
}
3754
</resultMap>

0 commit comments

Comments
 (0)