rewrite: Simplified MSSQLDatabase escaping

Author: mkarg

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

@@ -309,8 +309,8 @@ public String escapeTableName(String catalogName, String schemaName, String tabl
         // it anyway.
         //
         tableName = escapeObjectName(catalogName, schemaName, tableName, Table.class);
-        if (tableName != null && tableName.contains(" ") && ! tableName.startsWith("\"")) {
-            tableName = "\"" + tableName + "\"";
+        if (tableName != null && tableName.contains(" ") && ! isQuoted(tableName)) {
+            tableName = quoteObject(tableName, Table.class);
         }
         return tableName;
     }
@@ -323,8 +323,8 @@ public String escapeTablespaceName(String tablespaceName) {
         // it anyway.
         //
         tablespaceName = escapeObjectName(tablespaceName, Tablespace.class);
-        if (tablespaceName != null && tablespaceName.contains(" ") && ! tablespaceName.startsWith("\"")) {
-            tablespaceName = "\"" + tablespaceName + "\"";
+        if (tablespaceName != null && tablespaceName.contains(" ") && ! isQuoted(tablespaceName)) {
+            tablespaceName = quoteObject(tablespaceName, Tablespace.class);
         }
         return tablespaceName;
     }
@@ -745,4 +745,8 @@ public static class SpecificConfiguration implements AutoloadedConfigurations {
                 .setDescription("Number of bytes needed to store one character (depends on database's character encoding)")
                 .build();
     }
+
+    private boolean isQuoted(final String name) {
+        return name.startsWith(getQuotingStartCharacter()) || name.startsWith("\"");
+    }
 }

liquibase-standard/src/test/java/liquibase/database/core/MSSQLDatabaseTest.java

@@ -187,8 +187,8 @@ public void testEscapeTablespaceName_withSpaces() throws DatabaseException {
             // When: Escaping the tablespace name
             String result = database.escapeTablespaceName(tablespaceName);
 
-            // Then: The tablespace name should be bracket-escaped (spaces require brackets) and wrapped in double quotes
-            assertEquals("\"[My Tablespace]\"", result);
+            // Then: The tablespace name should be bracket-escaped (spaces require brackets)
+            assertEquals("[My Tablespace]", result);
         } catch (final DatabaseException e) {
             throw e;
         }
@@ -251,8 +251,8 @@ public void testEscapeTablespaceName_withSpacesAndSpecialCharacters() throws Dat
             // When: Escaping the tablespace name
             String result = database.escapeTablespaceName(tablespaceName);
 
-            // Then: The tablespace name should be bracket-escaped and double-quoted
-            assertEquals("\"[My €Tablespace]\"", result);
+            // Then: The tablespace name should be bracket-escaped
+            assertEquals("[My €Tablespace]", result);
         } catch (final DatabaseException e) {
             throw e;
         }

liquibase-standard/src/test/java/liquibase/sqlgenerator/core/CreateTableGeneratorTest.java

@@ -1315,7 +1315,7 @@ public void testTablespaceEscaping_mssql_withSpaces() {
 
                 // Then: The tablespace should be escaped with brackets and wrapped in double quotes
                 assertTrue(
-                    "Expected tablespace with spaces to be bracket-escaped and double-quoted, but got: " + generatedSql[0].toSql(), generatedSql[0].toSql().contains("ON \"[My Tablespace]\""));
+                    "Expected tablespace with spaces to be bracket-escaped, but got: " + generatedSql[0].toSql(), generatedSql[0].toSql().contains("ON [My Tablespace]"));
             }
         }
     }