Add support for custom index names

ServiceStack · Aug 17, 2018 · 9beeba7 · 9beeba7
1 parent 0415860
commit 9beeba7
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 5 deletions.
diff --git a/src/ServiceStack.OrmLite.Firebird/FirebirdOrmLiteDialectProvider.cs b/src/ServiceStack.OrmLite.Firebird/FirebirdOrmLiteDialectProvider.cs
@@ -404,7 +404,7 @@ public override List<string> ToCreateIndexStatements(Type tableType)
             {
                 if (!fieldDef.IsIndexed) continue;
 
-                var indexName = GetIndexName(
+                var indexName = fieldDef.IndexName ?? GetIndexName(
                     fieldDef.IsUniqueIndex, modelDef.ModelName, fieldDef.FieldName);
 
                 sqlIndexes.Add(

diff --git a/src/ServiceStack.OrmLite.Oracle/OracleOrmLiteDialectProvider.cs b/src/ServiceStack.OrmLite.Oracle/OracleOrmLiteDialectProvider.cs
@@ -635,7 +635,7 @@ public override List<string> ToCreateIndexStatements(Type tableType)
             {
                 if (!fieldDef.IsIndexed) continue;
 
-                var indexName = GetIndexName(
+                var indexName = fieldDef.IndexName ?? GetIndexName(
                     fieldDef.IsUniqueIndex,
                     (modelDef.IsInSchema
                         ? modelDef.Schema + "_" + modelDef.ModelName

diff --git a/src/ServiceStack.OrmLite/FieldDefinition.cs b/src/ServiceStack.OrmLite/FieldDefinition.cs
@@ -47,6 +47,8 @@ public class FieldDefinition
         public bool IsClustered { get; set; }
 
         public bool IsNonClustered { get; set; }
+
+        public string IndexName { get; set; }
 
         public bool IsRowVersion { get; set; }
 

diff --git a/src/ServiceStack.OrmLite/OrmLiteConfigExtensions.cs b/src/ServiceStack.OrmLite/OrmLiteConfigExtensions.cs
@@ -148,8 +148,9 @@ internal static ModelDefinition GetModelDefinition(this Type modelType)
                     AutoId = isAutoId,
                     IsIndexed = !isPrimaryKey && isIndex,
                     IsUniqueIndex = isUnique,
-                    IsClustered = indexAttr != null && indexAttr.Clustered,
-                    IsNonClustered = indexAttr != null && indexAttr.NonClustered,
+                    IsClustered = indexAttr?.Clustered == true,
+                    IsNonClustered = indexAttr?.NonClustered == true,
+                    IndexName = indexAttr?.Name, 
                     IsRowVersion = isRowVersion,
                     IgnoreOnInsert = propertyInfo.HasAttribute<IgnoreOnInsertAttribute>(),
                     IgnoreOnUpdate = propertyInfo.HasAttribute<IgnoreOnUpdateAttribute>(),

diff --git a/src/ServiceStack.OrmLite/OrmLiteDialectProviderBase.cs b/src/ServiceStack.OrmLite/OrmLiteDialectProviderBase.cs
@@ -1319,7 +1319,8 @@ public virtual List<string> ToCreateIndexStatements(Type tableType)
             {
                 if (!fieldDef.IsIndexed) continue;
 
-                var indexName = GetIndexName(fieldDef.IsUniqueIndex, modelDef.ModelName.SafeVarName(), fieldDef.FieldName);
+                var indexName = fieldDef.IndexName 
+                    ?? GetIndexName(fieldDef.IsUniqueIndex, modelDef.ModelName.SafeVarName(), fieldDef.FieldName);
 
                 sqlIndexes.Add(
                     ToCreateIndexStatement(fieldDef.IsUniqueIndex, indexName, modelDef, fieldDef.FieldName, isCombined: false, fieldDef: fieldDef));

diff --git a/tests/ServiceStack.OrmLite.Tests/OrmLiteCreateTableWithIndexesTests.cs b/tests/ServiceStack.OrmLite.Tests/OrmLiteCreateTableWithIndexesTests.cs
@@ -29,6 +29,7 @@ public void Can_create_ModelWithIndexFields_table()
 
                 Assert.That(sql, Does.Contain(indexName));
                 Assert.That(sql, Does.Contain(uniqueName));
+                Assert.That(sql, Does.Contain("altname"));
             }
         }
 

diff --git a/tests/ServiceStack.OrmLite.Tests/Shared/ModelWithIndexFields.cs b/tests/ServiceStack.OrmLite.Tests/Shared/ModelWithIndexFields.cs
@@ -13,5 +13,8 @@ public class ModelWithIndexFields
 
         [Index(true)]
         public string UniqueName { get; set; }
+
+        [Index(Name = "altname")]
+        public string Custom { get; set; }
     }
 }