Redefine SyntaxSQLException's vendor codes (apache#20917)

charlesvhe · Sep 11, 2022 · c529653 · c529653
1 parent e9b0b03
commit c529653
Show file tree

Hide file tree

Showing 15 changed files with 29 additions and 29 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
@@ -24,11 +24,11 @@ SQL 错误码以标准的 SQL State，Vendor Code 和详细错误信息提供，
 | HY004     | 11005       | Unsupported conversion stream charset \`%s\` |
 | HY004     | 11006       | Unsupported conversion data type \`%s\` for value \`%s\` |
 | 42000     | 12000       | You have an error in your SQL syntax: %s |
-| HV008     | 12002       | Column index \`%d\` is out of range |
-| 42S02     | 12003       | Can not find column label \`%s\` |
-| 0A000     | 12004       | DROP TABLE ... CASCADE is not supported |
-| HY000     | 12005       | Could not support variable \`%s\` |
-| HY004     | 12010       | SQL String can not be NULL or empty |
+| 42000     | 12001       | SQL String can not be NULL or empty |
+| 42000     | 12002       | Could not support variable \`%s\` |
+| 0A000     | 12003       | DROP TABLE ... CASCADE is not supported |
+| 42S02     | 12004       | Can not find column label \`%s\` |
+| HV008     | 12005       | Column index \`%d\` is out of range |
 | 01000     | 13000       | Circuit break open, the request has been ignored |
 | 08000     | 13001       | Can not get %d connections one time, partition succeed connection(%d) have released. Please consider increasing the \`maxPoolSize\` of the data sources or decreasing the \`max-connections-size-per-query\` in properties |
 | 08000     | 13002       | Connection has been closed |

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
@@ -24,11 +24,11 @@ SQL error codes provide by standard `SQL State`, `Vendor Code` and `Reason`, whi
 | HY004     | 11005       | Unsupported conversion stream charset \`%s\` |
 | HY004     | 11006       | Unsupported conversion data type \`%s\` for value \`%s\` |
 | 42000     | 12000       | You have an error in your SQL syntax: %s |
-| HV008     | 12002       | Column index \`%d\` is out of range |
-| 42S02     | 12003       | Can not find column label \`%s\` |
-| 0A000     | 12004       | DROP TABLE ... CASCADE is not supported |
-| HY000     | 12005       | Could not support variable \`%s\` |
-| HY004     | 12010       | SQL String can not be NULL or empty |
+| 42000     | 12001       | SQL String can not be NULL or empty |
+| 42000     | 12002       | Could not support variable \`%s\` |
+| 0A000     | 12003       | DROP TABLE ... CASCADE is not supported |
+| 42S02     | 12004       | Can not find column label \`%s\` |
+| HV008     | 12005       | Column index \`%d\` is out of range |
 | 01000     | 13000       | Circuit break open, the request has been ignored |
 | 08000     | 13001       | Can not get %d connections one time, partition succeed connection(%d) have released. Please consider increasing the \`maxPoolSize\` of the data sources or decreasing the \`max-connections-size-per-query\` in properties |
 | 08000     | 13002       | Connection has been closed |

diff --git a/.../java/org/apache/shardingsphere/driver/jdbc/core/connection/ShardingSphereConnection.java b/.../java/org/apache/shardingsphere/driver/jdbc/core/connection/ShardingSphereConnection.java
@@ -23,7 +23,7 @@
 import org.apache.shardingsphere.driver.jdbc.core.datasource.metadata.ShardingSphereDatabaseMetaData;
 import org.apache.shardingsphere.driver.jdbc.core.statement.ShardingSpherePreparedStatement;
 import org.apache.shardingsphere.driver.jdbc.core.statement.ShardingSphereStatement;
-import org.apache.shardingsphere.driver.jdbc.exception.ConnectionClosedException;
+import org.apache.shardingsphere.driver.jdbc.exception.connection.ConnectionClosedException;
 import org.apache.shardingsphere.infra.context.ConnectionContext;
 import org.apache.shardingsphere.infra.util.exception.ShardingSpherePreconditions;
 import org.apache.shardingsphere.mode.manager.ContextManager;

diff --git a/.../java/org/apache/shardingsphere/driver/jdbc/core/resultset/DatabaseMetaDataResultSet.java b/.../java/org/apache/shardingsphere/driver/jdbc/core/resultset/DatabaseMetaDataResultSet.java
@@ -18,9 +18,9 @@
 package org.apache.shardingsphere.driver.jdbc.core.resultset;
 
 import lombok.EqualsAndHashCode;
-import org.apache.shardingsphere.driver.jdbc.exception.ColumnIndexOutOfRangeException;
-import org.apache.shardingsphere.driver.jdbc.exception.ColumnLabelNotFoundException;
-import org.apache.shardingsphere.driver.jdbc.exception.ResultSetClosedException;
+import org.apache.shardingsphere.driver.jdbc.exception.syntax.ColumnIndexOutOfRangeException;
+import org.apache.shardingsphere.driver.jdbc.exception.syntax.ColumnLabelNotFoundException;
+import org.apache.shardingsphere.driver.jdbc.exception.connection.ResultSetClosedException;
 import org.apache.shardingsphere.driver.jdbc.unsupported.AbstractUnsupportedDatabaseMetaDataResultSet;
 import org.apache.shardingsphere.infra.executor.sql.execute.result.query.impl.driver.jdbc.type.util.ResultSetUtil;
 import org.apache.shardingsphere.infra.rule.ShardingSphereRule;

diff --git a/...org/apache/shardingsphere/driver/jdbc/core/resultset/ShardingSphereResultSetMetaData.java b/...org/apache/shardingsphere/driver/jdbc/core/resultset/ShardingSphereResultSetMetaData.java
@@ -19,7 +19,7 @@
 
 import lombok.RequiredArgsConstructor;
 import org.apache.shardingsphere.driver.jdbc.adapter.WrapperAdapter;
-import org.apache.shardingsphere.driver.jdbc.exception.ColumnIndexOutOfRangeException;
+import org.apache.shardingsphere.driver.jdbc.exception.syntax.ColumnIndexOutOfRangeException;
 import org.apache.shardingsphere.infra.binder.segment.select.projection.DerivedColumn;
 import org.apache.shardingsphere.infra.binder.segment.select.projection.Projection;
 import org.apache.shardingsphere.infra.binder.segment.select.projection.impl.AggregationDistinctProjection;

diff --git a/...org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSpherePreparedStatement.java b/...org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSpherePreparedStatement.java
@@ -31,7 +31,7 @@
 import org.apache.shardingsphere.driver.jdbc.core.resultset.ShardingSphereResultSet;
 import org.apache.shardingsphere.driver.jdbc.core.resultset.ShardingSphereResultSetUtil;
 import org.apache.shardingsphere.driver.jdbc.core.statement.metadata.ShardingSphereParameterMetaData;
-import org.apache.shardingsphere.driver.jdbc.exception.EmptySQLException;
+import org.apache.shardingsphere.driver.jdbc.exception.syntax.EmptySQLException;
 import org.apache.shardingsphere.infra.binder.QueryContext;
 import org.apache.shardingsphere.infra.binder.SQLStatementContextFactory;
 import org.apache.shardingsphere.infra.binder.aware.ParameterAware;

diff --git a/...in/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSphereStatement.java b/...in/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSphereStatement.java
@@ -29,8 +29,8 @@
 import org.apache.shardingsphere.driver.jdbc.core.connection.ShardingSphereConnection;
 import org.apache.shardingsphere.driver.jdbc.core.resultset.GeneratedKeysResultSet;
 import org.apache.shardingsphere.driver.jdbc.core.resultset.ShardingSphereResultSet;
-import org.apache.shardingsphere.driver.jdbc.exception.EmptySQLException;
-import org.apache.shardingsphere.driver.jdbc.exception.JDBCTransactionAcrossDatabasesException;
+import org.apache.shardingsphere.driver.jdbc.exception.syntax.EmptySQLException;
+import org.apache.shardingsphere.driver.jdbc.exception.transaction.JDBCTransactionAcrossDatabasesException;
 import org.apache.shardingsphere.infra.binder.QueryContext;
 import org.apache.shardingsphere.infra.binder.SQLStatementContextFactory;
 import org.apache.shardingsphere.infra.binder.decider.context.SQLFederationDeciderContext;

diff --git a/.../exception/ConnectionClosedException.java → ...connection/ConnectionClosedException.java b/.../exception/ConnectionClosedException.java → ...connection/ConnectionClosedException.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.driver.jdbc.exception;
+package org.apache.shardingsphere.driver.jdbc.exception.connection;
 
 import org.apache.shardingsphere.infra.exception.ConnectionSQLException;
 import org.apache.shardingsphere.infra.util.exception.external.sql.sqlstate.XOpenSQLState;

diff --git a/...c/exception/ResultSetClosedException.java → .../connection/ResultSetClosedException.java b/...c/exception/ResultSetClosedException.java → .../connection/ResultSetClosedException.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.driver.jdbc.exception;
+package org.apache.shardingsphere.driver.jdbc.exception.connection;
 
 import org.apache.shardingsphere.infra.exception.ConnectionSQLException;
 import org.apache.shardingsphere.infra.util.exception.external.sql.sqlstate.XOpenSQLState;

diff --git a/...ption/ColumnIndexOutOfRangeException.java → ...yntax/ColumnIndexOutOfRangeException.java b/...ption/ColumnIndexOutOfRangeException.java → ...yntax/ColumnIndexOutOfRangeException.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.driver.jdbc.exception;
+package org.apache.shardingsphere.driver.jdbc.exception.syntax;
 
 import org.apache.shardingsphere.infra.exception.SyntaxSQLException;
 import org.apache.shardingsphere.infra.util.exception.external.sql.sqlstate.XOpenSQLState;
@@ -28,6 +28,6 @@ public final class ColumnIndexOutOfRangeException extends SyntaxSQLException {
     private static final long serialVersionUID = 3599337605134702447L;
 
     public ColumnIndexOutOfRangeException(final int columnIndex) {
-        super(XOpenSQLState.INVALID_COLUMN_NUMBER, 2, "Column index `%d` is out of range", columnIndex);
+        super(XOpenSQLState.INVALID_COLUMN_NUMBER, 5, "Column index `%d` is out of range", columnIndex);
     }
 }
diff --git a/...ception/ColumnLabelNotFoundException.java → .../syntax/ColumnLabelNotFoundException.java b/...ception/ColumnLabelNotFoundException.java → .../syntax/ColumnLabelNotFoundException.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.driver.jdbc.exception;
+package org.apache.shardingsphere.driver.jdbc.exception.syntax;
 
 import org.apache.shardingsphere.infra.exception.SyntaxSQLException;
 import org.apache.shardingsphere.infra.util.exception.external.sql.sqlstate.XOpenSQLState;
@@ -28,6 +28,6 @@ public final class ColumnLabelNotFoundException extends SyntaxSQLException {
     private static final long serialVersionUID = -4634399403612501335L;
 
     public ColumnLabelNotFoundException(final String columnLabel) {
-        super(XOpenSQLState.NOT_FOUND, 3, "Can not find column label `%s`", columnLabel);
+        super(XOpenSQLState.NOT_FOUND, 4, "Can not find column label `%s`", columnLabel);
     }
 }
diff --git a/...ver/jdbc/exception/EmptySQLException.java → ...c/exception/syntax/EmptySQLException.java b/...ver/jdbc/exception/EmptySQLException.java → ...c/exception/syntax/EmptySQLException.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.driver.jdbc.exception;
+package org.apache.shardingsphere.driver.jdbc.exception.syntax;
 
 import org.apache.shardingsphere.infra.exception.SyntaxSQLException;
 import org.apache.shardingsphere.infra.util.exception.external.sql.sqlstate.XOpenSQLState;
@@ -28,6 +28,6 @@ public final class EmptySQLException extends SyntaxSQLException {
     private static final long serialVersionUID = -5723825491720138339L;
 
     public EmptySQLException() {
-        super(XOpenSQLState.GENERAL_ERROR, 10, "SQL String can not be NULL or empty");
+        super(XOpenSQLState.SYNTAX_ERROR, 1, "SQL String can not be NULL or empty");
     }
 }
diff --git a/...CTransactionAcrossDatabasesException.java → ...CTransactionAcrossDatabasesException.java b/...CTransactionAcrossDatabasesException.java → ...CTransactionAcrossDatabasesException.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.driver.jdbc.exception;
+package org.apache.shardingsphere.driver.jdbc.exception.transaction;
 
 import org.apache.shardingsphere.infra.util.exception.external.sql.sqlstate.XOpenSQLState;
 import org.apache.shardingsphere.transaction.exception.TransactionSQLException;

diff --git a/...org/apache/shardingsphere/singletable/exception/UnsupportedDropCascadeTableException.java b/...org/apache/shardingsphere/singletable/exception/UnsupportedDropCascadeTableException.java
@@ -28,6 +28,6 @@ public final class UnsupportedDropCascadeTableException extends SyntaxSQLExcepti
     private static final long serialVersionUID = -5995575055241171117L;
 
     public UnsupportedDropCascadeTableException() {
-        super(XOpenSQLState.FEATURE_NOT_SUPPORTED, 4, "DROP TABLE ... CASCADE is not supported");
+        super(XOpenSQLState.FEATURE_NOT_SUPPORTED, 3, "DROP TABLE ... CASCADE is not supported");
     }
 }
diff --git a/.../java/org/apache/shardingsphere/proxy/backend/exception/UnsupportedVariableException.java b/.../java/org/apache/shardingsphere/proxy/backend/exception/UnsupportedVariableException.java
@@ -28,6 +28,6 @@ public final class UnsupportedVariableException extends SyntaxSQLException {
     private static final long serialVersionUID = 1955281568807066737L;
 
     public UnsupportedVariableException(final String variable) {
-        super(XOpenSQLState.GENERAL_ERROR, 5, "Could not support variable `%s`", variable);
+        super(XOpenSQLState.SYNTAX_ERROR, 2, "Could not support variable `%s`", variable);
     }
 }