#124 with unit test

martinjw · Aug 27, 2021 · 944f175 · 944f175
1 parent 36ccd21
commit 944f175
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 2 deletions.
diff --git a/DatabaseSchemaReader/ProviderSchemaReaders/Databases/Oracle/Indexes.cs b/DatabaseSchemaReader/ProviderSchemaReaders/Databases/Oracle/Indexes.cs
@@ -23,7 +23,8 @@ public Indexes(int? commandTimeout, string owner, string tableName) : base(comma
   COLUMN_NAME,
   COLUMN_POSITION,
   DESCEND, --normally ASC
-  DECODE(UNIQUENESS,'UNIQUE',1,0) IsUnique
+  DECODE(UNIQUENESS,'UNIQUE',1,0) IsUnique,
+  ix.INDEX_TYPE
 FROM ALL_IND_COLUMNS cols
 INNER JOIN ALL_INDEXES ix
 	ON ix.OWNER = cols.INDEX_OWNER AND ix.INDEX_NAME = cols.INDEX_NAME
@@ -58,6 +59,7 @@ protected override void Mapper(IDataRecord record)
                     TableName = tableName,
                     Name = name,
                     IsUnique = record.GetBoolean("IsUnique"),
+                    IndexType = record.GetString("INDEX_TYPE")
                 };
                 Result.Add(index);
             }

diff --git a/DatabaseSchemaReader/SqlGen/SqlServer/ConstraintWriter.cs b/DatabaseSchemaReader/SqlGen/SqlServer/ConstraintWriter.cs
@@ -35,7 +35,7 @@ public override string WritePrimaryKey(DatabaseConstraint constraint)
                 //the pk index will have IndexType of PRIMARY NONCLUSTERED
                 var pkIndex = Table.Indexes.Find(x => x.IndexType?.IndexOf("PRIMARY", StringComparison.OrdinalIgnoreCase) != -1);
                 if (pkIndex != null &&
-                    pkIndex.IndexType.IndexOf("NONCLUSTERED", StringComparison.OrdinalIgnoreCase) != -1)
+                    pkIndex.IndexType?.IndexOf("NONCLUSTERED", StringComparison.OrdinalIgnoreCase) > -1)
                 {
                     nonClustered = "NONCLUSTERED";
                 }

diff --git a/DatabaseSchemaReaderTest/SqlGen/Migrations/UnitTests/MigrationAddPrimaryKey.cs b/DatabaseSchemaReaderTest/SqlGen/Migrations/UnitTests/MigrationAddPrimaryKey.cs
@@ -3,6 +3,7 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System;
 using System.Data;
+using System.Linq;
 
 namespace DatabaseSchemaReaderTest.SqlGen.Migrations.UnitTests
 {
@@ -115,5 +116,28 @@ public void TestConstraintEscaping()
             sql = migration.AddTable(newTable);
             Assert.IsTrue(sql.Contains("ALTER TABLE \"Chapter\" ADD CONSTRAINT \"Chapter_Pk\" PRIMARY KEY (\"Id\");"), "Escaping for names");
         }
+
+
+        [TestMethod]
+        public void TestPrimaryKeyNoIndexType()
+        {
+            //#119 escaping was not cascaded down from table generator to constraint generator
+
+            //arrange
+            var schemaTemp = new DatabaseSchema(null, SqlType.Oracle);
+            var newTable = schemaTemp.AddTable("Chapter");
+            var idColumn = newTable.AddColumn("Id", DbType.Int64);
+            idColumn.AddPrimaryKey("Chapter_Pk").AddIndex("PK_Index");
+            //deliberately set indextype to null (from non SqlServer db)
+            newTable.Indexes.Find(x => x.Name == "PK_Index").IndexType = null;
+
+            var migration = new DdlGeneratorFactory(SqlType.SqlServer).MigrationGenerator();
+            migration.EscapeNames = false;
+
+            //act
+            var sql = migration.AddTable(newTable);
+
+            Assert.IsTrue(sql.Contains("ALTER TABLE Chapter ADD CONSTRAINT Chapter_Pk PRIMARY KEY (Id)"), "No escaping for names");
+        }
     }
 }