Convert .Fmt over to use c# 6 string interpolation

mythz · mythz · commit 227cb3880efb · 2017-05-18T09:44:48.000-04:00
diff --git a/src/ServiceStack.OrmLite.SqlServer/Converters/SqlServerStringConverters.cs b/src/ServiceStack.OrmLite.SqlServer/Converters/SqlServerStringConverters.cs
@@ -20,8 +20,8 @@ public override string GetColumnDefinition(int? stringLength)
                 UseUnicode ? 4000 : 8000);
 
             return UseUnicode
-                ? "NVARCHAR({0})".Fmt(safeLength)
-                : "VARCHAR({0})".Fmt(safeLength);
+                ? $"NVARCHAR({safeLength})"
+                : $"VARCHAR({safeLength})";
         }
 
         public override void InitDbParam(IDbDataParameter p, Type fieldType)
diff --git a/src/ServiceStack.OrmLite.SqlServer/Converters/SqlServerTimeConverter.cs b/src/ServiceStack.OrmLite.SqlServer/Converters/SqlServerTimeConverter.cs
@@ -9,20 +9,11 @@ public class SqlServerTimeConverter : OrmLiteConverter
 
         public int? Precision { get; set; }
 
-        public override string ColumnDefinition
-        {
-            get
-            {
-                return Precision != null
-                    ? "TIME({0})".Fmt(Precision.Value)
-                    : "TIME";
-            }
-        }
+        public override string ColumnDefinition => Precision != null
+            ? $"TIME({Precision.Value})"
+            : "TIME";
 
