From d9ec1287356c867d2002676dac5721110964b000 Mon Sep 17 00:00:00 2001 From: Andrew O'Neil Date: Fri, 3 Feb 2017 11:47:48 +1100 Subject: [PATCH] Fix index issues in /dev/build --- code/MSSQLSchemaManager.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/code/MSSQLSchemaManager.php b/code/MSSQLSchemaManager.php index eb00d81..eb7c4fe 100644 --- a/code/MSSQLSchemaManager.php +++ b/code/MSSQLSchemaManager.php @@ -606,7 +606,10 @@ class MSSQLSchemaManager extends DBSchemaManager $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 @@ class MSSQLSchemaManager extends DBSchemaManager 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(); }