This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 7c6bef8cae5 Optimize error code for encrypt. (#23507)
7c6bef8cae5 is described below
commit 7c6bef8cae50d7754a1e298c5f935294569f91e0
Author: Chuxin Chen <[email protected]>
AuthorDate: Wed Jan 11 21:16:00 2023 +0800
Optimize error code for encrypt. (#23507)
---
docs/document/content/user-manual/error-code/sql-error-code.cn.md | 7 +++++++
docs/document/content/user-manual/error-code/sql-error-code.en.md | 7 +++++++
.../metadata/EncryptAssistedQueryEncryptorNotFoundException.java | 2 +-
.../exception/metadata/EncryptEncryptorNotFoundException.java | 2 +-
.../metadata/EncryptLikeQueryEncryptorNotFoundException.java | 2 +-
.../encrypt/exception/metadata/EncryptTableNotFoundException.java | 2 +-
6 files changed, 18 insertions(+), 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
index 6144a704b9e..00f851fe8c8 100644
--- 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
index 81f89abef65..38e93e74e8f 100644
--- 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/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/exception/metadata/EncryptAssistedQueryEncryptorNotFoundException.java
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/exception/metadata/EncryptAssistedQueryEncryptorNotFoundException.java
index 9f8b7b7525b..0dfb7218f68 100644
---
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/exception/metadata/EncryptAssistedQueryEncryptorNotFoundException.java
+++
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/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/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/exception/metadata/EncryptEncryptorNotFoundException.java
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/exception/metadata/EncryptEncryptorNotFoundException.java
index 146b3fd226d..8443bab3992 100644
---
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/exception/metadata/EncryptEncryptorNotFoundException.java
+++
b/features/encrypt/core/src/main/java/org/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/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/exception/metadata/EncryptLikeQueryEncryptorNotFoundException.java
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/exception/metadata/EncryptLikeQueryEncryptorNotFoundException.java
index aac5019c3d8..7a2e2a5bbbc 100644
---
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/exception/metadata/EncryptLikeQueryEncryptorNotFoundException.java
+++
b/features/encrypt/core/src/main/java/org/apache/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/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/exception/metadata/EncryptTableNotFoundException.java
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/exception/metadata/EncryptTableNotFoundException.java
index 053d0158161..7ce6dad9ba8 100644
---
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/exception/metadata/EncryptTableNotFoundException.java
+++
b/features/encrypt/core/src/main/java/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);
}
}
