Apache/openjpa
1
0
Fork 0
mirror of https://github.com/apache/openjpa.git synced 2025-02-22 01:55:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

OPENJPA-2034: Update error codes for H2 database.

Browse Source 
Submitted By: Prashant Bhat

git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@1149697 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Dick 2011-07-22 19:20:57 +00:00
parent eb4e83fa27
commit 9a974626fd
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/H2Dictionary.java
View File

@ -33,6 +33,7 @@ import org.apache.openjpa.jdbc.schema.PrimaryKey;
import org.apache.openjpa.jdbc.schema.Table; import org.apache.openjpa.jdbc.schema.Table;
import org.apache.openjpa.jdbc.schema.Unique; import org.apache.openjpa.jdbc.schema.Unique;
import org.apache.openjpa.meta.JavaTypes; import org.apache.openjpa.meta.JavaTypes;
import org.apache.openjpa.util.StoreException;
/** /**
* Dictionary for H2 ({@link http://www.h2database.com}). * Dictionary for H2 ({@link http://www.h2database.com}).
@ -65,6 +66,9 @@ public class H2Dictionary extends DBDictionary {
supportsNullTableForGetPrimaryKeys = true; supportsNullTableForGetPrimaryKeys = true;
supportsNullTableForGetIndexInfo = true; supportsNullTableForGetIndexInfo = true;
supportsLockingWithOuterJoin = false;
supportsLockingWithInnerJoin = false;
reservedWordSet.addAll(Arrays.asList(new String[] { reservedWordSet.addAll(Arrays.asList(new String[] {
"CURRENT_TIMESTAMP", "CURRENT_TIME", "CURRENT_DATE", "CROSS", "CURRENT_TIMESTAMP", "CURRENT_TIME", "CURRENT_DATE", "CROSS",
"DISTINCT", "EXCEPT", "EXISTS", "FROM", "FOR", "FALSE", "FULL", "DISTINCT", "EXCEPT", "EXISTS", "FROM", "FOR", "FALSE", "FULL",
@ -239,4 +243,14 @@ public class H2Dictionary extends DBDictionary {
} }
buf.append(")"); buf.append(")");
} }
@Override
public boolean isFatalException(int subtype, SQLException ex) {
int errorCode = ex.getErrorCode();
if ((subtype == StoreException.QUERY || subtype == StoreException.LOCK)
&& (57014 == errorCode || 50200 == errorCode)) {
return false;
}
return super.isFatalException(subtype, ex);
}
} }

8
openjpa-jdbc/src/main/resources/org/apache/openjpa/jdbc/sql/sql-error-state-codes.xml
View File

@ -101,12 +101,12 @@
</dictionary> </dictionary>
<dictionary class="org.apache.openjpa.jdbc.sql.H2Dictionary"> <dictionary class="org.apache.openjpa.jdbc.sql.H2Dictionary">
<lock>HYT00</lock> <lock>HYT00,57014</lock>
<referential-integrity>22003,22012,22025,23000,23002,23003</referential-integrity> <referential-integrity>22001,22003,22012,22018,22025,23502,23503,23506,23507,23513,23000,23002,23003</referential-integrity>
<object-exists>23001</object-exists> <object-exists>23001,23505</object-exists>
<object-not-found>02000</object-not-found> <object-not-found>02000</object-not-found>
<optimistic></optimistic> <optimistic></optimistic>
<query>90031</query> <query>90031,57014</query>
</dictionary> </dictionary>
<dictionary class="org.apache.openjpa.jdbc.sql.HSQLDictionary"> <dictionary class="org.apache.openjpa.jdbc.sql.HSQLDictionary">