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

Commit fd05747

Browse files
mythzmythz
committed
Move static utils and rename to OrmLiteUtils
1 parent 0cb5403 commit fd05747

File tree

15 files changed

+376
-372
lines changed

15 files changed

+376
-372
lines changed

‎src/ServiceStack.OrmLite.Oracle/OracleOrmLiteDialectProvider.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ public override long InsertAndGetLastInsertId<T>(IDbCommand dbCmd)
167167

168168
public override void SetDbValue(FieldDefinition fieldDef, IDataReader reader, int colIndex, object instance)
169169
{
170-
if (OrmLiteDialectProviderExtensions.HandledDbNullValue(fieldDef, reader, colIndex, instance)) return;
170+
if (OrmLiteUtils.HandledDbNullValue(fieldDef, reader, colIndex, instance)) return;
171171

172172
var value = reader.GetValue(colIndex);
173173
var convertedValue = ConvertDbValue(value, fieldDef.FieldType);

‎src/ServiceStack.OrmLite.Oracle/ServiceStack.OrmLite.Oracle.csproj‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,12 @@
6464
<Compile Include="DbSchema\ParameterDirection.cs" />
6565
<Compile Include="DbSchema\PocoCreator.cs" />
6666
<Compile Include="DbSchema\ProcedureType.cs" />
67-
<Compile Include="OracleConnection.cs" />
68-
<Compile Include="OracleCommand.cs" />
67+
<Compile Include="OracleConnection.cs">
68+
<SubType>Component</SubType>
69+
</Compile>
70+
<Compile Include="OracleCommand.cs">
71+
<SubType>Component</SubType>
72+
</Compile>
6973
<Compile Include="OracleDataReader.cs" />
7074
<Compile Include="OracleDialect.cs" />
7175
<Compile Include="OracleExecFilter.cs" />

‎src/ServiceStack.OrmLite.SqlServer/SqlServerOrmLiteDialectProvider.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ public override void SetDbValue(FieldDefinition fieldDef, IDataReader reader, in
109109
var bytes = reader.GetValue(colIndex) as byte[];
110110
if (bytes != null)
111111
{
112-
var ulongValue = OrmLiteDialectProviderExtensions.ConvertToULong(bytes);
112+
var ulongValue = OrmLiteUtils.ConvertToULong(bytes);
113113
try
114114
{
115115
fieldDef.SetValueFn(instance, ulongValue);
@@ -281,7 +281,7 @@ public override string GetDropForeignKeyConstraints(ModelDefinition modelDef)
281281
{
282282
var foreignKeyName = fieldDef.ForeignKey.GetForeignKeyName(
283283
modelDef,
284-
OrmLiteDialectProviderExtensions.GetModelDefinition(fieldDef.ForeignKey.ReferenceType),
284+
OrmLiteUtils.GetModelDefinition(fieldDef.ForeignKey.ReferenceType),
285285
NamingStrategy,
286286
fieldDef);
287287

‎src/ServiceStack.OrmLite.Sqlite/SqliteOrmLiteDialectProviderBase.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ public override object ConvertDbValue(object value, Type type)
165165

166166
public override void SetDbValue(FieldDefinition fieldDef, IDataReader reader, int colIndex, object instance)
167167
{
168-
if (OrmLiteDialectProviderExtensions.HandledDbNullValue(fieldDef, reader, colIndex, instance)) return;
168+
if (OrmLiteUtils.HandledDbNullValue(fieldDef, reader, colIndex, instance)) return;
169169

170170
var fieldType = Nullable.GetUnderlyingType(fieldDef.FieldType) ?? fieldDef.FieldType;
171171
if (fieldType == typeof(Guid))

‎src/ServiceStack.OrmLite.VistaDB/VistaDbDialectProvider.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ public override IDbConnection CreateConnection(string connectionString, Dictiona
9898

9999
public override string ToCreateTableStatement(Type tableType)
100100
{
101-
var modelDefinition = OrmLiteDialectProviderExtensions.GetModelDefinition(tableType);
101+
var modelDefinition = OrmLiteUtils.GetModelDefinition(tableType);
102102
var quotedTableName = this.GetQuotedTableName(modelDefinition);
103103

104104
var columns = new StringBuilder();
@@ -132,7 +132,7 @@ public override string ToCreateTableStatement(Type tableType)
132132
}
133133
else if (fd.ForeignKey != null)
134134
{
135-
var foreignModelDefinition = OrmLiteDialectProviderExtensions.GetModelDefinition(fd.ForeignKey.ReferenceType);
135+
var foreignModelDefinition = OrmLiteUtils.GetModelDefinition(fd.ForeignKey.ReferenceType);
136136
constraints.AppendFormat("ALTER TABLE {0} ADD CONSTRAINT {1} FOREIGN KEY ({2}) REFERENCES {3} ({4}){5}{6};\n",
137137
quotedTableName,
138138
this.GetQuotedName(fd.ForeignKey.GetForeignKeyName(modelDefinition, foreignModelDefinition, this.NamingStrategy, fd)),
@@ -359,7 +359,7 @@ public override string GetDropForeignKeyConstraints(ModelDefinition modelDef)
359359
{
360360
var foreignKeyName = fieldDef.ForeignKey.GetForeignKeyName(
361361
modelDef,
362-
OrmLiteDialectProviderExtensions.GetModelDefinition(fieldDef.ForeignKey.ReferenceType),
362+
OrmLiteUtils.GetModelDefinition(fieldDef.ForeignKey.ReferenceType),
363363
NamingStrategy,
364364
fieldDef);
365365

‎src/ServiceStack.OrmLite/Async/ReadExpressionCommandExtensionsAsync.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ internal static Task<List<T>> ExprConvertToListAsync<T>(this IDataReader dataRea
166166

167167
return dialectProvider.ReaderEach(dataReader, () =>
168168
{
169-
var row = OrmLiteUtilExtensions.CreateInstance<T>();
169+
var row = OrmLiteUtils.CreateInstance<T>();
170170
row.PopulateWithSqlReader(dialectProvider, dataReader, fieldDefs, indexCache);
171171
return row;
172172
}, token);

‎src/ServiceStack.OrmLite/OrmLiteDialectProviderBase.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ public virtual bool ShouldQuoteValue(Type fieldType)
268268
/// </summary>
269269
public virtual void SetDbValue(FieldDefinition fieldDef, IDataReader reader, int colIndex, object instance)
270270
{
271-
if (OrmLiteDialectProviderExtensions.HandledDbNullValue(fieldDef, reader, colIndex, instance)) return;
271+
if (OrmLiteUtils.HandledDbNullValue(fieldDef, reader, colIndex, instance)) return;
272272

273273
var convertedValue = ConvertDbValue(reader.GetValue(colIndex), fieldDef.FieldType);
274274
try
@@ -1289,7 +1289,7 @@ public virtual object ConvertDbValue(object value, Type type)
12891289
return value;
12901290
var byteValue = value as byte[];
12911291
if (byteValue != null)
1292-
return OrmLiteDialectProviderExtensions.ConvertToULong(byteValue);
1292+
return OrmLiteUtils.ConvertToULong(byteValue);
12931293
return Convert.ToUInt64(value);
12941294
case TypeCode.Single:
12951295
return value is float ? value : Convert.ToSingle(value);
@@ -1491,22 +1491,22 @@ public virtual Task<long> InsertAndGetLastInsertIdAsync<T>(IDbCommand dbCmd, Can
14911491
#else
14921492
public Task<List<T>> ReaderEach<T>(IDataReader reader, Func<T> fn, CancellationToken token = new CancellationToken())
14931493
{
1494-
throw new NotImplementedException(OrmLiteUtilExtensions.AsyncRequiresNet45Error);
1494+
throw new NotImplementedException(OrmLiteUtils.AsyncRequiresNet45Error);
14951495
}
14961496

14971497
public Task<Return> ReaderEach<Return>(IDataReader reader, Action fn, Return source, CancellationToken token = new CancellationToken())
14981498
{
1499-
throw new NotImplementedException(OrmLiteUtilExtensions.AsyncRequiresNet45Error);
1499+
throw new NotImplementedException(OrmLiteUtils.AsyncRequiresNet45Error);
15001500
}
15011501

15021502
public Task<T> ReaderRead<T>(IDataReader reader, Func<T> fn, CancellationToken token = new CancellationToken())
15031503
{
1504-
throw new NotImplementedException(OrmLiteUtilExtensions.AsyncRequiresNet45Error);
1504+
throw new NotImplementedException(OrmLiteUtils.AsyncRequiresNet45Error);
15051505
}
15061506

15071507
public Task<long> InsertAndGetLastInsertIdAsync<T>(IDbCommand dbCmd, CancellationToken token)
15081508
{
1509-
throw new NotImplementedException(OrmLiteUtilExtensions.AsyncRequiresNet45Error);
1509+
throw new NotImplementedException(OrmLiteUtils.AsyncRequiresNet45Error);
15101510
}
15111511
#endif
15121512
}

‎src/ServiceStack.OrmLite/OrmLiteDialectProviderExtensions.cs‎

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -51,37 +51,5 @@ public static string GetQuotedColumnName(this IOrmLiteDialectProvider dialect,
5151
"." +
5252
dialect.GetQuotedColumnName(fieldName);
5353
}
54-
55-
private const int NotFound = -1;
56-
57-
public static ModelDefinition GetModelDefinition(Type modelType)
58-
{
59-
return modelType.GetModelDefinition();
60-
}
61-
62-
public static bool HandledDbNullValue(FieldDefinition fieldDef, IDataReader dataReader, int colIndex, object instance)
63-
{
64-
if (fieldDef == null || fieldDef.SetValueFn == null || colIndex == NotFound) return true;
65-
if (dataReader.IsDBNull(colIndex))
66-
{
67-
if (fieldDef.IsNullable)
68-
{
69-
fieldDef.SetValueFn(instance, null);
70-
}
71-
else
72-
{
73-
fieldDef.SetValueFn(instance, fieldDef.FieldType.GetDefaultValue());
74-
}
75-
return true;
76-
}
77-
return false;
78-
}
79-
80-
public static ulong ConvertToULong(byte[] bytes)
81-
{
82-
Array.Reverse(bytes); //Correct Endianness
83-
var ulongValue = BitConverter.ToUInt64(bytes, 0);
84-
return ulongValue;
85-
}
8654
}
8755
}

‎src/ServiceStack.OrmLite/OrmLiteReadCommandExtensions.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,7 @@ internal static IEnumerable<T> SelectLazy<T>(this IDbCommand dbCmd, string sql,
482482
var indexCache = reader.GetIndexFieldsCache(ModelDefinition<T>.Definition);
483483
while (reader.Read())
484484
{
485-
var row = OrmLiteUtilExtensions.CreateInstance<T>();
485+
var row = OrmLiteUtils.CreateInstance<T>();
486486
row.PopulateWithSqlReader(dialectProvider, reader, fieldDefs, indexCache);
487487
yield return row;
488488
}
@@ -537,7 +537,7 @@ internal static IEnumerable<T> WhereLazy<T>(this IDbCommand dbCmd, object anonTy
537537
var indexCache = reader.GetIndexFieldsCache(ModelDefinition<T>.Definition);
538538
while (reader.Read())
539539
{
540-
var row = OrmLiteUtilExtensions.CreateInstance<T>();
540+
var row = OrmLiteUtils.CreateInstance<T>();
541541
row.PopulateWithSqlReader(dialectProvider, reader, fieldDefs, indexCache);
542542
yield return row;
543543
}
@@ -569,7 +569,7 @@ internal static IEnumerable<T> SelectLazyFmt<T>(this IDbCommand dbCmd, string fi
569569
var indexCache = reader.GetIndexFieldsCache(ModelDefinition<T>.Definition);
570570
while (reader.Read())
571571
{
572-
var row = OrmLiteUtilExtensions.CreateInstance<T>();
572+
var row = OrmLiteUtils.CreateInstance<T>();
573573
row.PopulateWithSqlReader(dialectProvider, reader, fieldDefs, indexCache);
574574
yield return row;
575575
}

0 commit comments

Comments
 (0)