-        public override DbType DbType
-        {
-            get { return DbType.DateTime; }
-        }
+        public override DbType DbType => DbType.DateTime;
 
         public override object ToDbValue(Type fieldType, object value)
         {
diff --git a/src/ServiceStack.OrmLite.SqlServer/SqlServerExpression.cs b/src/ServiceStack.OrmLite.SqlServer/SqlServerExpression.cs
@@ -50,7 +50,7 @@ protected override void VisitFilter(string operand, object originalLeft, object
 
             if (originalRight is TimeSpan && DialectProvider.GetConverter<TimeSpan>() is SqlServerTimeConverter)
             {
-                right = "CAST({0} AS TIME)".Fmt(right);
+                right = $"CAST({right} AS TIME)";
             }
         }
 
diff --git a/src/ServiceStack.OrmLite.SqlServer/SqlServerTableHint.cs b/src/ServiceStack.OrmLite.SqlServer/SqlServerTableHint.cs
@@ -2,10 +2,10 @@
 {
     public class SqlServerTableHint
     {
-        public static JoinFormatDelegate ReadUncommitted = (dialect, tableDef, expr) => "{0} WITH (READUNCOMMITTED) {1}".Fmt(dialect.GetQuotedTableName(tableDef), expr);
-        public static JoinFormatDelegate ReadCommitted = (dialect, tableDef, expr) => "{0} WITH (READCOMMITTED) {1}".Fmt(dialect.GetQuotedTableName(tableDef), expr);
-        public static JoinFormatDelegate ReadPast = (dialect, tableDef, expr) => "{0} WITH (READPAST) {1}".Fmt(dialect.GetQuotedTableName(tableDef), expr);
-        public static JoinFormatDelegate Serializable = (dialect, tableDef, expr) => "{0} WITH (SERIALIZABLE) {1}".Fmt(dialect.GetQuotedTableName(tableDef), expr);
-        public static JoinFormatDelegate RepeatableRead = (dialect, tableDef, expr) => "{0} WITH (REPEATABLEREAD) {1}".Fmt(dialect.GetQuotedTableName(tableDef), expr);
+        public static JoinFormatDelegate ReadUncommitted = (dialect, tableDef, expr) => $"{dialect.GetQuotedTableName(tableDef)} WITH (READUNCOMMITTED) {expr}";
+        public static JoinFormatDelegate ReadCommitted = (dialect, tableDef, expr) => $"{dialect.GetQuotedTableName(tableDef)} WITH (READCOMMITTED) {expr}";
+        public static JoinFormatDelegate ReadPast = (dialect, tableDef, expr) => $"{dialect.GetQuotedTableName(tableDef)} WITH (READPAST) {expr}";
+        public static JoinFormatDelegate Serializable = (dialect, tableDef, expr) => $"{dialect.GetQuotedTableName(tableDef)} WITH (SERIALIZABLE) {expr}";
+        public static JoinFormatDelegate RepeatableRead = (dialect, tableDef, expr) => $"{dialect.GetQuotedTableName(tableDef)} WITH (REPEATABLEREAD) {expr}";
     }
 }
diff --git a/src/ServiceStack.OrmLite.Sqlite/Converters/SqliteDateTimeConverter.cs b/src/ServiceStack.OrmLite.Sqlite/Converters/SqliteDateTimeConverter.cs
@@ -71,7 +71,7 @@ public override object GetValue(IDataReader reader, int columnIndex, object[] va
 
                 var dateStr = value as string;
                 if (dateStr == null)
-                    throw new Exception("Converting from {0} to DateTime is not supported".Fmt(value.GetType().Name));
+                    throw new Exception($"Converting from {value.GetType().Name} to DateTime is not supported");
 
                 Log.Warn("Error reading string as DateTime in Sqlite: " + dateStr, ex);
                 return DateTime.Parse(dateStr);
diff --git a/src/ServiceStack.OrmLite.Sqlite/SqliteOrmLiteDialectProviderBase.cs b/src/ServiceStack.OrmLite.Sqlite/SqliteOrmLiteDialectProviderBase.cs
@@ -46,7 +46,7 @@ public override string ToPostDropTableStatement(ModelDefinition modelDef)
             if (modelDef.RowVersion != null)
             {
                 var triggerName = GetTriggerName(modelDef);
-                return "DROP TRIGGER IF EXISTS {0}".Fmt(GetQuotedName(triggerName));
+                return $"DROP TRIGGER IF EXISTS {GetQuotedName(triggerName)}";
             }
 
             return null;
@@ -63,13 +63,12 @@ public override string ToPostCreateTableStatement(ModelDefinition modelDef)
             {
                 var triggerName = GetTriggerName(modelDef);
                 var tableName = GetTableName(modelDef);
-                var triggerBody = "UPDATE {0} SET {1} = OLD.{1} + 1 WHERE {2} = NEW.{2};".Fmt(
+                var triggerBody = string.Format("UPDATE {0} SET {1} = OLD.{1} + 1 WHERE {2} = NEW.{2};",
                     tableName, 
                     modelDef.RowVersion.FieldName.SqlColumn(this), 
                     modelDef.PrimaryKey.FieldName.SqlColumn(this));
 
-                var sql = "CREATE TRIGGER {0} BEFORE UPDATE ON {1} FOR EACH ROW BEGIN {2} END;".Fmt(
-                    triggerName, tableName, triggerBody);
+                var sql = $"CREATE TRIGGER {triggerName} BEFORE UPDATE ON {tableName} FOR EACH ROW BEGIN {triggerBody} END;";
 
                 return sql;
             }
@@ -83,14 +82,14 @@ public static string CreateFullTextCreateTableStatement(object objectWithPropert
             foreach (var propertyInfo in objectWithProperties.GetType().GetProperties(BindingFlags.Public | BindingFlags.Instance))
             {
                 var columnDefinition = (sbColumns.Length == 0)
-                    ? string.Format("{0} TEXT PRIMARY KEY", propertyInfo.Name)
-                    : string.Format(", {0} TEXT", propertyInfo.Name);
+                    ? $"{propertyInfo.Name} TEXT PRIMARY KEY"
+                    : $", {propertyInfo.Name} TEXT";
 
                 sbColumns.AppendLine(columnDefinition);
             }
 
             var tableName = objectWithProperties.GetType().Name;
-            var sql = string.Format("CREATE VIRTUAL TABLE \"{0}\" USING FTS3 ({1});", tableName, StringBuilderCache.ReturnAndFree(sbColumns));
+            var sql = $"CREATE VIRTUAL TABLE \"{tableName}\" USING FTS3 ({StringBuilderCache.ReturnAndFree(sbColumns)});";
 
             return sql;
         }
diff --git a/src/ServiceStack.OrmLite/Async/OrmLiteReadCommandExtensionsAsync.cs b/src/ServiceStack.OrmLite/Async/OrmLiteReadCommandExtensionsAsync.cs
@@ -376,7 +376,7 @@ internal static Task<List<TOutputModel>> SqlProcedureFmtAsync<TOutputModel>(this
                 var fields = fieldDefs.Select(q => q.FieldName);
                 var invalid = include.Except<string>(fields).ToList();
                 if (invalid.Count > 0)
-                    throw new ArgumentException("Fields '{0}' are not Reference Properties of Type '{1}'".Fmt(invalid.Join("', '"), typeof(T).Name));
+                    throw new ArgumentException($"Fields '{invalid.Join("', '")}' are not Reference Properties of Type '{typeof(T).Name}'");
 
                 fieldDefs = fieldDefs.Where(fd => include.Contains(fd.FieldName)).ToList();
             }
@@ -407,7 +407,7 @@ internal static Task<List<TOutputModel>> SqlProcedureFmtAsync<TOutputModel>(this
                 var fields = fieldDefs.Select(q => q.FieldName);
                 var invalid = include.Except<string>(fields).ToList();
                 if (invalid.Count > 0)
-                    throw new ArgumentException("Fields '{0}' are not Reference Properties of Type '{1}'".Fmt(invalid.Join("', '"), typeof(From).Name));
+                    throw new ArgumentException($"Fields '{invalid.Join("', '")}' are not Reference Properties of Type '{typeof(From).Name}'");
 
                 fieldDefs = loadList.FieldDefs.Where(fd => include.Contains(fd.FieldName)).ToList();
             }
diff --git a/src/ServiceStack.OrmLite/Async/ReadExpressionCommandExtensionsAsync.cs b/src/ServiceStack.OrmLite/Async/ReadExpressionCommandExtensionsAsync.cs
@@ -129,13 +129,13 @@ internal static Task<long> GetCountAsync(this IDbCommand dbCmd, string sql, IEnu
 
         internal static Task<long> RowCountAsync<T>(this IDbCommand dbCmd, SqlExpression<T> expression, CancellationToken token)
         {
-            var sql = "SELECT COUNT(*) FROM ({0}) AS COUNT".Fmt(expression.ToSelectStatement(), token);
+            var sql = $"SELECT COUNT(*) FROM ({expression.ToSelectStatement()}) AS COUNT";
             return dbCmd.ScalarAsync<long>(sql, token);
         }
 
         internal static Task<long> RowCountAsync(this IDbCommand dbCmd, string sql, CancellationToken token)
         {
-            return dbCmd.ScalarAsync<long>("SELECT COUNT(*) FROM ({0}) AS COUNT".Fmt(sql), token);
+            return dbCmd.ScalarAsync<long>($"SELECT COUNT(*) FROM ({sql}) AS COUNT", token);
         }
 
         internal static Task<List<T>> LoadSelectAsync<T>(this IDbCommand dbCmd, SqlExpression<T> expression = null, string[] include = null, CancellationToken token = default(CancellationToken))
diff --git a/src/ServiceStack.OrmLite/Converters/StringConverter.cs b/src/ServiceStack.OrmLite/Converters/StringConverter.cs
@@ -20,8 +20,8 @@ public StringConverter(int stringLength)
         protected string maxColumnDefinition;
         public virtual string MaxColumnDefinition
         {
-            get { return maxColumnDefinition ?? ColumnDefinition; }
-            set { maxColumnDefinition = value; }
+            get => maxColumnDefinition ?? ColumnDefinition;
+            set => maxColumnDefinition = value;
         }
 
         public override string ColumnDefinition => GetColumnDefinition(StringLength);
@@ -32,8 +32,8 @@ public virtual string GetColumnDefinition(int? stringLength)
                 return MaxColumnDefinition;
 
             return UseUnicode
-                ? "NVARCHAR({0})".Fmt(stringLength.GetValueOrDefault(StringLength))
-                : "VARCHAR({0})".Fmt(stringLength.GetValueOrDefault(StringLength));
+                ? $"NVARCHAR({stringLength.GetValueOrDefault(StringLength)})"
+                : $"VARCHAR({stringLength.GetValueOrDefault(StringLength)})";
         }
 
         public override object FromDbValue(Type fieldType, object value)
diff --git a/src/ServiceStack.OrmLite/Expressions/SqlExpression.Join.cs b/src/ServiceStack.OrmLite/Expressions/SqlExpression.Join.cs
@@ -169,7 +169,7 @@ private string InternalCreateSqlFromDefinitions(ModelDefinition sourceDef, Model
                 return string.Empty;
             }
 
-            return "{0}\n({1}.{2} = {3}.{4})".Fmt(
+            return string.Format("{0}\n({1}.{2} = {3}.{4})",
                 isCrossJoin ? "WHERE" : "ON",
                 DialectProvider.GetQuotedTableName(parentDef),
                 SqlColumn(parentDef.PrimaryKey.FieldName),
diff --git a/src/ServiceStack.OrmLite/Expressions/SqlExpression.cs b/src/ServiceStack.OrmLite/Expressions/SqlExpression.cs
@@ -1355,7 +1355,7 @@ protected virtual object VisitBinary(BinaryExpression b)
                 var args = this.VisitExpressionList(methodExpr.Arguments);
                 right = GetValue(args[1], typeof(string));
                 ConvertToPlaceholderAndParameter(ref right);
-                return new PartialSqlString("({0} {1} {2})".Fmt(args[0], operand, right));
+                return new PartialSqlString($"({args[0]} {operand} {right})");
             }
             else
             {
@@ -2248,7 +2248,7 @@ protected string ConvertInExpressionToSql(MethodCallExpression m, object quotedC
                 return $"{quotedColName} IN ({subSelect})";
             }
 
-            throw new NotSupportedException("In({0})".Fmt(argValue.GetType()));
+            throw new NotSupportedException($"In({argValue.GetType()})");
         }
 
         protected virtual object VisitColumnAccessMethod(MethodCallExpression m)
diff --git a/src/ServiceStack.OrmLite/OrmLiteConfig.cs b/src/ServiceStack.OrmLite/OrmLiteConfig.cs
@@ -106,7 +106,7 @@ public static void SetCommandTimeout(this IDbConnection db, int? commandTimeout)
         {
             var ormLiteConn = db as OrmLiteConnection;
             if (ormLiteConn == null)
-                throw new NotImplementedException(RequiresOrmLiteConnection.Fmt("CommandTimeout"));
+                throw new NotImplementedException(string.Format(RequiresOrmLiteConnection,"CommandTimeout"));
 
             ormLiteConn.CommandTimeout = commandTimeout;
         }
diff --git a/src/ServiceStack.OrmLite/OrmLiteConnectionFactory.cs b/src/ServiceStack.OrmLite/OrmLiteConnectionFactory.cs
@@ -104,7 +104,7 @@ public virtual IDbConnection OpenDbConnectionString(string connectionString, str
 
             IOrmLiteDialectProvider dialectProvider;
             if (!DialectProviders.TryGetValue(providerName, out dialectProvider))
-                throw new ArgumentException("{0} is not a registered DialectProvider".Fmt(providerName));
+                throw new ArgumentException($"{providerName} is not a registered DialectProvider");
 
             var dbFactory = new OrmLiteConnectionFactory(connectionString, dialectProvider, setGlobalDialectProvider:false);
 
diff --git a/src/ServiceStack.OrmLite/OrmLiteContext.cs b/src/ServiceStack.OrmLite/OrmLiteContext.cs
@@ -190,7 +190,7 @@ public OrmLiteState()
 
         public override string ToString()
         {
-            return "State Id: {0}".Fmt(Id);
+            return $"State Id: {Id}";
         }
     }
 }
diff --git a/src/ServiceStack.OrmLite/OrmLiteDialectProviderBase.cs b/src/ServiceStack.OrmLite/OrmLiteDialectProviderBase.cs
@@ -137,7 +137,7 @@ public string GetColumnTypeDefinition(Type columnType, int? fieldLength, int? sc
                     return customLengthConverter.GetColumnDefinition(fieldLength);
 
                 if (string.IsNullOrEmpty(converter.ColumnDefinition))
-                    throw new ArgumentException("{0} requires a ColumnDefinition".Fmt(converter.GetType().Name));
+                    throw new ArgumentException($"{converter.GetType().Name} requires a ColumnDefinition");
 
                 return converter.ColumnDefinition;
             }
@@ -320,8 +320,7 @@ public virtual object ToDbValue(object value, Type type)
             }
             catch (Exception ex)
             {
-                Log.Error("Error in {0}.ToDbValue() value '{1}' and Type '{2}'"
-                    .Fmt(converter.GetType().Name, value.GetType().Name, type.Name), ex);
+                Log.Error($"Error in {converter.GetType().Name}.ToDbValue() value '{value.GetType().Name}' and Type '{type.Name}'", ex);
                 throw;
             }
         }
@@ -338,8 +337,7 @@ public virtual object FromDbValue(object value, Type type)
             }
             catch (Exception ex)
             {
-                Log.Error("Error in {0}.FromDbValue() value '{1}' and Type '{2}'"
-                    .Fmt(converter.GetType().Name, value.GetType().Name, type.Name), ex);
+                Log.Error($"Error in {converter.GetType().Name}.FromDbValue() value '{value.GetType().Name}' and Type '{type.Name}'", ex);
                 throw;
             }
         }
