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

Commit 954d8b7

Browse files
committed
Move StripTablePrefixes to Utils Extension
1 parent 1c21dfb commit 954d8b7

File tree

2 files changed

+24
-25
lines changed

2 files changed

+24
-25
lines changed

src/ServiceStack.OrmLite.SqlServer/SqlServerOrmLiteDialectProvider.cs

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ public override string ToSelectStatement(ModelDefinition modelDef,
412412

413413
var ret = string.Format(
414414
"{0} FROM (SELECT ROW_NUMBER() OVER ({2}) As RowNum, {1} {3}) AS RowConstrainedResult WHERE RowNum > {4} AND RowNum <= {5}",
415-
StripTablePrefixes(selectExpression), //SELECT without RowNum to be able to use in SELECT IN () Reference Queries
415+
selectExpression.StripTablePrefixes(), //SELECT without RowNum to be able to use in SELECT IN () Reference Queries
416416
selectExpression.Substring(selectType.Length),
417417
orderByExpression,
418418
bodyExpression,
@@ -421,29 +421,5 @@ public override string ToSelectStatement(ModelDefinition modelDef,
421421

422422
return ret;
423423
}
424-
425-
string StripTablePrefixes(string selectExpression)
426-
{
427-
if (selectExpression.IndexOf('.') < 0)
428-
return selectExpression;
429-
430-
var sb = new StringBuilder();
431-
var tokens = selectExpression.Split(' ');
432-
foreach (var token in tokens)
433-
{
434-
var parts = token.SplitOnLast('.');
435-
if (parts.Length > 1)
436-
{
437-
sb.Append(" " + parts[parts.Length - 1]);
438-
}
439-
else
440-
{
441-
sb.Append(" " + token);
442-
}
443-
}
444-
445-
return sb.ToString();
446-
}
447-
448424
}
449425
}

src/ServiceStack.OrmLite/OrmLiteUtilExtensions.cs

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -282,5 +282,28 @@ public static bool IsRefType(this Type fieldType)
282282
: fieldType))
283283
&& fieldType != typeof(string);
284284
}
285+
286+
public static string StripTablePrefixes(this string selectExpression)
287+
{
288+
if (selectExpression.IndexOf('.') < 0)
289+
return selectExpression;
290+
291+
var sb = new StringBuilder();
292+
var tokens = selectExpression.Split(' ');
293+
foreach (var token in tokens)
294+
{
295+
var parts = token.SplitOnLast('.');
296+
if (parts.Length > 1)
297+
{
298+
sb.Append(" " + parts[parts.Length - 1]);
299+
}
300+
else
301+
{
302+
sb.Append(" " + token);
303+
}
304+
}
305+
306+
return sb.ToString().Trim();
307+
}
285308
}
286309
}

0 commit comments

Comments
 (0)