mirror of
https://github.com/ebean-orm/ebean.git
synced 2026-10-24 03:57:45 +00:00
#1573 - Incorrect CamelCase conversion when number proceeds uppercase letter
This commit is contained in:
@@ -217,7 +217,7 @@ public class DeleteById_SoftDelete_Tests extends BaseTestCase {
|
||||
List<String> sql = LoggedSqlCollector.stop();
|
||||
assertThat(sql).hasSize(2);
|
||||
if (isPersistBatchOnCascade()) {
|
||||
assertThat(sql.get(0)).contains("update cover set s3url=?, deleted=? where id=?");
|
||||
assertThat(sql.get(0)).contains("update cover set s3_url=?, deleted=? where id=?");
|
||||
}
|
||||
else {
|
||||
assertThat(sql.get(0)).contains("update cover set deleted=? where id=?");
|
||||
@@ -238,7 +238,7 @@ public class DeleteById_SoftDelete_Tests extends BaseTestCase {
|
||||
List<String> sql = LoggedSqlCollector.stop();
|
||||
assertThat(sql).hasSize(2);
|
||||
if (isPersistBatchOnCascade()) {
|
||||
assertThat(sql.get(0)).contains("update cover set s3url=?, deleted=? where id=?");
|
||||
assertThat(sql.get(0)).contains("update cover set s3_url=?, deleted=? where id=?");
|
||||
}
|
||||
else {
|
||||
assertThat(sql.get(0)).contains("update cover set deleted=? where id=?");
|
||||
@@ -265,7 +265,7 @@ public class DeleteById_SoftDelete_Tests extends BaseTestCase {
|
||||
List<String> sql = LoggedSqlCollector.stop();
|
||||
assertThat(sql).hasSize(2);
|
||||
if (isPersistBatchOnCascade()) {
|
||||
assertThat(sql.get(0)).contains("update cover set s3url=?, deleted=? where id=?");
|
||||
assertThat(sql.get(0)).contains("update cover set s3_url=?, deleted=? where id=?");
|
||||
}
|
||||
else {
|
||||
assertThat(sql.get(0)).contains("update cover set deleted=? where id=?");
|
||||
|
||||
@@ -3,10 +3,9 @@ package org.tests.query.softdelete;
|
||||
import io.ebean.Ebean;
|
||||
import io.ebean.PagedList;
|
||||
import io.ebean.TransactionalTestCase;
|
||||
|
||||
import org.tests.model.onetoone.album.Cover;
|
||||
import org.ebeantest.LoggedSqlCollector;
|
||||
import org.junit.Test;
|
||||
import org.tests.model.onetoone.album.Cover;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
@@ -42,14 +41,14 @@ public class TestSoftDeletePagingList extends TransactionalTestCase {
|
||||
assertThat(totalRowCount).isEqualTo(2);
|
||||
|
||||
assertThat(sql).hasSize(2);
|
||||
assertThat(sql.get(0)).contains("select count(*) from cover t0 where t0.s3url like");
|
||||
assertThat(sql.get(0)).contains("select count(*) from cover t0 where t0.s3_url like");
|
||||
if (isPlatformBooleanNative()) {
|
||||
assertThat(sql.get(0)).contains("and t0.deleted = false; --bind(SoftDelPaged-%)");
|
||||
} else {
|
||||
assertThat(sql.get(0)).contains("and t0.deleted = 0; --bind(SoftDelPaged-%)");
|
||||
}
|
||||
|
||||
assertThat(sql.get(1)).contains("where t0.s3url like ");
|
||||
assertThat(sql.get(1)).contains("where t0.s3_url like ");
|
||||
if (isPlatformBooleanNative()) {
|
||||
assertThat(sql.get(1)).contains("and t0.deleted = false order by t0.id");
|
||||
} else {
|
||||
|
||||
Reference in New Issue
Block a user