@@ -919,7 +917,7 @@ public virtual void SetParameterValues<T>(IDbCommand dbCmd, object obj)
                     }
 
                     if (fieldDef == null)
-                        throw new ArgumentException("Field Definition '{0}' was not found".Fmt(fieldName));
+                        throw new ArgumentException($"Field Definition '{fieldName}' was not found");
                 }
 
                 SetParameterValue<T>(fieldDef, p, obj);
@@ -958,8 +956,7 @@ public object GetFieldValue(FieldDefinition fieldDef, object value)
             }
             catch (Exception ex)
             {
-                Log.Error("Error in {0}.ToDbValue() for field '{1}' of Type '{2}' with value '{3}'"
-                    .Fmt(converter.GetType().Name, fieldDef.Name, fieldDef.FieldType, value.GetType().Name), ex);
+                Log.Error($"Error in {converter.GetType().Name}.ToDbValue() for field '{fieldDef.Name}' of Type '{fieldDef.FieldType}' with value '{value.GetType().Name}'", ex);
                 throw;
             }
         }
@@ -976,8 +973,7 @@ public object GetFieldValue(Type fieldType, object value)
             }
             catch (Exception ex)
             {
-                Log.Error("Error in {0}.ToDbValue() for field of Type '{1}' with value '{2}'"
-                    .Fmt(converter.GetType().Name, fieldType, value.GetType().Name), ex);
+                Log.Error($"Error in {converter.GetType().Name}.ToDbValue() for field of Type '{fieldType}' with value '{value.GetType().Name}'", ex);
                 throw;
             }
         }
