Skip to content
This repository was archived by the owner on Dec 24, 2022. It is now read-only.

Commit 6ea8087

Browse files
OlegNadymovOlegNadymov
authored
Merge pull request #7 from ServiceStack/master
Update from upstream
2 parents cc3a919 + 526dda1 commit 6ea8087

File tree

52 files changed

+951
-684
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+951
-684
lines changed

‎NuGet.Core/ServiceStack.OrmLite.MySql.Core/ServiceStack.OrmLite.MySql.Core.nuspec‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
<?xml version="1.0"?>
2+
<package xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
3+
<metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
4+
<id>ServiceStack.OrmLite.MySql.Core</id>
5+
<title>ServiceStack.OrmLite.MySql.Core</title>
6+
<version>1.0.0</version>
7+
<authors>Service Stack</authors>
8+
<owners>Service Stack</owners>
9+
<description>
10+
Light, simple and fast convention-based code-first POCO ORM for MySQL.
11+
Support for Creating and Dropping Table Schemas from POCOs, Complex Property types transparently stored in schemaless text blobs in MySQL.
12+
</description>
13+
<projectUrl>https://github.com/ServiceStack/ServiceStack.OrmLite</projectUrl>
14+
<licenseUrl>https://servicestack.net/terms</licenseUrl>
15+
<requireLicenseAcceptance>true</requireLicenseAcceptance>
16+
<iconUrl>https://servicestack.net/img/logo-32.png</iconUrl>
17+
<tags>MySql OrmLite POCO Code-First Orm Schema-less Blobs</tags>
18+
<language>en-US</language>
19+
<copyright>Copyright 2016 Service Stack</copyright>
20+
<dependencies>
21+
<group targetFramework=".NETStandard1.6">
22+
<dependency id="MySql.Data" version="[7.0.6-ir31, )" />
23+
<dependency id="ServiceStack.Interfaces.Core" version="[1.0.0, )" />
24+
<dependency id="ServiceStack.Text.Core" version="[1.0.0, )" />
25+
<dependency id="ServiceStack.Common.Core" version="[1.0.0, )" />
26+
<dependency id="ServiceStack.OrmLite.Core" version="[1.0.0, )" />
27+
</group>
28+
</dependencies>
29+
</metadata>
30+
<files>
31+
<file src="lib/**/*.*" target="lib" />
32+
<file src="../../src/ServiceStack.OrmLite.MySql/**/*.cs" target="src" />
33+
</files>
34+
</package>

‎NuGet.Core/ServiceStack.OrmLite.PostgreSQL.Core/ServiceStack.OrmLite.PostgreSQL.Core.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<copyright>Copyright 2016 Service Stack</copyright>
2020
<dependencies>
2121
<group targetFramework=".NETStandard1.3">
22-
<dependency id="Npgsql" version="[3.1.7, )" />
22+
<dependency id="Npgsql" version="[3.1.9, )" />
2323
<dependency id="ServiceStack.Interfaces.Core" version="[1.0.0, )" />
2424
<dependency id="ServiceStack.Text.Core" version="[1.0.0, )" />
2525
<dependency id="ServiceStack.Common.Core" version="[1.0.0, )" />

‎NuGet/ServiceStack.OrmLite.PostgreSQL/servicestack.ormlite.postgresql.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<language>en-US</language>
1919
<copyright>Copyright 2016 Service Stack</copyright>
2020
<dependencies>
21-
<dependency id="Npgsql" version="3.1.8" />
21+
<dependency id="Npgsql" version="3.1.9" />
2222
<dependency id="ServiceStack.OrmLite" version="4.5" />
2323
</dependencies>
2424
</metadata>

