github/ebean
4
0 Fork 0
mirror of https://github.com/ebean-orm/ebean.git synced 2026-11-12 22:41:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

#2089 Postgres - Support NO KEY option with FOR UPDATE clauses with Postgres

Browse Source
This commit is contained in:
rob bygrave committed 2020-11-24 22:02:06 +13:00
1 parent ed061fb3b1
commit 5082ce4280
5 files changed
+18 -16
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ebean-core/src/test/java/io/ebean/config/ServerConfigTest.java
+2 -2
View File
@@ -73,7 +73,7 @@ public class ServerConfigTest {
props.setProperty("caseSensitiveCollation", "false");
props.setProperty("loadModuleInfo", "true");
props.setProperty("collectQueryPlanThresholdMicros", "10000");
props.setProperty("lockWithKey", "true");
props.setProperty("lockWithKey", "false");
serverConfig.loadFromProperties(props);
@@ -85,7 +85,7 @@ public class ServerConfigTest {
assertTrue(serverConfig.isIdGeneratorAutomatic());
assertFalse(serverConfig.getPlatformConfig().isCaseSensitiveCollation());
assertTrue(serverConfig.getPlatformConfig().isLockWithKey());
assertFalse(serverConfig.getPlatformConfig().isLockWithKey());
assertThat(serverConfig.getNamingConvention()).isInstanceOf(MatchingNamingConvention.class);
ebean-core/src/test/java/io/ebean/config/dbplatform/PostgresPlatformTest.java
+9 -9
View File
@@ -29,10 +29,10 @@ public class PostgresPlatformTest {
PlatformConfig config = new PlatformConfig();
platform.configure(config);
assertThat(config.isLockWithKey()).isFalse();
assertThat(platform.withForUpdate("X", Query.ForUpdate.SKIPLOCKED)).isEqualTo("X for no key update skip locked");
assertThat(platform.withForUpdate("X", Query.ForUpdate.NOWAIT)).isEqualTo("X for no key update nowait");
assertThat(platform.withForUpdate("X", Query.ForUpdate.BASE)).isEqualTo("X for no key update");
assertThat(config.isLockWithKey()).isTrue();
assertThat(platform.withForUpdate("X", Query.ForUpdate.SKIPLOCKED)).isEqualTo("X for update skip locked");
assertThat(platform.withForUpdate("X", Query.ForUpdate.NOWAIT)).isEqualTo("X for update nowait");
assertThat(platform.withForUpdate("X", Query.ForUpdate.BASE)).isEqualTo("X for update");
}
@Test
@@ -41,13 +41,13 @@ public class PostgresPlatformTest {
DatabasePlatform platform = new PostgresPlatform();
PlatformConfig config = new PlatformConfig();
config.setLockWithKey(true);
config.setLockWithKey(false);
platform.configure(config);
assertThat(config.isLockWithKey()).isTrue();
assertThat(platform.withForUpdate("X", Query.ForUpdate.SKIPLOCKED)).isEqualTo("X for update skip locked");
assertThat(platform.withForUpdate("X", Query.ForUpdate.NOWAIT)).isEqualTo("X for update nowait");
assertThat(platform.withForUpdate("X", Query.ForUpdate.BASE)).isEqualTo("X for update");
assertThat(config.isLockWithKey()).isFalse();
assertThat(platform.withForUpdate("X", Query.ForUpdate.SKIPLOCKED)).isEqualTo("X for no key update skip locked");
assertThat(platform.withForUpdate("X", Query.ForUpdate.NOWAIT)).isEqualTo("X for no key update nowait");
assertThat(platform.withForUpdate("X", Query.ForUpdate.BASE)).isEqualTo("X for no key update");
}
}
ebean-core/src/test/java/org/tests/basic/TestQueryForUpdate.java
+4 -4
View File
@@ -35,7 +35,7 @@ public class TestQueryForUpdate extends BaseTestCase {
if (isSqlServer()) {
assertThat(sqlOf(query)).contains("with (updlock)");
} else if (isPostgres()) {
assertThat(sqlOf(query)).contains("for no key update");
assertThat(sqlOf(query)).contains("for update");
} else {
assertThat(sqlOf(query)).contains("for update");
}
@@ -69,7 +69,7 @@ public class TestQueryForUpdate extends BaseTestCase {
assertSql(sql.get(0)).contains("from e_basic t0 where t0.id =");
assertSql(sql.get(1)).contains("from e_basic t0 where t0.id =");
if (isPostgres()) {
assertSql(sql.get(1)).contains("for no key update");
assertSql(sql.get(1)).contains("for update");
} else {
assertSql(sql.get(1)).contains("for update");
}
@@ -97,7 +97,7 @@ public class TestQueryForUpdate extends BaseTestCase {
} else if (isSqlServer()) {
assertThat(sqlOf(query)).contains("with (updlock,nowait)");
} else if (isPostgres()) {
assertThat(sqlOf(query)).contains("for no key update nowait");
assertThat(sqlOf(query)).contains("for update nowait");
} else {
assertThat(sqlOf(query)).contains("for update nowait");
}
@@ -124,7 +124,7 @@ public class TestQueryForUpdate extends BaseTestCase {
} else if (isH2()) {
assertThat(sqlOf(query)).contains("for update");
} else if (isPostgres()) {
assertThat(sqlOf(query)).contains("for no key update nowait");
assertThat(sqlOf(query)).contains("for update nowait");
} else {
assertThat(sqlOf(query)).contains("for update nowait");
}
ebean-core/src/test/java/org/tests/basic/TestQueryForUpdatePostgresLock.java
+2
View File
@@ -5,6 +5,7 @@ import io.ebean.DB;
import io.ebean.annotation.ForPlatform;
import io.ebean.annotation.Platform;
import io.ebean.annotation.Transactional;
import org.junit.Ignore;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -26,6 +27,7 @@ public class TestQueryForUpdatePostgresLock extends BaseTestCase {
private long timePreLock;
private long timePostLock;
@Ignore // restore this test with explicit use of NO KEY lock strength
@Test
@ForPlatform(Platform.POSTGRES)
public void testForUpdatePostgresLock() throws InterruptedException {