Merge pull request #545 from KevinHoward/master

Fixed issue were SQL Server In-Memory tables require a non-clustered primary key.

Author: mythz

src/ServiceStack.OrmLite.SqlServer/SqlServer2014OrmLiteDialectProvider.cs

@@ -16,6 +16,8 @@ public override string ToCreateTableStatement(Type tableType)
             var sbConstraints = StringBuilderCacheAlt.Allocate();
             var sbMemOptimized = StringBuilderCacheAlt.Allocate();
 
+            var isMemoryTable = tableType.HasAttribute<SqlServerMemoryOptimizedAttribute>();
+
             var modelDef = OrmLiteUtils.GetModelDefinition(tableType);
             foreach (var fieldDef in modelDef.FieldDefinitions)
             {
@@ -37,6 +39,23 @@ public override string ToCreateTableStatement(Type tableType)
                 if (columnDefinition == null)
                     continue;
 
+                var collationAttribs = fieldDef.PropertyInfo.GetAttributes<SqlServerCollateAttribute>();
+                if (collationAttribs.Count > 0)
+                {
+                    columnDefinition += $" COLLATE {collationAttribs[0].collation}";
+                }
+
+                if (isMemoryTable && fieldDef.IsPrimaryKey)
+                {
+                    columnDefinition = columnDefinition.Replace("PRIMARY KEY", "PRIMARY KEY NONCLUSTERED");
+
+                    var bucketCountAtribs = fieldDef.PropertyInfo.GetAttributes<SqlServerBucketCountAttribute>();
+                    if (bucketCountAtribs.Count > 0)
+                    {
+                        columnDefinition += $" HASH WITH (BUCKET_COUNT={bucketCountAtribs[0].count})";
+                    }
+                }
+
                 if (sbColumns.Length != 0)
                     sbColumns.Append(", \n  ");
 
@@ -54,10 +73,10 @@ public override string ToCreateTableStatement(Type tableType)
                 sbConstraints.Append(GetForeignKeyOnUpdateClause(fieldDef.ForeignKey));
             }
 
-            if (tableType.HasAttribute<SqlServerMemoryOptimizedAttribute>())
+            if (isMemoryTable)
             {
-                sbMemOptimized.Append(" WITH (MEMORY_OPTIMIZED=ON");
                 var attrib = tableType.FirstAttribute<SqlServerMemoryOptimizedAttribute>();
+                sbMemOptimized.Append(" WITH (MEMORY_OPTIMIZED=ON");
                 if (attrib.Durability == SqlServerDurability.SchemaOnly)
                     sbMemOptimized.Append(", DURABILITY=SCHEMA_ONLY");
                 else if (attrib.Durability == SqlServerDurability.SchemaAndData)

src/ServiceStack.OrmLite.SqlServerTests/MemoryOptimizedAttributeTests.cs

@@ -50,7 +50,7 @@ public void CanCreateMemoryOptimizedTableWithSchemaAndDurability()
     [SqlServerMemoryOptimized]
     public class TypeWithMemTableNoDurability
         {
-        [AutoIncrement]
+        [PrimaryKey]
         public int Id { get; set; }
 
         public string Name { get; set; }
@@ -59,7 +59,7 @@ public class TypeWithMemTableNoDurability
     [SqlServerMemoryOptimized(SqlServerDurability.SchemaOnly)]
     public class TypeWithMemTableSchemaOnlyDurability
     {
-        [AutoIncrement]
+        [PrimaryKey]
         public int Id { get; set; }
 
         public string Name { get; set; }
@@ -68,7 +68,7 @@ public class TypeWithMemTableSchemaOnlyDurability
     [SqlServerMemoryOptimized(SqlServerDurability.SchemaAndData)]
     public class TypeWithMemTableSchemaAndDataDurability
     {
-        [AutoIncrement]
+        [PrimaryKey]
         public int Id { get; set; }
 
         public string Name { get; set; }