remove table creator dependency on "id" column name

MV10 · MV10 · commit a68e5367e634 · 2018-09-08T08:34:29.000-04:00
diff --git a/src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/SqlTableCreator.cs b/src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/SqlTableCreator.cs
@@ -45,16 +45,14 @@ private static string GetSqlFromDataTable(string tableName, DataTable table, str
 
             // columns
             bool hasPrimaryKey = false;
-            bool clusteredIndex = true;
             int numOfColumns = table.Columns.Count;
             int i = 1;
             foreach (DataColumn column in table.Columns)
             {
                 sql.AppendFormat("[{0}] {1}", column.ColumnName, SqlGetType(column));
-                if (column.ColumnName.ToUpper().Equals("ID") || column.AutoIncrement)
+                if (column.AutoIncrement) // the PK is always auto-increment (IDENTITY)
                 {
                     hasPrimaryKey = true;
-                    clusteredIndex = (bool)column.ExtendedProperties["clusteredIndex"];
                     sql.Append(" IDENTITY(1,1) ");
                 }
                 if (numOfColumns > i)
@@ -65,6 +63,7 @@ private static string GetSqlFromDataTable(string tableName, DataTable table, str
             // primary keys
             if (hasPrimaryKey)
             {
+                var clusteredIndex = (bool)table.PrimaryKey[0].ExtendedProperties["clusteredIndex"];
                 sql.AppendFormat(" CONSTRAINT [PK_{0}] PRIMARY KEY {1}CLUSTERED (", tableName, clusteredIndex ? string.Empty : "NON" );
 
                 int numOfKeys = table.PrimaryKey.Length;

Original file line number	Diff line number	Diff line change
`@@ -45,16 +45,14 @@ private static string GetSqlFromDataTable(string tableName, DataTable table, str`
`45`	`45`
`46`	`46`	`// columns`
`47`	`47`	`bool hasPrimaryKey = false;`
`48`		`- bool clusteredIndex = true;`
`49`	`48`	`int numOfColumns = table.Columns.Count;`
`50`	`49`	`int i = 1;`
`51`	`50`	`foreach (DataColumn column in table.Columns)`
`52`	`51`	`{`
`53`	`52`	`sql.AppendFormat("[{0}] {1}", column.ColumnName, SqlGetType(column));`
`54`		`- if (column.ColumnName.ToUpper().Equals("ID") \|\| column.AutoIncrement)`
	`53`	`+ if (column.AutoIncrement) // the PK is always auto-increment (IDENTITY)`
`55`	`54`	`{`
`56`	`55`	`hasPrimaryKey = true;`
`57`		`- clusteredIndex = (bool)column.ExtendedProperties["clusteredIndex"];`
`58`	`56`	`sql.Append(" IDENTITY(1,1) ");`
`59`	`57`	`}`
`60`	`58`	`if (numOfColumns > i)`
`@@ -65,6 +63,7 @@ private static string GetSqlFromDataTable(string tableName, DataTable table, str`
`65`	`63`	`// primary keys`
`66`	`64`	`if (hasPrimaryKey)`
`67`	`65`	`{`
	`66`	`+ var clusteredIndex = (bool)table.PrimaryKey[0].ExtendedProperties["clusteredIndex"];`
`68`	`67`	`sql.AppendFormat(" CONSTRAINT [PK_{0}] PRIMARY KEY {1}CLUSTERED (", tableName, clusteredIndex ? string.Empty : "NON" );`
`69`	`68`
`70`	`69`	`int numOfKeys = table.PrimaryKey.Length;`