Change SqlExpression providers to use C# 6 string interpolation

mythz · mythz · commit 31099efc195b · 2016-09-26T16:46:15.000-04:00
diff --git a/src/ServiceStack.OrmLite.Firebird/FirebirdSqlExpression.cs b/src/ServiceStack.OrmLite.Firebird/FirebirdSqlExpression.cs
@@ -17,13 +17,13 @@ protected override object VisitColumnAccessMethod(MethodCallExpression m)
             switch (m.Method.Name)
             {
                 case "Trim":
-                    statement = string.Format("trim({0})", quotedColName);
+                    statement = $"trim({quotedColName})";
                     break;
                 case "LTrim":
-                    statement = string.Format("trim(leading from {0})", quotedColName);
+                    statement = $"trim(leading from {quotedColName})";
                     break;
                 case "RTrim":
-                    statement = string.Format("trim(trailing from {0})", quotedColName);
+                    statement = $"trim(trailing from {quotedColName})";
                     break;
                 default:
                     return base.VisitColumnAccessMethod(m);
diff --git a/src/ServiceStack.OrmLite.MySql/MySqlExpression.cs b/src/ServiceStack.OrmLite.MySql/MySqlExpression.cs
@@ -10,12 +10,12 @@ public MySqlExpression(IOrmLiteDialectProvider dialectProvider)
 
         protected override PartialSqlString ToConcatPartialString(List<object> args)
         {
-            return new PartialSqlString(string.Format("CONCAT({0})", string.Join(", ", args)));
+            return new PartialSqlString($"CONCAT({string.Join(", ", args)})");
         }
 
         protected override string ToCast(string quotedColName)
         {
-            return string.Format("cast({0} as char(1000))", quotedColName);
+            return $"cast({quotedColName} as char(1000))";
         }
     }
 }
diff --git a/src/ServiceStack.OrmLite.SqlServer/SqlServerExpression.cs b/src/ServiceStack.OrmLite.SqlServer/SqlServerExpression.cs
@@ -20,8 +20,8 @@ public override void PrepareUpdateStatement(IDbCommand dbCmd, T item, bool exclu
         public override string GetSubstringSql(object quotedColumn, int startIndex, int? length = null)
         {
             return length != null
-                ? string.Format("substring({0}, {1}, {2})", quotedColumn, startIndex, length.Value)
-                : string.Format("substring({0}, {1}, LEN({0}) - {1} + 1)", quotedColumn, startIndex);
+                ? $"substring({quotedColumn}, {startIndex}, {length.Value})"
+                : $"substring({quotedColumn}, {startIndex}, LEN({quotedColumn}) - {startIndex} + 1)";
         }
 
         public override SqlExpression<T> OrderByRandom()
@@ -94,8 +94,7 @@ internal static void PrepareSqlServerUpdateStatement<T>(IDbCommand dbCmd, SqlExp
             if (strFields.Length == 0)
                 throw new ArgumentException("No non-null or non-default values were provided for type: " + typeof(T).Name);
 
-            dbCmd.CommandText = string.Format("UPDATE {0} SET {1} {2}",
-                dialectProvider.GetQuotedTableName(modelDef), strFields, q.WhereExpression);
+            dbCmd.CommandText = $"UPDATE {dialectProvider.GetQuotedTableName(modelDef)} SET {strFields} {q.WhereExpression}";
         }
     }
 }
diff --git a/src/ServiceStack.OrmLite.Sqlite/SqliteExpression.cs b/src/ServiceStack.OrmLite.Sqlite/SqliteExpression.cs
@@ -22,10 +22,10 @@ protected override object VisitColumnAccessMethod(MethodCallExpression m)
                     if (args.Count == 2)
                     {
                         var length = int.Parse(args[1].ToString());
-                        statement = string.Format("substr({0}, {1}, {2})", quotedColName, startIndex, length);
+                        statement = $"substr({quotedColName}, {startIndex}, {length})";
                     }
                     else
