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

Commit 3a51fff

Browse files
committed
Merge into single GetColumnDbType() method
1 parent dbb5948 commit 3a51fff

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

src/ServiceStack.OrmLite/IOrmLiteDialectProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ string ToSelectFromProcedureStatement(object fromObjWithProperties,
135135

136136
SqlExpression<T> SqlExpression<T>();
137137

138-
DbType GetColumnDbType(Type valueType);
138+
DbType GetColumnDbType(Type columnType);
139139
string GetColumnTypeDefinition(Type fieldType);
140140

141141
//DDL

src/ServiceStack.OrmLite/OrmLiteDialectProviderBase.cs

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -735,11 +735,9 @@ protected void AddParameter(IDbCommand cmd, FieldDefinition fieldDef)
735735
public virtual void SetParameter(FieldDefinition fieldDef, IDbDataParameter p)
736736
{
737737
p.ParameterName = this.GetParam(SanitizeFieldNameForParamName(fieldDef.FieldName));
738+
var columnType = fieldDef.ColumnType;
738739

739-
DbType dbType;
740-
var sqlDbType = DbTypeMap.ColumnDbTypeMap.TryGetValue(fieldDef.ColumnType, out dbType)
741-
? dbType
742-
: DbType.String;
740+
var sqlDbType = GetColumnDbType(columnType);
743741

744742
p.DbType = sqlDbType;
745743
}
@@ -1055,12 +1053,16 @@ public virtual List<string> ToCreateIndexStatements(Type tableType)
10551053
return sqlIndexes;
10561054
}
10571055

1058-
public virtual DbType GetColumnDbType(Type valueType)
1056+
public virtual DbType GetColumnDbType(Type columnType)
10591057
{
1060-
if (valueType.IsEnum)
1058+
if (columnType.IsEnum)
10611059
return DbTypeMap.ColumnDbTypeMap[typeof(string)];
10621060

1063-
return DbTypeMap.ColumnDbTypeMap[valueType];
1061+
DbType dbType;
1062+
var sqlDbType = DbTypeMap.ColumnDbTypeMap.TryGetValue(columnType, out dbType)
1063+
? dbType
1064+
: DbType.String;
1065+
return sqlDbType;
10641066
}
10651067

10661068
public virtual string GetColumnTypeDefinition(Type fieldType)

0 commit comments

Comments
 (0)