Merge pull request #11934 from dbeaver/sql-server-unicode-string#11058

#11058 SQL Server use unicode prefix for strings

Former-commit-id: 4275aa8f

plugins/org.jkiss.dbeaver.ext.mssql/src/org/jkiss/dbeaver/ext/mssql/edit/SQLServerBaseTableManager.java

@@ -59,9 +59,9 @@ public abstract class SQLServerBaseTableManager<OBJECT extends SQLServerTableBas
                 new SQLDatabasePersistAction(
                     "Add table comment",
                     "EXEC " + SQLServerUtils.getSystemTableName(table.getDatabase(), isUpdate ? "sp_updateextendedproperty" : "sp_addextendedproperty") +
-                        " 'MS_Description', N" + SQLUtils.quoteString(command.getObject(), command.getObject().getDescription()) + "," +
-                        " 'schema', N'" + table.getSchema().getName() + "'," +
-                        " '" + (table.isView() ? "view" : "table") + "', N'" + table.getName() + "'"));
+                        " 'MS_Description', " + SQLUtils.quoteString(table, table.getDescription()) + "," +
+                        " 'schema', " + SQLUtils.quoteString(table, table.getSchema().getName()) + "," +
+                        " '" + (table.isView() ? "view" : "table") + "', " + SQLUtils.quoteString(table, table.getName())));
         }
     }
 
@@ -74,7 +74,7 @@ public abstract class SQLServerBaseTableManager<OBJECT extends SQLServerTableBas
                 "Rename table",
                 "EXEC " + SQLServerUtils.getSystemTableName(object.getDatabase(), "sp_rename") +
                     " N'" + object.getSchema().getFullyQualifiedName(DBPEvaluationContext.DML) + "." + DBUtils.getQuotedIdentifier(object.getDataSource(), command.getOldName()) +
-                    "' , N'" + DBUtils.getQuotedIdentifier(object.getDataSource(), command.getNewName()) + "', 'OBJECT'")
+                    "', " + SQLUtils.quoteString(object.getDataSource(), command.getNewName()) + ", 'OBJECT'")
         );
     }
 

plugins/org.jkiss.dbeaver.ext.mssql/src/org/jkiss/dbeaver/ext/mssql/edit/SQLServerProcedureManager.java

@@ -120,9 +120,9 @@ public class SQLServerProcedureManager extends SQLServerObjectManager<SQLServerP
                 new SQLDatabasePersistAction(
                     "Add procedure comment",
                     "EXEC " + SQLServerUtils.getSystemTableName(database, isUpdate ? "sp_updateextendedproperty" : "sp_addextendedproperty") +
-                        " 'MS_Description', N" + SQLUtils.quoteString(command.getObject(), command.getObject().getDescription()) + "," +
-                        " 'schema', N'" + procedure.getContainer().getName() + "'," +
-                        " 'procedure', N'" + procedure.getName() + "'"));
+                        " 'MS_Description', " + SQLUtils.quoteString(procedure, procedure.getDescription()) + "," +
+                        " 'schema', " + SQLUtils.quoteString(procedure, procedure.getContainer().getName()) + "," +
+                        " 'procedure', " + SQLUtils.quoteString(procedure, procedure.getName())));
         }
     }
 

plugins/org.jkiss.dbeaver.ext.mssql/src/org/jkiss/dbeaver/ext/mssql/edit/SQLServerTableColumnManager.java

