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

Commit ba210f2

Browse files
committed
Change to use common FieldDef.GetQuotedName()
1 parent 57c76db commit ba210f2

File tree

3 files changed

+10
-9
lines changed

3 files changed

+10
-9
lines changed

src/ServiceStack.OrmLite/Expressions/SqlExpression.Join.cs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,7 @@ public string SelectInto<TModel>()
116116

117117
sbSelect.AppendFormat("{0}.{1}",
118118
tableDef.ModelName.SqlTable(),
119-
tableFieldDef.IsRowVersion
120-
? OrmLiteConfig.DialectProvider.GetRowVersionColumnName(tableFieldDef)
121-
: tableFieldDef.FieldName.SqlColumn());
119+
tableFieldDef.GetQuotedName());
122120
break;
123121
}
124122
}
@@ -134,9 +132,7 @@ public string SelectInto<TModel>()
134132

135133
sbSelect.AppendFormat("{0}.{1}",
136134
modelDef.ModelName.SqlTable(),
137-
fieldDef.IsRowVersion
138-
? OrmLiteConfig.DialectProvider.GetRowVersionColumnName(fieldDef)
139-
: fieldDef.FieldName.SqlColumn());
135+
fieldDef.GetQuotedName());
140136
}
141137
}
142138

src/ServiceStack.OrmLite/FieldDefinition.cs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,13 @@ public object GetValue(object onInstance)
6969
return this.GetValueFn == null ? null : this.GetValueFn(onInstance);
7070
}
7171

72+
public string GetQuotedName()
73+
{
74+
return IsRowVersion
75+
? OrmLiteConfig.DialectProvider.GetRowVersionColumnName(this)
76+
: OrmLiteConfig.DialectProvider.GetQuotedColumnName(FieldName);
77+
}
78+
7279
public string GetQuotedValue(object fromInstance)
7380
{
7481
var value = GetValue(fromInstance);

src/ServiceStack.OrmLite/OrmLiteDialectProviderBase.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -520,9 +520,7 @@ public virtual string GetColumnNames(ModelDefinition modelDef)
520520
if (sqlColumns.Length > 0)
521521
sqlColumns.Append(", ");
522522

523-
sqlColumns.Append(field.IsRowVersion
524-
? GetRowVersionColumnName(field)
525-
: GetQuotedColumnName(field.FieldName));
523+
sqlColumns.Append(field.GetQuotedName());
526524
}
527525

528526
return sqlColumns.ToString();

0 commit comments

Comments
 (0)