From 30195d5ec9b98bb5ca0ccb666bc08cf16f5b73d5 Mon Sep 17 00:00:00 2001
From: ribeaudc <ribeaudc>
Date: Thu, 14 Jun 2007 09:38:04 +0000
Subject: [PATCH] change: - ExperimentDAO: nicely informs the user when
experiment code already exists. - DBMigrationEngine: uses new class
SQLStateUtils. add: - SQLStateUtils: try to encapsulate the SQL State logic
in its own class.
SVN: 508
---
.../cisd/common/db/SQLStateUtils.java | 70 +++++++++++++++++++
.../cisd/dbmigration/DBMigrationEngine.java | 27 +------
2 files changed, 73 insertions(+), 24 deletions(-)
create mode 100644 common/source/java/ch/systemsx/cisd/common/db/SQLStateUtils.java
diff --git a/common/source/java/ch/systemsx/cisd/common/db/SQLStateUtils.java b/common/source/java/ch/systemsx/cisd/common/db/SQLStateUtils.java
new file mode 100644
index 00000000000..5678399ad95
--- /dev/null
+++ b/common/source/java/ch/systemsx/cisd/common/db/SQLStateUtils.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2007 ETH Zuerich, CISD
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ch.systemsx.cisd.common.db;
+
+import java.sql.SQLException;
+
+/**
+ * Some utility methods regarding <i>SQL State</i>
+ *
+ * @author Christian Ribeaud
+ */
+public final class SQLStateUtils
+{
+
+ private SQLStateUtils()
+ {
+ // This class can not be instantiated.
+ }
+
+ /**
+ * Tries to get the SQL state of given <code>Throwable</code>.
+ * <p>
+ * This is only possible if {@link Throwable#getCause()} is an instance of <code>SQLException</code>.
+ * </p>
+ */
+ public final static String getSqlState(Throwable ex) {
+ Throwable th = ex.getCause();
+ String sqlState = null;
+ if (th instanceof SQLException)
+ {
+ SQLException sqlException = (SQLException) th;
+ sqlState = sqlException.getSQLState();
+ if (sqlState == null)
+ {
+ return getSqlState(sqlException);
+ }
+ }
+ return sqlState;
+ }
+
+ /** Whether given SQL state stands for <i>DUPLICATE OBJECT</i>. */
+ public final static boolean isDuplicateObject(String sqlState) {
+ return "42710".equalsIgnoreCase(sqlState);
+ }
+
+ /** Whether given SQL state stands for <i>INVALID CATALOG NAME</i>. */
+ public final static boolean isInvalidCatalogName(String sqlState) {
+ return "3D000".equalsIgnoreCase(sqlState);
+ }
+
+ /** Whether given SQL state stands for <i>UNIQUE VIOLATION</i>. */
+ public final static boolean isUniqueViolation(String sqlState) {
+ return "23505".equalsIgnoreCase(sqlState);
+ }
+
+}
diff --git a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/DBMigrationEngine.java b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/DBMigrationEngine.java
index 6a0c48c1694..1e7e93bc4db 100644
--- a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/DBMigrationEngine.java
+++ b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/DBMigrationEngine.java
@@ -35,6 +35,7 @@ import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
import org.springframework.jdbc.datasource.DataSourceUtils;
import org.springframework.jdbc.support.JdbcUtils;
+import ch.systemsx.cisd.common.db.SQLStateUtils;
import ch.systemsx.cisd.common.exceptions.EnvironmentFailureException;
import ch.systemsx.cisd.common.logging.LogCategory;
import ch.systemsx.cisd.common.logging.LogFactory;
@@ -310,28 +311,6 @@ public class DBMigrationEngine
}
}
- /**
- * Tries to get the SQL state of given <code>Throwable</code>.
- * <p>
- * This is only possible if {@link Throwable#getCause()} is an instance of <code>SQLException</code>.
- * </p>
- */
- protected final static String getSqlState(Throwable ex) {
- Throwable th = ex.getCause();
- String sqlState = null;
- if (th instanceof SQLException)
- {
- SQLException sqlException = (SQLException) th;
- sqlState = sqlException.getSQLState();
- if (sqlState == null)
- {
- return getSqlState(sqlException);
- }
- }
- return sqlState;
- }
-
-
/** Creates a <code>DataSource</code> from given <code>context</code>. */
private final static DataSource createMasterDataSource(DatabaseConfigurationContext context)
{
@@ -367,7 +346,7 @@ public class DBMigrationEngine
protected boolean isDBNotExistException(DataAccessException ex)
{
// 3D000: INVALID CATALOG NAME
- return "3D000".equals(getSqlState(ex));
+ return SQLStateUtils.isInvalidCatalogName(SQLStateUtils.getSqlState(ex));
}
/**
@@ -378,6 +357,6 @@ public class DBMigrationEngine
*/
protected boolean userAlreadyExists(DataAccessException ex) {
// 42710 DUPLICATE OBJECT
- return "42710".equals(getSqlState(ex));
+ return SQLStateUtils.isDuplicateObject(SQLStateUtils.getSqlState(ex));
}
}
--
GitLab