Revise apache#33885 (apache#33903)

seakider · Dec 3, 2024 · b76029b · b76029b
1 parent 47552e8
commit b76029b
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/...he/shardingsphere/infra/exception/postgresql/mapper/PostgreSQLDialectExceptionMapper.java b/...he/shardingsphere/infra/exception/postgresql/mapper/PostgreSQLDialectExceptionMapper.java
@@ -58,8 +58,7 @@ public SQLException convert(final SQLDialectException sqlDialectException) {
             return new PostgreSQLException(new ServerErrorMessage(FATAL_SEVERITY, PostgreSQLVendorError.DUPLICATE_DATABASE, ((DatabaseCreateExistsException) sqlDialectException).getDatabaseName()));
         }
         if (sqlDialectException instanceof NoSuchTableException) {
-            NoSuchTableException cause = (NoSuchTableException) sqlDialectException;
-            return new PostgreSQLException(new ServerErrorMessage(FATAL_SEVERITY, PostgreSQLVendorError.NO_SUCH_TABLE, cause.getTableName()));
+            return new PostgreSQLException(new ServerErrorMessage(FATAL_SEVERITY, PostgreSQLVendorError.NO_SUCH_TABLE, ((NoSuchTableException) sqlDialectException).getTableName()));
         }
         if (sqlDialectException instanceof TableExistsException) {
             return new PostgreSQLException(new ServerErrorMessage(ERROR_SEVERITY, PostgreSQLVendorError.DUPLICATE_TABLE, ((TableExistsException) sqlDialectException).getTableName()));

diff --git a/...n/java/org/apache/shardingsphere/infra/exception/postgresql/sqlstate/PostgreSQLState.java b/...n/java/org/apache/shardingsphere/infra/exception/postgresql/sqlstate/PostgreSQLState.java
@@ -29,13 +29,22 @@
 public enum PostgreSQLState implements SQLState {
 
     PROTOCOL_VIOLATION("08P01"),
+
     SYNTAX_ERROR("42601"),
+
     DUPLICATE_DATABASE("42P04"),
+
     DUPLICATE_TABLE("42P07"),
+
     INVALID_PASSWORD("28P01"),
-    UNDEFINED_COLUMN("42703"),
+
     UNDEFINED_TABLE("42P01"),
+
+    UNDEFINED_COLUMN("42703"),
+
     SYSTEM_ERROR("58000"),
+
     UNEXPECTED_ERROR("99999");
+
     private final String value;
 }
diff --git a/...va/org/apache/shardingsphere/infra/exception/postgresql/vendor/PostgreSQLVendorError.java b/...va/org/apache/shardingsphere/infra/exception/postgresql/vendor/PostgreSQLVendorError.java
@@ -48,10 +48,13 @@ public enum PostgreSQLVendorError implements VendorError {
     INVALID_AUTHORIZATION_SPECIFICATION(XOpenSQLState.INVALID_AUTHORIZATION_SPECIFICATION, "unknown username: %s"),
 
     NO_USERNAME(XOpenSQLState.INVALID_AUTHORIZATION_SPECIFICATION, "no PostgreSQL user name specified in startup packet"),
-    NO_SUCH_TABLE(PostgreSQLState.UNDEFINED_TABLE, "Table '%s' doesn't exist"),
+
     INVALID_PASSWORD(PostgreSQLState.INVALID_PASSWORD, "password authentication failed for user \"%s\""),
+
     INVALID_CATALOG_NAME(XOpenSQLState.INVALID_CATALOG_NAME, "database \"%s\" does not exist"),
 
+    NO_SUCH_TABLE(PostgreSQLState.UNDEFINED_TABLE, "Table \"%s\" does not exist"),
+
     UNDEFINED_COLUMN(PostgreSQLState.UNDEFINED_COLUMN, "Column \"%s\" of table \"%s\" does not exist"),
 
     DATA_SOURCE_REJECTED_CONNECTION_ATTEMPT(XOpenSQLState.DATA_SOURCE_REJECTED_CONNECTION_ATTEMPT, "server rejected establishment of sql connection"),