‎build/build-core.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ find ./src -type f -name "AssemblyInfo.cs" -exec sed -i "s/AssemblyFileVersion(\
2525
echo replace project.json
2626
sed -i "s/\"version\": \"[^\"]\+\"/\"version\": \"${Version}\"/g" ./src/ServiceStack.OrmLite/project.json
2727
sed -i "s/\"version\": \"[^\"]\+\"/\"version\": \"${Version}\"/g" ./src/ServiceStack.OrmLite.PostgreSQL/project.json
28+
sed -i "s/\"version\": \"[^\"]\+\"/\"version\": \"${Version}\"/g" ./src/ServiceStack.OrmLite.MySql/project.json
2829
sed -i "s/\"version\": \"[^\"]\+\"/\"version\": \"${Version}\"/g" ./src/ServiceStack.OrmLite.SqlServer/project.json
2930
sed -i "s/\"version\": \"[^\"]\+\"/\"version\": \"${Version}\"/g" ./src/ServiceStack.OrmLite.Sqlite/project.json
3031
sed -i "s/\"version\": \"[^\"]\+\"/\"version\": \"${Version}\"/g" ./src/ServiceStack.Text/project.json

‎build/publish-core.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ declare -A projects=( \
55
["ServiceStack.OrmLite.Sqlite"]="1.3" \
66
["ServiceStack.OrmLite.SqlServer"]="1.3" \
77
["ServiceStack.OrmLite.PostgreSQL"]="1.3" \
8+
["ServiceStack.OrmLite.MySql"]="1.6" \
89
)
910

1011
#for each project copy files to Nuget.Core/$project/lib folder

‎lib/ServiceStack.Interfaces.dll‎

0 Bytes
Binary file not shown.

‎src/ServiceStack.OrmLite.Firebird/FirebirdOrmLiteDialectProvider.cs‎

Lines changed: 20 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -303,18 +303,7 @@ public override string ToCreateTableStatement(Type tableType)
303303
if (sbColumns.Length != 0)
304304
sbColumns.Append(", \n ");
305305

306-
var columnDefinition = GetColumnDefinition(
307-
fieldDef.FieldName,
308-
fieldDef.ColumnType,
309-
fieldDef.IsPrimaryKey,
310-
fieldDef.AutoIncrement,
311-
fieldDef.IsNullable,
312-
fieldDef.IsRowVersion,
313-
fieldDef.FieldLength,
314-
fieldDef.Scale,
315-
GetDefaultValue(fieldDef),
316-
fieldDef.CustomFieldDefinition);
317-
306+
var columnDefinition = GetColumnDefinition(fieldDef);
318307
sbColumns.Append(columnDefinition);
319308

320309
if (fieldDef.ForeignKey == null || OrmLiteConfig.SkipForeignKeys)
@@ -362,16 +351,16 @@ public override List<string> ToCreateSequenceStatements(Type tableType)
362351
return gens;
363352
}
364353

