Optimize error code for encrypt. (apache#23507)

mzdbxqh · Jan 11, 2023 · 7c6bef8 · 7c6bef8
1 parent 6ca1d03
commit 7c6bef8
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 4 deletions.
diff --git a/docs/document/content/user-manual/error-code/sql-error-code.cn.md b/docs/document/content/user-manual/error-code/sql-error-code.cn.md
@@ -251,6 +251,13 @@ SQL 错误码以标准的 SQL State，Vendor Code 和详细错误信息提供，
 | 42000     | 20740       | Insert value of index \`%s\` can not support for encrypt.                                          |
 | 0A000     | 20741       | The SQL clause \`%s\` is unsupported in encrypt rule.                                              |
 | HY004     | 20780       | Encrypt algorithm \`%s\` initialization failed, reason is: %s.                                     |
+| 44000     | 20703       | Cipher column of \`%s\` can not be null in database \`%s\`.                                        |
+| 44000     | 20704       | Encrypt column encryptor not found, reason is: %s.                                                 |
+| 44000     | 20705       | Assisted query column of \`%s\` can not be null in database \`%s\`.                                |
+| 44000     | 20706       | Assisted query encryptor not found, reason is: %s.                                                 |
+| 44000     | 20707       | Like query column of \`%s\` can not be null in database \`%s\`.                                    |
+| 44000     | 20708       | Encrypt like query encryptor not found, reason is: %s.                                             |
+| 44000     | 20709       | Can not find encrypt table: \`%s\`.                                                                |
 
 ### 影子库
 

diff --git a/docs/document/content/user-manual/error-code/sql-error-code.en.md b/docs/document/content/user-manual/error-code/sql-error-code.en.md
@@ -249,6 +249,13 @@ SQL error codes provide by standard `SQL State`, `Vendor Code` and `Reason`, whi
 | 42000     | 20740       | Insert value of index \`%s\` can not support for encrypt.                                          |
 | 0A000     | 20741       | The SQL clause \`%s\` is unsupported in encrypt rule.                                              |
 | HY004     | 20780       | Encrypt algorithm \`%s\` initialization failed, reason is: %s.                                     |
+| 44000     | 20703       | Cipher column of \`%s\` can not be null in database \`%s\`.                                        |
+| 44000     | 20704       | Encrypt column encryptor not found, reason is: %s.                                                 |
+| 44000     | 20705       | Assisted query column of \`%s\` can not be null in database \`%s\`.                                |
+| 44000     | 20706       | Assisted query encryptor not found, reason is: %s.                                                 |
+| 44000     | 20707       | Like query column of \`%s\` can not be null in database \`%s\`.                                    |
+| 44000     | 20708       | Encrypt like query encryptor not found, reason is: %s.                                             |
+| 44000     | 20709       | Can not find encrypt table: \`%s\`.                                                                |
 
 ### Shadow Database
 

diff --git a/...dingsphere/encrypt/exception/metadata/EncryptAssistedQueryEncryptorNotFoundException.java b/...dingsphere/encrypt/exception/metadata/EncryptAssistedQueryEncryptorNotFoundException.java
@@ -28,6 +28,6 @@ public final class EncryptAssistedQueryEncryptorNotFoundException extends Encryp
     private static final long serialVersionUID = -8700683634804933320L;
 
     public EncryptAssistedQueryEncryptorNotFoundException(final String reason) {
-        super(XOpenSQLState.CHECK_OPTION_VIOLATION, 6, reason);
+        super(XOpenSQLState.CHECK_OPTION_VIOLATION, 6, "Assisted query encryptor not found, reason is: %s.", reason);
     }
 }
diff --git a/...g/apache/shardingsphere/encrypt/exception/metadata/EncryptEncryptorNotFoundException.java b/...g/apache/shardingsphere/encrypt/exception/metadata/EncryptEncryptorNotFoundException.java
@@ -28,6 +28,6 @@ public final class EncryptEncryptorNotFoundException extends EncryptSQLException
     private static final long serialVersionUID = -4847495252826650747L;
 
     public EncryptEncryptorNotFoundException(final String reason) {
-        super(XOpenSQLState.CHECK_OPTION_VIOLATION, 4, reason);
+        super(XOpenSQLState.CHECK_OPTION_VIOLATION, 4, "Encrypt column encryptor not found, reason is: %s.", reason);
     }
 }
diff --git a/...shardingsphere/encrypt/exception/metadata/EncryptLikeQueryEncryptorNotFoundException.java b/...shardingsphere/encrypt/exception/metadata/EncryptLikeQueryEncryptorNotFoundException.java
@@ -28,6 +28,6 @@ public final class EncryptLikeQueryEncryptorNotFoundException extends EncryptSQL
     private static final long serialVersionUID = 1620586484949188815L;
 
     public EncryptLikeQueryEncryptorNotFoundException(final String reason) {
-        super(XOpenSQLState.CHECK_OPTION_VIOLATION, 8, reason);
+        super(XOpenSQLState.CHECK_OPTION_VIOLATION, 8, "Encrypt like query encryptor not found, reason is: %s.", reason);
     }
 }
diff --git a/...a/org/apache/shardingsphere/encrypt/exception/metadata/EncryptTableNotFoundException.java b/...a/org/apache/shardingsphere/encrypt/exception/metadata/EncryptTableNotFoundException.java
@@ -28,6 +28,6 @@ public final class EncryptTableNotFoundException extends EncryptSQLException {
     private static final long serialVersionUID = 8909641495852822938L;
 
     public EncryptTableNotFoundException(final String tableName) {
-        super(XOpenSQLState.CHECK_OPTION_VIOLATION, 9, "Can not find encrypt table: %s", tableName);
+        super(XOpenSQLState.CHECK_OPTION_VIOLATION, 9, "Can not find encrypt table: `%s`.", tableName);
     }
 }