Skip to content

Commit de6322f

Browse files
committed
Merge branch 'patch/errorCodeTypeExtention' into fem/postgresql
2 parents a121e49 + 98792ac commit de6322f

File tree

4 files changed

+7
-4
lines changed

4 files changed

+7
-4
lines changed

database-commons/src/main/java/io/cdap/plugin/db/DBErrorDetailsProvider.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,13 @@
1919
import com.google.common.base.Strings;
2020
import com.google.common.base.Throwables;
2121
import io.cdap.cdap.api.exception.ErrorCategory;
22+
import io.cdap.cdap.api.exception.ErrorCodeType;
2223
import io.cdap.cdap.api.exception.ErrorType;
2324
import io.cdap.cdap.api.exception.ErrorUtils;
2425
import io.cdap.cdap.api.exception.ProgramFailureException;
2526
import io.cdap.cdap.etl.api.exception.ErrorContext;
2627
import io.cdap.cdap.etl.api.exception.ErrorDetailsProvider;
28+
import io.cdap.plugin.util.DBUtils;
2729

2830
import java.sql.SQLException;
2931
import java.util.List;
@@ -75,9 +77,9 @@ private ProgramFailureException getProgramFailureException(SQLException e, Error
7577
errorMessageWithDetails = String.format("%s For more details, see %s", errorMessageWithDetails,
7678
externalDocumentationLink);
7779
}
78-
7980
return ErrorUtils.getProgramFailureException(getErrorCategoryFromSqlState(sqlState), errorMessage,
80-
errorMessageWithDetails, getErrorTypeFromErrorCode(errorCode, sqlState), false, e);
81+
errorMessageWithDetails, getErrorTypeFromErrorCode(errorCode, sqlState), false, ErrorCodeType.SQLSTATE,
82+
sqlState, externalDocumentationLink, e);
8183
}
8284

8385
/**

database-commons/src/main/java/io/cdap/plugin/db/DBRecord.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
package io.cdap.plugin.db;
1818

1919
import com.google.common.base.Preconditions;
20-
import com.google.common.base.Strings;
2120
import io.cdap.cdap.api.common.Bytes;
2221
import io.cdap.cdap.api.data.format.StructuredRecord;
2322
import io.cdap.cdap.api.data.schema.Schema;

database-commons/src/main/java/io/cdap/plugin/util/DBUtils.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ public final class DBUtils {
6060
private static final Logger LOG = LoggerFactory.getLogger(DBUtils.class);
6161

6262
public static final Calendar PURE_GREGORIAN_CALENDAR = createPureGregorianCalender();
63+
public static final String MYSQL_SUPPORTED_DOC_URL = "https://dev.mysql.com/doc/mysql-errors/9.0/en/";
6364

6465
// Java by default uses October 15, 1582 as a Gregorian cut over date.
6566
// Any timestamp created with time less than this cut over date is treated as Julian date.

mysql-plugin/src/main/java/io/cdap/plugin/mysql/MysqlErrorDetailsProvider.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import io.cdap.cdap.api.exception.ErrorType;
2020
import io.cdap.plugin.db.DBErrorDetailsProvider;
21+
import io.cdap.plugin.util.DBUtils;
2122

2223
/**
2324
* A custom ErrorDetailsProvider for MySQL plugins.
@@ -26,7 +27,7 @@ public class MysqlErrorDetailsProvider extends DBErrorDetailsProvider {
2627

2728
@Override
2829
protected String getExternalDocumentationLink() {
29-
return "https://dev.mysql.com/doc/mysql-errors/9.0/en/";
30+
return DBUtils.MYSQL_SUPPORTED_DOC_URL;
3031
}
3132

3233
@Override

0 commit comments

Comments
 (0)