@@ -170,10 +170,10 @@ public class SQLServerTableColumnManager extends SQLTableColumnManager<SQLServer
                 new SQLDatabasePersistAction(
                     "Add column comment",
                     "EXEC " + SQLServerUtils.getSystemTableName(column.getTable().getDatabase(), isUpdate ? "sp_updateextendedproperty" : "sp_addextendedproperty") +
-                        " 'MS_Description', N" + SQLUtils.quoteString(command.getObject(), command.getObject().getDescription()) + "," +
-                        " 'schema', N'" + column.getTable().getSchema().getName() + "'," +
-                        " 'table', N'" + column.getTable().getName() + "'," +
-                        " 'column', N'" + column.getName() + "'"));
+                        " 'MS_Description', " + SQLUtils.quoteString(column, column.getDescription()) + "," +
+                        " 'schema', " + SQLUtils.quoteString(column, column.getTable().getSchema().getName()) + "," +
+                        " 'table', " + SQLUtils.quoteString(column, column.getTable().getName()) + "," +
+                        " 'column', " + SQLUtils.quoteString(column, column.getName())));
         }
         if (totalProps > 0) {
             actionList.add(new SQLDatabasePersistAction(

plugins/org.jkiss.dbeaver.ext.mssql/src/org/jkiss/dbeaver/ext/mssql/model/SQLServerDialect.java

@@ -248,4 +248,27 @@ public class SQLServerDialect extends JDBCSQLDialect {
         sql.append("\nSELECT\t'Return Value' = @return_value\n\n");
         sql.append("GO\n\n");
     }
+
+    @Override
+    public boolean isQuotedString(String string) {
+        if (string.length() >= 3 && string.charAt(0) == 'N') {
+            // https://docs.microsoft.com/en-us/sql/t-sql/data-types/nchar-and-nvarchar-transact-sql
+            return super.isQuotedString(string.substring(1));
+        }
+        return super.isQuotedString(string);
+    }
+
+    @Override
+    public String getQuotedString(String string) {
+        return 'N' + super.getQuotedString(string);
+    }
+
+    @Override
+    public String getUnquotedString(String string) {
+        if (string.length() >= 3 && string.charAt(0) == 'N') {
+            // https://docs.microsoft.com/en-us/sql/t-sql/data-types/nchar-and-nvarchar-transact-sql
+            return super.getUnquotedString(string.substring(1));
+        }
+        return super.getUnquotedString(string);
+    }
 }

plugins/org.jkiss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/model/MySQLTableColumn.java

@@ -155,7 +155,7 @@ public class MySQLTableColumn extends JDBCTableColumn<MySQLTableBase> implements
                 case STRING:
                     // Escape if it is not NULL (#1913)
                     // Although I didn't reproduce that locally - perhaps depends on server config.
-                    if (!SQLConstants.NULL_VALUE.equals(defaultValue) && !SQLUtils.isStringQuoted(defaultValue)) {
+                    if (!SQLConstants.NULL_VALUE.equals(defaultValue) && !SQLUtils.isStringQuoted(getDataSource(), defaultValue)) {
                         defaultValue = SQLUtils.quoteString(getDataSource(), defaultValue);
                     }
                     break;

plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/sql/AbstractSQLDialect.java

@@ -433,6 +433,21 @@ public abstract class AbstractSQLDialect implements SQLDialect {
         return identifier;
     }
 
+    @Override
+    public boolean isQuotedString(String string) {
+        return string.length() >= 2 && string.charAt(0) == '\'' && string.charAt(string.length() - 1) == '\'';
+    }
+
+    @Override
+    public String getQuotedString(String string) {
+        return '\'' + escapeString(string) + '\'';
+    }
+
+    @Override
+    public String getUnquotedString(String string) {
+        return isQuotedString(string) ? unEscapeString(string.substring(1, string.length() - 1)) : string;
+    }
+
     @NotNull
     @Override
     public String escapeString(String string) {

plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/sql/SQLDialect.java

@@ -292,6 +292,12 @@ public interface SQLDialect {
 
     String getUnquotedIdentifier(String identifier);
 
+    boolean isQuotedString(String string);
+
+    String getQuotedString(String string);
+
+    String getUnquotedString(String string);
+
     /**
      * Escapes string to make usable inside of SQL queries.
      * Basically it has to escape only ' character which delimits strings.

plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/sql/SQLUtils.java

@@ -210,9 +210,8 @@ public final class SQLUtils {
         }
     }
 
-    public static boolean isStringQuoted(String string)
-    {
-        return string.length() > 1 && string.startsWith("'") && string.endsWith("'");
+    public static boolean isStringQuoted(DBSObject object, String string) {
+        return object.getDataSource().getSQLDialect().isQuotedString(string);
     }
 
     public static String quoteString(DBSObject object, String string)
@@ -222,7 +221,7 @@ public final class SQLUtils {
 
     public static String quoteString(DBPDataSource dataSource, String string)
     {
-        return "'" + escapeString(dataSource, string) + "'";
+        return dataSource.getSQLDialect().getQuotedString(string);
     }
 
     public static String escapeString(DBPDataSource dataSource, String string)
@@ -661,12 +660,9 @@ public final class SQLUtils {
             case STRING:
             case ROWID:
                 if (sqlDialect != null) {
-                    strValue = sqlDialect.escapeString(strValue);
-                }
-                if (dataKind == DBPDataKind.STRING || !(strValue.startsWith("'") && strValue.endsWith("'"))) {
-                    strValue = '\'' + strValue + '\'';
+                    return sqlDialect.getTypeCastClause(attribute, sqlDialect.getQuotedString(strValue));
                 }
-                return sqlDialect.getTypeCastClause(attribute, strValue);
+                return strValue;
             default:
                 if (sqlDialect != null) {
                     return sqlDialect.escapeScriptValue(attribute, value, strValue);