@@ -1526,8 +1522,7 @@ public virtual string GetQuotedValue(object value, Type fieldType)
             }
             catch (Exception ex)
             {
-                Log.Error("Error in {0}.ToQuotedString() value '{0}' and Type '{1}'"
-                    .Fmt(converter.GetType().Name, value.GetType().Name, fieldType.Name), ex);
+                Log.Error($"Error in {converter.GetType().Name}.ToQuotedString() value '{converter.GetType().Name}' and Type '{value.GetType().Name}'", ex);
                 throw;
             }
         }
@@ -1557,7 +1552,7 @@ public virtual string GetLoadChildrenSubSelect<From>(SqlExpression<From> expr)
 
         public virtual string ToRowCountStatement(string innerSql)
         {
-            return "SELECT COUNT(*) FROM ({0}) AS COUNT".Fmt(innerSql);
+            return $"SELECT COUNT(*) FROM ({innerSql}) AS COUNT";
         }
 
         public virtual void DropColumn(IDbConnection db, Type modelType, string columnName)
diff --git a/src/ServiceStack.OrmLite/OrmLiteReadCommandExtensions.cs b/src/ServiceStack.OrmLite/OrmLiteReadCommandExtensions.cs
@@ -875,7 +875,7 @@ public static FieldDefinition GetRefFieldDef(this ModelDefinition modelDef, Mode
         {
             var refField = GetRefFieldDefIfExists(modelDef, refModelDef);
             if (refField == null)
-                throw new ArgumentException("Cant find '{0}' Property on Type '{1}'".Fmt(modelDef.ModelName + "Id", refType.Name));
+                throw new ArgumentException($"Cant find '{modelDef.ModelName + "Id"}' Property on Type '{refType.Name}'");
             return refField;
         }
 
diff --git a/src/ServiceStack.OrmLite/OrmLiteUtils.cs b/src/ServiceStack.OrmLite/OrmLiteUtils.cs
@@ -823,7 +823,7 @@ public static List<Parent> Merge<Parent, Child>(this List<Parent> parents, List<
             }
 
             if (!hasChildRef)
-                throw new Exception("Could not find Child Reference for '{0}' on Parent '{1}'".Fmt(typeof(Child).Name, typeof(Parent).Name));
+                throw new Exception($"Could not find Child Reference for '{typeof(Child).Name}' on Parent '{typeof(Parent).Name}'");
 
             return parents;
         }