-                        statement = string.Format("substr({0}, {1})", quotedColName, startIndex);
+                        statement = $"substr({quotedColName}, {startIndex})";
                     break;
                 default:
                     return base.VisitColumnAccessMethod(m);
@@ -47,11 +47,10 @@ protected override object VisitSqlMethodCall(MethodCallExpression m)
                     statement = ConvertInExpressionToSql(m, quotedColName);
                     break;
                 case "Desc":
-                    statement = string.Format("{0} DESC", quotedColName);
+                    statement = $"{quotedColName} DESC";
                     break;
                 case "As":
-                    statement = string.Format("{0} AS {1}", quotedColName,
-                        base.DialectProvider.GetQuotedColumnName(RemoveQuoteFromAlias(args[0].ToString())));
+                    statement = $"{quotedColName} AS {base.DialectProvider.GetQuotedColumnName(RemoveQuoteFromAlias(args[0].ToString()))}";
                     break;
                 case "Sum":
                 case "Count":
@@ -61,10 +60,10 @@ protected override object VisitSqlMethodCall(MethodCallExpression m)
                     statement = string.Format("{0}({1}{2})",
                         m.Method.Name,
                         quotedColName,
-                        args.Count == 1 ? string.Format(",{0}", args[0]) : "");
+                        args.Count == 1 ? $",{args[0]}" : "");
                     break;
                 case "CountDistinct":
-                    statement = string.Format("COUNT(DISTINCT {0})", quotedColName);
+                    statement = $"COUNT(DISTINCT {quotedColName})";
                     break;
                 default:
                     return base.VisitSqlMethodCall(m);
@@ -78,9 +77,9 @@ public override SqlExpression<T> OrderByRandom()
             return base.OrderBy("random()");
         }
 
-        protected override PartialSqlString ToConcatPartialString(List<Object> args)
+        protected override PartialSqlString ToConcatPartialString(List<object> args)
         {
-            return new PartialSqlString(String.Join(" || ", args));
+            return new PartialSqlString(string.Join(" || ", args));
         }
     }
 }
diff --git a/src/ServiceStack.OrmLite.VistaDB/VistaDBExpression.cs b/src/ServiceStack.OrmLite.VistaDB/VistaDBExpression.cs
@@ -42,8 +42,7 @@ public override void PrepareUpdateStatement(IDbCommand dbCmd, T item, bool exclu
             if (strFields.Length == 0)
                 throw new ArgumentException("No non-null or non-default values were provided for type: " + typeof(T).Name);
 
-            dbCmd.CommandText = string.Format("UPDATE {0} SET {1} {2}",
-                DialectProvider.GetQuotedTableName(ModelDef), strFields, WhereExpression);
+            dbCmd.CommandText = $"UPDATE {DialectProvider.GetQuotedTableName(ModelDef)} SET {strFields} {WhereExpression}";
         }
 
         protected override object VisitColumnAccessMethod(MethodCallExpression m)
