Merge pull request #42 from ajoneil/1

Fix index issues in /dev/build
silverstripe · Feb 12, 2017 · 761b42f · 761b42f
2 parents f3574a6 + d9ec128
commit 761b42f
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/code/MSSQLSchemaManager.php b/code/MSSQLSchemaManager.php
@@ -606,7 +606,10 @@ protected function getIndexSqlDefinition($tableName, $indexName, $indexSpec)
         $drop = "IF EXISTS (SELECT name FROM sys.indexes WHERE name = '$index') DROP INDEX $index ON \"$tableName\";";
 
         // create a type-specific index
-        if ($indexSpec['type'] == 'fulltext' && $this->database->fullTextEnabled()) {
+        if ($indexSpec['type'] == 'fulltext') {
+            if(!$this->database->fullTextEnabled()) {
+                return '';
+            }
             // enable fulltext on this table
             $this->createFullTextCatalog();
             $primary_key = $this->getPrimaryKey($tableName);
@@ -695,7 +698,7 @@ public function indexNames($tableName)
         return $this->preparedQuery('
 			SELECT ind.name FROM sys.indexes ind
 			INNER JOIN sys.tables t ON ind.object_id = t.object_id
-			WHERE is_primary_key = 0 AND t.name = ?',
+			WHERE is_primary_key = 0 AND t.name = ? AND ind.name IS NOT NULL',
             array($tableName)
         )->column();
     }