diff --git a/src/ServiceStack.OrmLite/OrmLiteWriteCommandExtensions.cs b/src/ServiceStack.OrmLite/OrmLiteWriteCommandExtensions.cs
@@ -669,7 +669,7 @@ internal static void InsertAll<T>(this IDbCommand dbCmd, IEnumerable<T> objs)
                     }
                     catch (Exception ex)
                     {
-                        Log.Error("SQL ERROR: {0}".Fmt(dbCmd.GetLastSqlAndParams()), ex);
+                        Log.Error($"SQL ERROR: {dbCmd.GetLastSqlAndParams()}", ex);
                         throw;
                     }
                 }
@@ -713,7 +713,7 @@ internal static void InsertUsingDefaults<T>(this IDbCommand dbCmd, params T[] ob
                     }
                     catch (Exception ex)
                     {
-                        Log.Error("SQL ERROR: {0}".Fmt(dbCmd.GetLastSqlAndParams()), ex);
+                        Log.Error($"SQL ERROR: {dbCmd.GetLastSqlAndParams()}", ex);
                         throw;
                     }
                 }

Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,8 @@ public override string GetColumnDefinition(int? stringLength)`
`20`	`20`	`UseUnicode ? 4000 : 8000);`
`21`	`21`
`22`	`22`	`return UseUnicode`
`23`		`- ? "NVARCHAR({0})".Fmt(safeLength)`
`24`		`- : "VARCHAR({0})".Fmt(safeLength);`
	`23`	`+ ? $"NVARCHAR({safeLength})"`
	`24`	`+ : $"VARCHAR({safeLength})";`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`public override void InitDbParam(IDbDataParameter p, Type fieldType)`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ protected override void VisitFilter(string operand, object originalLeft, object`