365-
public override string GetColumnDefinition(string fieldName, Type fieldType,
366-
bool isPrimaryKey, bool autoIncrement, bool isNullable, bool isRowVersion,
367-
int? fieldLength, int? scale, string defaultValue, string customFieldDefinition)
354+
public override string GetColumnDefinition(FieldDefinition fieldDef)
368355
{
369-
var fieldDefinition = customFieldDefinition ?? GetColumnTypeDefinition(fieldType, fieldLength, scale);
356+
var fieldDefinition = fieldDef.CustomFieldDefinition
357+
?? GetColumnTypeDefinition(fieldDef.ColumnType, fieldDef.FieldLength, fieldDef.Scale);
370358

371359
var sql = StringBuilderCache.Allocate();
372-
sql.AppendFormat("{0} {1}", GetQuotedColumnName(fieldName), fieldDefinition);
360+
sql.AppendFormat("{0} {1}", GetQuotedColumnName(fieldDef.FieldName), fieldDefinition);
373361

374-
if (isRowVersion)
362+
var defaultValue = GetDefaultValue(fieldDef);
363+
if (fieldDef.IsRowVersion)
375364
{
376365
sql.AppendFormat(DefaultValueFormat, 1L);
377366
}
@@ -380,7 +369,7 @@ public override string GetColumnDefinition(string fieldName, Type fieldType,
380369
sql.AppendFormat(DefaultValueFormat, defaultValue);
381370
}
382371

383-
if (!isNullable)
372+
if (!fieldDef.IsNullable)
384373
{
385374
sql.Append(" NOT NULL");
386375
}
@@ -754,47 +743,22 @@ public override string GetForeignKeyOnUpdateClause(ForeignKeyConstraint foreignK
754743
#region DDL
755744
public override string ToAddColumnStatement(Type modelType, FieldDefinition fieldDef)
756745
{
757-
var column = GetColumnDefinition(fieldDef.FieldName,
758-
fieldDef.ColumnType,
759-
fieldDef.IsPrimaryKey,
760-
fieldDef.AutoIncrement,
761-
fieldDef.IsNullable,
762-
fieldDef.IsRowVersion,
763-
fieldDef.FieldLength,
764-
fieldDef.Scale,
765-
fieldDef.DefaultValue,
766-
fieldDef.CustomFieldDefinition);
767-
768-
return string.Format("ALTER TABLE {0} ADD {1} ;",
769-
GetQuotedTableName(GetModel(modelType)),
770-
column);
746+
var column = GetColumnDefinition(fieldDef);
747+
return $"ALTER TABLE {GetQuotedTableName(GetModel(modelType))} ADD {column} ;";
771748
}
772749

773750
public override string ToAlterColumnStatement(Type modelType, FieldDefinition fieldDef)
774751
{
775-
var column = GetColumnDefinition(fieldDef.FieldName,
776-
fieldDef.ColumnType,
777-
fieldDef.IsPrimaryKey,
778-
fieldDef.AutoIncrement,
779-
fieldDef.IsNullable,
780-
fieldDef.IsRowVersion,
781-
fieldDef.FieldLength,
782-
fieldDef.Scale,
783-
fieldDef.DefaultValue,
784-
fieldDef.CustomFieldDefinition);
785-
return string.Format("ALTER TABLE {0} ALTER {1} ;",
786-
GetQuotedTableName(GetModel(modelType)),
787-
column);
788-
}
789-
790-
public override string ToChangeColumnNameStatement(Type modelType,
791-
FieldDefinition fieldDef,
792-
string oldColumnName)
793-
{
794-
return string.Format("ALTER TABLE {0} ALTER {1} TO {2} ;",
795-
GetQuotedTableName(GetModel(modelType)),
796-
GetQuotedColumnName(oldColumnName),
797-
GetQuotedColumnName(fieldDef.FieldName));
752+
var column = GetColumnDefinition(fieldDef);
753+
return $"ALTER TABLE {GetQuotedTableName(GetModel(modelType))} ALTER {column} ;";
754+
}
755+
756+
public override string ToChangeColumnNameStatement(Type modelType, FieldDefinition fieldDef, string oldColumnName)
757+
{
758+
return string.Format("ALTER TABLE {0} ALTER {1} TO {2};",
759+
GetQuotedTableName(GetModel(modelType)),
760+
GetQuotedColumnName(oldColumnName),
761+
GetQuotedColumnName(fieldDef.FieldName));
798762
}
799763
#endregion DDL
800764

‎src/ServiceStack.OrmLite.MySql/MySqlDialectProvider.cs‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -201,18 +201,7 @@ public string GetColumnDefinition(FieldDefinition fieldDef)
201201
return StringBuilderCache.ReturnAndFree(sql);
202202
}
203203

204-
var ret = base.GetColumnDefinition(
205-
fieldDef.FieldName,
206-
fieldDef.ColumnType,
207-
fieldDef.IsPrimaryKey,
208-
fieldDef.AutoIncrement,
209-
fieldDef.IsNullable,
210-
fieldDef.IsRowVersion,
211-
fieldDef.FieldLength,
212-
fieldDef.Scale,
213-
GetDefaultValue(fieldDef),
214-
fieldDef.CustomFieldDefinition);
215-
204+
var ret = base.GetColumnDefinition(fieldDef);
216205
if (fieldDef.IsRowVersion)
217206
return ret + " DEFAULT 1";
218207

‎src/ServiceStack.OrmLite.MySql/ServiceStack.OrmLite.MySql.Signed.project.json‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"frameworks": {
3+
"net45": {}
4+
},
5+
"runtimes": {
6+
"win": {}
7+
},
8+
"dependencies": {
9+
"Mysql.Data": "6.9.9"
10+
}
11+
}

‎src/ServiceStack.OrmLite.MySql/ServiceStack.OrmLite.MySql.project.json‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"frameworks": {
3+
"net45": {}
4+
},
5+
"runtimes": {
6+
"win": {}
7+
},
8+
"dependencies": {
9+
"Mysql.Data": "6.9.9"
10+
}
11+
}

0 commit comments

Comments
 (0)