Fixed issue liquibase#7415: MSSQL, SQL Anywhere: Does not quote tablespace name

Author: mkarg

liquibase-standard/src/main/java/liquibase/database/Database.java

@@ -26,7 +26,6 @@
 import liquibase.statement.SqlStatement;
 import liquibase.structure.DatabaseObject;
 import liquibase.structure.core.*;
-import liquibase.util.SqlUtil;
 import liquibase.util.StringUtil;
 
 import java.io.IOException;
@@ -334,6 +333,10 @@ default void addCompleteSqlToScope(String completeSql) {
 
     String escapeTableName(String catalogName, String schemaName, String tableName);
 
+    default String escapeTablespaceName(String tablespaceName) {
+        return escapeObjectName(tablespaceName, Tablespace.class);
+    }
+
     String escapeIndexName(String catalogName, String schemaName, String indexName);
 
     String escapeObjectName(String objectName, Class<? extends DatabaseObject> objectType);

liquibase-standard/src/main/java/liquibase/database/core/MSSQLDatabase.java

@@ -315,6 +315,20 @@ public String escapeTableName(String catalogName, String schemaName, String tabl
         return tableName;
     }
 
+    @Override
+    public String escapeTablespaceName(String tablespaceName) {
+        //
+        // If the tablespace name has a parenthesis in it, the escape logic might mistake it for stored logic
+        // and not add quotes. We can check for a space and the lack of a quote at the beginning and quote
+        // it anyway.
+        //
+        tablespaceName = escapeObjectName(tablespaceName, Tablespace.class);
+        if (tablespaceName != null && tablespaceName.contains(" ") && ! tablespaceName.startsWith("\"")) {
+            tablespaceName = "\"" + tablespaceName + "\"";
+        }
+        return tablespaceName;
+    }
+
     @Override
     public boolean supportsTablespaces() {
         return true;

liquibase-standard/src/main/java/liquibase/sqlgenerator/core/AddPrimaryKeyGenerator.java

@@ -64,7 +64,7 @@ public Sql[] generateSql(AddPrimaryKeyStatement statement, Database database, Sq
 
         if ((StringUtil.trimToNull(statement.getTablespace()) != null) && database.supportsTablespaces()) {
             if (database instanceof MSSQLDatabase) {
-                sql += " ON "+statement.getTablespace();
+                sql += " ON " + database.escapeTablespaceName(statement.getTablespace());
             } else if ((database instanceof AbstractDb2Database) || (database instanceof SybaseASADatabase)) {
                 //not supported
             } else {

liquibase-standard/src/main/java/liquibase/sqlgenerator/core/AddUniqueConstraintGenerator.java

@@ -81,7 +81,7 @@ public Sql[] generateSql(AddUniqueConstraintStatement statement, Database databa
 
         if ((StringUtil.trimToNull(statement.getTablespace()) != null) && database.supportsTablespaces()) {
             if (database instanceof MSSQLDatabase) {
-                sql += " ON " + statement.getTablespace();
+                sql += " ON " + database.escapeTablespaceName(statement.getTablespace());
             } else if ((database instanceof AbstractDb2Database) || (database instanceof SybaseASADatabase) || (database
                 instanceof InformixDatabase)) {
                 //not supported

liquibase-standard/src/main/java/liquibase/sqlgenerator/core/CreateIndexGenerator.java

@@ -184,7 +184,7 @@ public Sql[] generateSql(CreateIndexStatement statement, Database database, SqlG
 
 	    if ((StringUtil.trimToNull(statement.getTablespace()) != null) && database.supportsTablespaces()) {
 		    if ((database instanceof MSSQLDatabase) || (database instanceof SybaseASADatabase)) {
-			    buffer.append(" ON ").append(statement.getTablespace());
+			    buffer.append(" ON ").append(database.escapeTablespaceName(statement.getTablespace()));
 		    } else if ((database instanceof AbstractDb2Database) || (database instanceof InformixDatabase)) {
 			    buffer.append(" IN ").append(statement.getTablespace());
 		    } else {

liquibase-standard/src/main/java/liquibase/sqlgenerator/core/CreateTableGenerator.java

@@ -347,7 +347,7 @@ public Sql[] generateSql(CreateTableStatement statement, Database database, SqlG
 
         if ((statement.getTablespace() != null) && database.supportsTablespaces()) {
             if ((database instanceof MSSQLDatabase) || (database instanceof SybaseASADatabase)) {
-                sql += " ON " + statement.getTablespace();
+                sql += " ON " + database.escapeTablespaceName(statement.getTablespace());
             } else if ((database instanceof AbstractDb2Database) || (database instanceof InformixDatabase)) {
                 sql += " IN " + statement.getTablespace();
             } else {

liquibase-standard/src/main/java/liquibase/structure/core/Tablespace.java

@@ -0,0 +1,8 @@
+package liquibase.structure.core;
+
+import liquibase.structure.DatabaseObject;
+
+/**
+ * Marker type, solely used as type input for for escapeObjectName()
+ */
+public abstract class Tablespace implements DatabaseObject {};