`50`	`50`
`51`	`51`	`if (originalRight is TimeSpan && DialectProvider.GetConverter<TimeSpan>() is SqlServerTimeConverter)`
`52`	`52`	`{`
`53`		`- right = "CAST({0} AS TIME)".Fmt(right);`
	`53`	`+ right = $"CAST({right} AS TIME)";`
`54`	`54`	`}`
`55`	`55`	`}`
`56`	`56`
Original file line number	Diff line number	Diff line change
`@@ -2,10 +2,10 @@`
`2`	`2`	`{`
`3`	`3`	`public class SqlServerTableHint`
`4`	`4`	`{`
`5`		`- public static JoinFormatDelegate ReadUncommitted = (dialect, tableDef, expr) => "{0} WITH (READUNCOMMITTED) {1}".Fmt(dialect.GetQuotedTableName(tableDef), expr);`
`6`		`- public static JoinFormatDelegate ReadCommitted = (dialect, tableDef, expr) => "{0} WITH (READCOMMITTED) {1}".Fmt(dialect.GetQuotedTableName(tableDef), expr);`
`7`		`- public static JoinFormatDelegate ReadPast = (dialect, tableDef, expr) => "{0} WITH (READPAST) {1}".Fmt(dialect.GetQuotedTableName(tableDef), expr);`
`8`		`- public static JoinFormatDelegate Serializable = (dialect, tableDef, expr) => "{0} WITH (SERIALIZABLE) {1}".Fmt(dialect.GetQuotedTableName(tableDef), expr);`
`9`		`- public static JoinFormatDelegate RepeatableRead = (dialect, tableDef, expr) => "{0} WITH (REPEATABLEREAD) {1}".Fmt(dialect.GetQuotedTableName(tableDef), expr);`
	`5`	`+ public static JoinFormatDelegate ReadUncommitted = (dialect, tableDef, expr) => $"{dialect.GetQuotedTableName(tableDef)} WITH (READUNCOMMITTED) {expr}";`
	`6`	`+ public static JoinFormatDelegate ReadCommitted = (dialect, tableDef, expr) => $"{dialect.GetQuotedTableName(tableDef)} WITH (READCOMMITTED) {expr}";`
	`7`	`+ public static JoinFormatDelegate ReadPast = (dialect, tableDef, expr) => $"{dialect.GetQuotedTableName(tableDef)} WITH (READPAST) {expr}";`
	`8`	`+ public static JoinFormatDelegate Serializable = (dialect, tableDef, expr) => $"{dialect.GetQuotedTableName(tableDef)} WITH (SERIALIZABLE) {expr}";`
	`9`	`+ public static JoinFormatDelegate RepeatableRead = (dialect, tableDef, expr) => $"{dialect.GetQuotedTableName(tableDef)} WITH (REPEATABLEREAD) {expr}";`
