github/ebean
4
0
Fork 0
mirror of https://github.com/ebean-orm/ebean.git synced 2024-04-21 10:51:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix/corrected error codes (#1097)

Browse Source 
* FIX: db2plaform error codes and dbtypes

* FIX: H2: Add error code for locking

* FIX: Mysql: Add DataIntegrity-error code
This commit is contained in:
Roland Praml
2017-08-30 20:02:34 +12:00
committed by Rob Bygrave
parent 3f5a162a4e
commit 6f854da70b
5 changed files with 35 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/org/tests/basic/TestQueryForUpdate.java
+18 -6
View File
@@ -17,10 +17,14 @@ import static org.junit.Assert.assertTrue;
public class TestQueryForUpdate extends BaseTestCase {
private boolean isSupportLocking() {
return isH2() || isOracle() || isPostgres() || isSqlServer() || isMySql();
}
@Test
public void testForUpdate() {
if (isH2() || isPostgres()) {
if (isSupportLocking()) {
ResetBasicData.reset();
Query<Customer> query = Ebean.find(Customer.class)
@@ -29,14 +33,18 @@ public class TestQueryForUpdate extends BaseTestCase {
.order().desc("id");
query.findList();
assertThat(sqlOf(query)).contains("for update");
if (isSqlServer()) {
assertThat(sqlOf(query)).contains("with (updlock)");
} else {
assertThat(sqlOf(query)).contains("for update");
}
}
}
@Test
public void testForUpdate_noWait() {
if (isPostgres() || isOracle()) {
if (isSupportLocking()) {
ResetBasicData.reset();
EbeanServer server = Ebean.getDefaultServer();
@@ -50,9 +58,13 @@ public class TestQueryForUpdate extends BaseTestCase {
List<Customer> list = query.findList();
Customer first = list.get(0);
assertThat(sqlOf(query)).contains("for update nowait");
if (isSqlServer()) {
assertThat(sqlOf(query)).contains("with (updlock,nowait)");
} else if (isH2()){
assertThat(sqlOf(query)).contains("for update");
} else {
assertThat(sqlOf(query)).contains("for update nowait");
}
// create a 2nd transaction to test that the
// row is locked and we can't acquire it
Transaction txn2 = server.createTransaction();