@@ -64,8 +63,8 @@ protected override object VisitColumnAccessMethod(MethodCallExpression m)
         public override string GetSubstringSql(object quotedColumn, int startIndex, int? length = null)
         {
             return length != null
-                ? string.Format("substring({0}, {1}, {2})", quotedColumn, startIndex, length.Value)
-                : string.Format("substring({0}, {1}, LEN({0}) - {1} + 1)", quotedColumn, startIndex);
+                ? $"substring({quotedColumn}, {startIndex}, {length.Value})"
+                : $"substring({quotedColumn}, {startIndex}, LEN({quotedColumn}) - {startIndex} + 1)";
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -10,12 +10,12 @@ public MySqlExpression(IOrmLiteDialectProvider dialectProvider)`
`10`	`10`
`11`	`11`	`protected override PartialSqlString ToConcatPartialString(List<object> args)`
`12`	`12`	`{`
`13`		`- return new PartialSqlString(string.Format("CONCAT({0})", string.Join(", ", args)));`
	`13`	`+ return new PartialSqlString($"CONCAT({string.Join(", ", args)})");`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`protected override string ToCast(string quotedColName)`
`17`	`17`	`{`
`18`		`- return string.Format("cast({0} as char(1000))", quotedColName);`
	`18`	`+ return $"cast({quotedColName} as char(1000))";`
`19`	`19`	`}`
`20`	`20`	`}`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,8 @@ public override void PrepareUpdateStatement(IDbCommand dbCmd, T item, bool exclu`
`20`	`20`	`public override string GetSubstringSql(object quotedColumn, int startIndex, int? length = null)`
`21`	`21`	`{`
`22`	`22`	`return length != null`
`23`		`- ? string.Format("substring({0}, {1}, {2})", quotedColumn, startIndex, length.Value)`
`24`		`- : string.Format("substring({0}, {1}, LEN({0}) - {1} + 1)", quotedColumn, startIndex);`
	`23`	`+ ? $"substring({quotedColumn}, {startIndex}, {length.Value})"`
	`24`	`+ : $"substring({quotedColumn}, {startIndex}, LEN({quotedColumn}) - {startIndex} + 1)";`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`public override SqlExpression<T> OrderByRandom()`
`@@ -94,8 +94,7 @@ internal static void PrepareSqlServerUpdateStatement<T>(IDbCommand dbCmd, SqlExp`
`94`	`94`	`if (strFields.Length == 0)`
`95`	`95`	`throw new ArgumentException("No non-null or non-default values were provided for type: " + typeof(T).Name);`
`96`	`96`
`97`		`- dbCmd.CommandText = string.Format("UPDATE {0} SET {1} {2}",`
`98`		`- dialectProvider.GetQuotedTableName(modelDef), strFields, q.WhereExpression);`
	`97`	`+ dbCmd.CommandText = $"UPDATE {dialectProvider.GetQuotedTableName(modelDef)} SET {strFields} {q.WhereExpression}";`
`99`	`98`	`}`
`100`	`99`	`}`
`101`	`100`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,8 +42,7 @@ public override void PrepareUpdateStatement(IDbCommand dbCmd, T item, bool exclu`
`42`	`42`	`if (strFields.Length == 0)`
`43`	`43`	`throw new ArgumentException("No non-null or non-default values were provided for type: " + typeof(T).Name);`
`44`	`44`
`45`		`- dbCmd.CommandText = string.Format("UPDATE {0} SET {1} {2}",`
`46`		`- DialectProvider.GetQuotedTableName(ModelDef), strFields, WhereExpression);`
	`45`	`+ dbCmd.CommandText = $"UPDATE {DialectProvider.GetQuotedTableName(ModelDef)} SET {strFields} {WhereExpression}";`
`47`	`46`	`}`
`48`	`47`
`49`	`48`	`protected override object VisitColumnAccessMethod(MethodCallExpression m)`
`@@ -64,8 +63,8 @@ protected override object VisitColumnAccessMethod(MethodCallExpression m)`
`64`	`63`	`public override string GetSubstringSql(object quotedColumn, int startIndex, int? length = null)`
`65`	`64`	`{`
`66`	`65`	`return length != null`
`67`		`- ? string.Format("substring({0}, {1}, {2})", quotedColumn, startIndex, length.Value)`
`68`		`- : string.Format("substring({0}, {1}, LEN({0}) - {1} + 1)", quotedColumn, startIndex);`
	`66`	`+ ? $"substring({quotedColumn}, {startIndex}, {length.Value})"`
	`67`	`+ : $"substring({quotedColumn}, {startIndex}, LEN({quotedColumn}) - {startIndex} + 1)";`
`69`	`68`	`}`
`70`	`69`	`}`
`71`	`70`	`}`