`10`	`10`	`}`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public override string ToPostDropTableStatement(ModelDefinition modelDef)`
`46`	`46`	`if (modelDef.RowVersion != null)`
`47`	`47`	`{`
`48`	`48`	`var triggerName = GetTriggerName(modelDef);`
`49`		`- return "DROP TRIGGER IF EXISTS {0}".Fmt(GetQuotedName(triggerName));`
	`49`	`+ return $"DROP TRIGGER IF EXISTS {GetQuotedName(triggerName)}";`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`return null;`
`@@ -63,13 +63,12 @@ public override string ToPostCreateTableStatement(ModelDefinition modelDef)`
`63`	`63`	`{`
`64`	`64`	`var triggerName = GetTriggerName(modelDef);`
`65`	`65`	`var tableName = GetTableName(modelDef);`
`66`		`- var triggerBody = "UPDATE {0} SET {1} = OLD.{1} + 1 WHERE {2} = NEW.{2};".Fmt(`
	`66`	`+ var triggerBody = string.Format("UPDATE {0} SET {1} = OLD.{1} + 1 WHERE {2} = NEW.{2};",`
`67`	`67`	`tableName,`
`68`	`68`	`modelDef.RowVersion.FieldName.SqlColumn(this),`
`69`	`69`	`modelDef.PrimaryKey.FieldName.SqlColumn(this));`
`70`	`70`
`71`		`- var sql = "CREATE TRIGGER {0} BEFORE UPDATE ON {1} FOR EACH ROW BEGIN {2} END;".Fmt(`
`72`		`- triggerName, tableName, triggerBody);`
	`71`	`+ var sql = $"CREATE TRIGGER {triggerName} BEFORE UPDATE ON {tableName} FOR EACH ROW BEGIN {triggerBody} END;";`
`73`	`72`
`74`	`73`	`return sql;`
`75`	`74`	`}`
`@@ -83,14 +82,14 @@ public static string CreateFullTextCreateTableStatement(object objectWithPropert`
`83`	`82`	`foreach (var propertyInfo in objectWithProperties.GetType().GetProperties(BindingFlags.Public \| BindingFlags.Instance))`
`84`	`83`	`{`
`85`	`84`	`var columnDefinition = (sbColumns.Length == 0)`
`86`		`- ? string.Format("{0} TEXT PRIMARY KEY", propertyInfo.Name)`
`87`		`- : string.Format(", {0} TEXT", propertyInfo.Name);`
	`85`	`+ ? $"{propertyInfo.Name} TEXT PRIMARY KEY"`
	`86`	`+ : $", {propertyInfo.Name} TEXT";`
`88`	`87`
`89`	`88`	`sbColumns.AppendLine(columnDefinition);`
`90`	`89`	`}`
`91`	`90`
`92`	`91`	`var tableName = objectWithProperties.GetType().Name;`
`93`		`- var sql = string.Format("CREATE VIRTUAL TABLE \"{0}\" USING FTS3 ({1});", tableName, StringBuilderCache.ReturnAndFree(sbColumns));`
	`92`	`+ var sql = $"CREATE VIRTUAL TABLE \"{tableName}\" USING FTS3 ({StringBuilderCache.ReturnAndFree(sbColumns)});";`
`94`	`93`
`95`	`94`	`return sql;`
`96`	`95`	`}`
Original file line number	Diff line number	Diff line change
`@@ -129,13 +129,13 @@ internal static Task<long> GetCountAsync(this IDbCommand dbCmd, string sql, IEnu`
`129`	`129`
`130`	`130`	`internal static Task<long> RowCountAsync<T>(this IDbCommand dbCmd, SqlExpression<T> expression, CancellationToken token)`
`131`	`131`	`{`
`132`		`- var sql = "SELECT COUNT(*) FROM ({0}) AS COUNT".Fmt(expression.ToSelectStatement(), token);`
	`132`	`+ var sql = $"SELECT COUNT(*) FROM ({expression.ToSelectStatement()}) AS COUNT";`
`133`	`133`	`return dbCmd.ScalarAsync<long>(sql, token);`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`internal static Task<long> RowCountAsync(this IDbCommand dbCmd, string sql, CancellationToken token)`
`137`	`137`	`{`
`138`		`- return dbCmd.ScalarAsync<long>("SELECT COUNT(*) FROM ({0}) AS COUNT".Fmt(sql), token);`
	`138`	`+ return dbCmd.ScalarAsync<long>($"SELECT COUNT(*) FROM ({sql}) AS COUNT", token);`
`139`	`139`	`}`
`140`	`140`
`141`	`141`	`internal static Task<List<T>> LoadSelectAsync<T>(this IDbCommand dbCmd, SqlExpression<T> expression = null, string[] include = null, CancellationToken token = default(CancellationToken))`
Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,8 @@ public StringConverter(int stringLength)`
`20`	`20`	`protected string maxColumnDefinition;`
`21`	`21`	`public virtual string MaxColumnDefinition`
`22`	`22`	`{`
`23`		`- get { return maxColumnDefinition ?? ColumnDefinition; }`
`24`		`- set { maxColumnDefinition = value; }`
	`23`	`+ get => maxColumnDefinition ?? ColumnDefinition;`
	`24`	`+ set => maxColumnDefinition = value;`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`public override string ColumnDefinition => GetColumnDefinition(StringLength);`
`@@ -32,8 +32,8 @@ public virtual string GetColumnDefinition(int? stringLength)`
`32`	`32`	`return MaxColumnDefinition;`
`33`	`33`
`34`	`34`	`return UseUnicode`
`35`		`- ? "NVARCHAR({0})".Fmt(stringLength.GetValueOrDefault(StringLength))`
`36`		`- : "VARCHAR({0})".Fmt(stringLength.GetValueOrDefault(StringLength));`
	`35`	`+ ? $"NVARCHAR({stringLength.GetValueOrDefault(StringLength)})"`
	`36`	`+ : $"VARCHAR({stringLength.GetValueOrDefault(StringLength)})";`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`public override object FromDbValue(Type fieldType, object value)`
Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,7 @@ private string InternalCreateSqlFromDefinitions(ModelDefinition sourceDef, Model`
`169`	`169`	`return string.Empty;`
`170`	`170`	`}`
`171`	`171`
`172`		`- return "{0}\n({1}.{2} = {3}.{4})".Fmt(`
	`172`	`+ return string.Format("{0}\n({1}.{2} = {3}.{4})",`
`173`	`173`	`isCrossJoin ? "WHERE" : "ON",`
`174`	`174`	`DialectProvider.GetQuotedTableName(parentDef),`
`175`	`175`	`SqlColumn(parentDef.PrimaryKey.FieldName),`