From b8aa822a3038260017c356a54ced8baa706122b4 Mon Sep 17 00:00:00 2001 From: Roland Praml Date: Mon, 19 Feb 2018 04:15:28 +0100 Subject: [PATCH] [utf8mb4-support] limited the size of all indexed string columns, as max key length on mysql/mariadb is 767 bytes (which are <= 191 chars on utf8mb4) (#1264) --- src/test/ddl-review/h2-create.sql | 4 +-- src/test/ddl-review/ms-create.sql | 4 +-- src/test/ddl-review/mysql-create.sql | 4 +-- src/test/ddl-review/ora-create.sql | 4 +-- src/test/ddl-review/pg-create.sql | 4 +-- src/test/java/misc/migration/v1_0/EBasic.java | 30 ++++++++++++------- src/test/java/misc/migration/v1_1/EBasic.java | 9 ++++++ src/test/java/misc/migration/v1_2/EBasic.java | 24 ++++++++++----- .../org/tests/compositekeys/db/ItemKey.java | 6 +++- .../org/tests/model/basic/BWithQIdent.java | 3 ++ .../org/tests/model/basic/CKeyParentId.java | 2 ++ .../java/org/tests/model/basic/Contact.java | 5 ++++ .../java/org/tests/model/basic/EBasic.java | 3 ++ .../model/basic/EBasicWithUniqueCon.java | 7 +++++ .../java/org/tests/model/basic/ECustomId.java | 2 ++ .../java/org/tests/model/basic/TSDetail.java | 2 ++ .../org/tests/model/carwheeltruck/TCar.java | 3 ++ .../tests/model/composite/RCustomerKey.java | 5 ++++ .../org/tests/model/composite/ROrder.java | 2 ++ .../org/tests/model/composite/ROrderPK.java | 5 +++- .../org/tests/model/draftable/Document.java | 2 ++ .../tests/model/orderentity/OrderEntity.java | 3 ++ .../model/orderentity/OrderItemEntity.java | 3 ++ .../java/org/tests/model/pview/Wview.java | 3 ++ .../java/org/tests/update/EPersonOnline.java | 3 ++ .../ModelBuild_compoundKeyTest/apply.sql | 4 +-- src/test/resources/assert/changeset-apply.txt | 4 +-- .../resources/assert/changeset-pg-apply.sql | 4 +-- .../resources/container/test-compoundkey.xml | 4 +-- .../migrationtest/db2/1.0__initial.sql | 16 +++++----- .../migrationtest/h2/1.0__initial.sql | 16 +++++----- .../migrationtest/hsqldb/1.0__initial.sql | 16 +++++----- .../model/1.0__initial.model.xml | 16 +++++----- .../migrationtest/mysql/1.0__initial.sql | 16 +++++----- .../migrationtest/oracle/1.0__initial.sql | 16 +++++----- .../migrationtest/postgres/1.0__initial.sql | 16 +++++----- .../migrationtest/sqlite/1.0__initial.sql | 16 +++++----- .../migrationtest/sqlserver/1.0__initial.sql | 16 +++++----- 38 files changed, 193 insertions(+), 109 deletions(-) diff --git a/src/test/ddl-review/h2-create.sql b/src/test/ddl-review/h2-create.sql index 660744c0c..af29ea19d 100644 --- a/src/test/ddl-review/h2-create.sql +++ b/src/test/ddl-review/h2-create.sql @@ -177,14 +177,14 @@ create table ckey_detail ( id integer not null, something varchar(255), one_key integer, - two_key varchar(255), + two_key varchar(127), constraint pk_ckey_detail primary key (id) ); create sequence ckey_detail_seq; create table ckey_parent ( one_key integer not null, - two_key varchar(255) not null, + two_key varchar(127) not null, name varchar(255), assoc_id integer, version integer not null, diff --git a/src/test/ddl-review/ms-create.sql b/src/test/ddl-review/ms-create.sql index 0ae653fbe..62ac79821 100644 --- a/src/test/ddl-review/ms-create.sql +++ b/src/test/ddl-review/ms-create.sql @@ -158,13 +158,13 @@ create table ckey_detail ( id integer identity(1,1) not null, something varchar(255), one_key integer, - two_key varchar(255), + two_key varchar(127), constraint pk_ckey_detail primary key (id) ); create table ckey_parent ( one_key integer not null, - two_key varchar(255) not null, + two_key varchar(127) not null, name varchar(255), assoc_id integer, version integer not null, diff --git a/src/test/ddl-review/mysql-create.sql b/src/test/ddl-review/mysql-create.sql index f81a883cd..974b5461d 100644 --- a/src/test/ddl-review/mysql-create.sql +++ b/src/test/ddl-review/mysql-create.sql @@ -158,13 +158,13 @@ create table ckey_detail ( id integer auto_increment not null, something varchar(255), one_key integer, - two_key varchar(255), + two_key varchar(127), constraint pk_ckey_detail primary key (id) ); create table ckey_parent ( one_key integer not null, - two_key varchar(255) not null, + two_key varchar(127) not null, name varchar(255), assoc_id integer, version integer not null, diff --git a/src/test/ddl-review/ora-create.sql b/src/test/ddl-review/ora-create.sql index f857a9ecf..5dc24914c 100644 --- a/src/test/ddl-review/ora-create.sql +++ b/src/test/ddl-review/ora-create.sql @@ -177,14 +177,14 @@ create table ckey_detail ( id number(10) not null, something varchar2(255), one_key number(10), - two_key varchar2(255), + two_key varchar2(127), constraint pk_ckey_detail primary key (id) ); create sequence ckey_detail_seq; create table ckey_parent ( one_key number(10) not null, - two_key varchar2(255) not null, + two_key varchar2(127) not null, name varchar2(255), assoc_id number(10), version number(10) not null, diff --git a/src/test/ddl-review/pg-create.sql b/src/test/ddl-review/pg-create.sql index 7eb9473f7..4956fd1bb 100644 --- a/src/test/ddl-review/pg-create.sql +++ b/src/test/ddl-review/pg-create.sql @@ -159,13 +159,13 @@ create table ckey_detail ( id serial not null, something varchar(255), one_key integer, - two_key varchar(255), + two_key varchar(127), constraint pk_ckey_detail primary key (id) ); create table ckey_parent ( one_key integer not null, - two_key varchar(255) not null, + two_key varchar(127) not null, name varchar(255), assoc_id integer, version integer not null, diff --git a/src/test/java/misc/migration/v1_0/EBasic.java b/src/test/java/misc/migration/v1_0/EBasic.java index ebdcceb3f..8c90882ef 100644 --- a/src/test/java/misc/migration/v1_0/EBasic.java +++ b/src/test/java/misc/migration/v1_0/EBasic.java @@ -8,6 +8,8 @@ import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.ManyToOne; import javax.persistence.Table; +import javax.validation.constraints.Size; + import java.sql.Timestamp; @Entity @@ -29,9 +31,11 @@ public class EBasic { Integer id; Status status; - + + @Size(max=127) String name; + @Size(max=127) String description; Timestamp someDate; @@ -42,28 +46,34 @@ public class EBasic { @ManyToOne ERef eref; - - + + // test add & remove indices @Index + @Size(max=127) String indextest1; - + @Index(unique = true) + @Size(max=127) String indextest2; - + + @Size(max=127) String indextest3; - + + @Size(max=127) String indextest4; - + @Index(unique = false) + @Size(max=127) String indextest5; - + @Index(unique = true) + @Size(max=127) String indextest6; - + @NotNull int user_id; - + public EBasic() { } diff --git a/src/test/java/misc/migration/v1_1/EBasic.java b/src/test/java/misc/migration/v1_1/EBasic.java index f4dc7c990..b11c6f9e2 100644 --- a/src/test/java/misc/migration/v1_1/EBasic.java +++ b/src/test/java/misc/migration/v1_1/EBasic.java @@ -11,6 +11,7 @@ import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.ManyToOne; import javax.persistence.Table; +import javax.validation.constraints.Size; import java.sql.Timestamp; @@ -51,11 +52,13 @@ public class EBasic { Status status; @Index(unique = true) + @Size(max=127) String name; @DbMigration(preAlter = "-- rename all collisions") @Column(unique = true) + @Size(max=127) String description; @NotNull @@ -75,20 +78,26 @@ public class EBasic { @DbDefault("true") boolean newBooleanField2; + @Size(max=127) String indextest1; + @Size(max=127) String indextest2; @Index + @Size(max=127) String indextest3; @Index(unique = true) + @Size(max=127) String indextest4; @Index(unique = true) + @Size(max=127) String indextest5; @Index(unique = false) + @Size(max=127) String indextest6; @NotNull diff --git a/src/test/java/misc/migration/v1_2/EBasic.java b/src/test/java/misc/migration/v1_2/EBasic.java index 16f459775..5753cb767 100644 --- a/src/test/java/misc/migration/v1_2/EBasic.java +++ b/src/test/java/misc/migration/v1_2/EBasic.java @@ -9,6 +9,8 @@ import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.ManyToOne; import javax.persistence.Table; +import javax.validation.constraints.Size; + import java.sql.Timestamp; @Entity @@ -30,9 +32,11 @@ public class EBasic { Integer id; Status status; - + + @Size(max=127) String name; + @Size(max=127) String description; Timestamp someDate; @@ -47,21 +51,27 @@ public class EBasic { // test add & remove indices @Index + @Size(max=127) String indextest1; - + @Index(unique = true) + @Size(max=127) String indextest2; - + + @Size(max=127) String indextest3; - + + @Size(max=127) String indextest4; - + @Index(unique = false) + @Size(max=127) String indextest5; - + @Index(unique = true) + @Size(max=127) String indextest6; - + @NotNull @DbDefault("23") int user_id; diff --git a/src/test/java/org/tests/compositekeys/db/ItemKey.java b/src/test/java/org/tests/compositekeys/db/ItemKey.java index 0f35d91ea..0f4589612 100644 --- a/src/test/java/org/tests/compositekeys/db/ItemKey.java +++ b/src/test/java/org/tests/compositekeys/db/ItemKey.java @@ -2,12 +2,16 @@ package org.tests.compositekeys.db; import javax.persistence.Column; import javax.persistence.Embeddable; +import javax.validation.constraints.Size; + @Embeddable public class ItemKey { + @Size(max=127) private int customer; - @Column(name = "itemNumber") + @Column(name = "itemnumber") + @Size(max=127) private String itemNumber; public int getCustomer() { diff --git a/src/test/java/org/tests/model/basic/BWithQIdent.java b/src/test/java/org/tests/model/basic/BWithQIdent.java index d101c2e0a..329d40f41 100644 --- a/src/test/java/org/tests/model/basic/BWithQIdent.java +++ b/src/test/java/org/tests/model/basic/BWithQIdent.java @@ -4,6 +4,8 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Version; +import javax.validation.constraints.Size; + import java.sql.Timestamp; @Entity @@ -13,6 +15,7 @@ public class BWithQIdent { Integer id; @Column(name = "`Name`", unique = true) + @Size(max = 191) // key must not exceed 767 Bytes, so max key len for mysql with utf8mb4 = 191*4 = 764 bytes String name; @Version diff --git a/src/test/java/org/tests/model/basic/CKeyParentId.java b/src/test/java/org/tests/model/basic/CKeyParentId.java index b57313779..a0d8c828c 100644 --- a/src/test/java/org/tests/model/basic/CKeyParentId.java +++ b/src/test/java/org/tests/model/basic/CKeyParentId.java @@ -1,11 +1,13 @@ package org.tests.model.basic; import javax.persistence.Embeddable; +import javax.validation.constraints.Size; @Embeddable public class CKeyParentId { Integer oneKey; + @Size(max = 127) String twoKey; public CKeyParentId() { diff --git a/src/test/java/org/tests/model/basic/Contact.java b/src/test/java/org/tests/model/basic/Contact.java index e15f572b2..402a4fc2a 100644 --- a/src/test/java/org/tests/model/basic/Contact.java +++ b/src/test/java/org/tests/model/basic/Contact.java @@ -13,6 +13,8 @@ import javax.persistence.Id; import javax.persistence.ManyToOne; import javax.persistence.OneToMany; import javax.persistence.Version; +import javax.validation.constraints.Size; + import java.sql.Timestamp; import java.util.List; @@ -26,7 +28,10 @@ public class Contact { @Id int id; + @Size(max=127) String firstName; + + @Size(max=127) String lastName; String phone; diff --git a/src/test/java/org/tests/model/basic/EBasic.java b/src/test/java/org/tests/model/basic/EBasic.java index 5b67551f8..278328f92 100644 --- a/src/test/java/org/tests/model/basic/EBasic.java +++ b/src/test/java/org/tests/model/basic/EBasic.java @@ -6,6 +6,8 @@ import io.ebean.annotation.Index; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; +import javax.validation.constraints.Size; + import java.sql.Timestamp; @Entity @@ -29,6 +31,7 @@ public class EBasic { Status status; @Index + @Size(max=127) String name; String description; diff --git a/src/test/java/org/tests/model/basic/EBasicWithUniqueCon.java b/src/test/java/org/tests/model/basic/EBasicWithUniqueCon.java index 63c09d4de..4766414dc 100644 --- a/src/test/java/org/tests/model/basic/EBasicWithUniqueCon.java +++ b/src/test/java/org/tests/model/basic/EBasicWithUniqueCon.java @@ -6,6 +6,8 @@ import javax.persistence.Id; import javax.persistence.Table; import javax.persistence.UniqueConstraint; import javax.persistence.Version; +import javax.validation.constraints.Size; + import java.sql.Timestamp; @Entity @@ -17,10 +19,15 @@ public class EBasicWithUniqueCon { Integer id; @Column(unique = true) + @Size(max=127) String name; + @Size(max=127) String other; + + @Size(max=127) String otherOne; + String description; @Version diff --git a/src/test/java/org/tests/model/basic/ECustomId.java b/src/test/java/org/tests/model/basic/ECustomId.java index fc6c94d2c..0655ac781 100644 --- a/src/test/java/org/tests/model/basic/ECustomId.java +++ b/src/test/java/org/tests/model/basic/ECustomId.java @@ -3,12 +3,14 @@ package org.tests.model.basic; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; +import javax.validation.constraints.Size; @Entity public class ECustomId { @Id @GeneratedValue(generator = "shortUid") + @Size(max=127) String id; String name; diff --git a/src/test/java/org/tests/model/basic/TSDetail.java b/src/test/java/org/tests/model/basic/TSDetail.java index b89ec11f4..cca4584cc 100644 --- a/src/test/java/org/tests/model/basic/TSDetail.java +++ b/src/test/java/org/tests/model/basic/TSDetail.java @@ -8,6 +8,7 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.ManyToOne; import javax.persistence.Table; +import javax.validation.constraints.Size; /** * A basic entity to test simple things. @@ -26,6 +27,7 @@ public class TSDetail { String description; @Index(unique = true) + @Size(max=127) String someUniqueValue; boolean active; diff --git a/src/test/java/org/tests/model/carwheeltruck/TCar.java b/src/test/java/org/tests/model/carwheeltruck/TCar.java index 5274259a2..1a8aa356c 100644 --- a/src/test/java/org/tests/model/carwheeltruck/TCar.java +++ b/src/test/java/org/tests/model/carwheeltruck/TCar.java @@ -8,6 +8,8 @@ import javax.persistence.Id; import javax.persistence.Inheritance; import javax.persistence.InheritanceType; import javax.persistence.OneToMany; +import javax.validation.constraints.Size; + import java.util.List; @Entity @@ -17,6 +19,7 @@ import java.util.List; public class TCar { @Id + @Size(max=32) String plateNo; @OneToMany(cascade = CascadeType.ALL) diff --git a/src/test/java/org/tests/model/composite/RCustomerKey.java b/src/test/java/org/tests/model/composite/RCustomerKey.java index 881d01674..a871d49aa 100644 --- a/src/test/java/org/tests/model/composite/RCustomerKey.java +++ b/src/test/java/org/tests/model/composite/RCustomerKey.java @@ -2,10 +2,15 @@ package org.tests.model.composite; import javax.persistence.Embeddable; +import javax.validation.constraints.Size; @Embeddable public class RCustomerKey { + + @Size(max=127) private String company; + + @Size(max=127) private String name; public RCustomerKey() { diff --git a/src/test/java/org/tests/model/composite/ROrder.java b/src/test/java/org/tests/model/composite/ROrder.java index 56b8639df..14fd2d9c9 100644 --- a/src/test/java/org/tests/model/composite/ROrder.java +++ b/src/test/java/org/tests/model/composite/ROrder.java @@ -8,6 +8,7 @@ import javax.persistence.JoinColumn; import javax.persistence.JoinColumns; import javax.persistence.ManyToOne; import javax.persistence.Table; +import javax.validation.constraints.Size; /** @@ -28,6 +29,7 @@ public class ROrder { private RCustomer customer; @Column(name = "customerName") + @Size(max=127) private String customerName; private String item; diff --git a/src/test/java/org/tests/model/composite/ROrderPK.java b/src/test/java/org/tests/model/composite/ROrderPK.java index 72962acff..2c808d82b 100644 --- a/src/test/java/org/tests/model/composite/ROrderPK.java +++ b/src/test/java/org/tests/model/composite/ROrderPK.java @@ -4,6 +4,7 @@ package org.tests.model.composite; import java.io.Serializable; import javax.persistence.Embeddable; +import javax.validation.constraints.Size; /** * @author rnentjes @@ -12,8 +13,10 @@ import javax.persistence.Embeddable; public class ROrderPK implements Serializable { private static final long serialVersionUID = 7632735517186104883L; - + @Size(max=127) private String company; + + @Size(max=127) private Integer orderNumber; public ROrderPK() { diff --git a/src/test/java/org/tests/model/draftable/Document.java b/src/test/java/org/tests/model/draftable/Document.java index acfff0ff6..5340ee4fe 100644 --- a/src/test/java/org/tests/model/draftable/Document.java +++ b/src/test/java/org/tests/model/draftable/Document.java @@ -8,6 +8,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.ManyToOne; import javax.persistence.OneToMany; +import javax.validation.constraints.Size; import java.sql.Timestamp; import java.util.List; @@ -19,6 +20,7 @@ public class Document extends BaseDomain { public static DocumentFinder find = new DocumentFinder(); @Column(unique = true) + @Size(max=127) String title; String body; diff --git a/src/test/java/org/tests/model/orderentity/OrderEntity.java b/src/test/java/org/tests/model/orderentity/OrderEntity.java index 6b2acd451..2a1e032dc 100644 --- a/src/test/java/org/tests/model/orderentity/OrderEntity.java +++ b/src/test/java/org/tests/model/orderentity/OrderEntity.java @@ -7,6 +7,8 @@ import javax.persistence.FetchType; import javax.persistence.Id; import javax.persistence.OneToMany; import javax.persistence.Table; +import javax.validation.constraints.Size; + import java.util.List; @Entity @@ -19,6 +21,7 @@ public class OrderEntity { */ @Id @Column(name = "uuid") + @Size(max=40) private String id; @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER, mappedBy = "order") diff --git a/src/test/java/org/tests/model/orderentity/OrderItemEntity.java b/src/test/java/org/tests/model/orderentity/OrderItemEntity.java index 024be3cc6..d1d40961c 100644 --- a/src/test/java/org/tests/model/orderentity/OrderItemEntity.java +++ b/src/test/java/org/tests/model/orderentity/OrderItemEntity.java @@ -6,6 +6,8 @@ import javax.persistence.Id; import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; import javax.persistence.Table; +import javax.validation.constraints.Size; + import java.math.BigDecimal; @Entity @@ -18,6 +20,7 @@ public class OrderItemEntity { */ @Id @Column(name = "uuid") + @Size(max=40) private String id; @Column(name = "product_variant_uuid") diff --git a/src/test/java/org/tests/model/pview/Wview.java b/src/test/java/org/tests/model/pview/Wview.java index f88c65d19..364b73bf0 100644 --- a/src/test/java/org/tests/model/pview/Wview.java +++ b/src/test/java/org/tests/model/pview/Wview.java @@ -5,6 +5,8 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; +import javax.validation.constraints.Size; + import java.util.UUID; @Entity @@ -17,6 +19,7 @@ public class Wview { @Basic(optional = false) @Column(unique = true) + @Size(max=127) private String name; public UUID getId() { diff --git a/src/test/java/org/tests/update/EPersonOnline.java b/src/test/java/org/tests/update/EPersonOnline.java index f9a3e3e04..7b1f2bb88 100644 --- a/src/test/java/org/tests/update/EPersonOnline.java +++ b/src/test/java/org/tests/update/EPersonOnline.java @@ -6,6 +6,8 @@ import io.ebean.annotation.WhenModified; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; +import javax.validation.constraints.Size; + import java.time.Instant; @Entity @@ -16,6 +18,7 @@ public class EPersonOnline { Long id; @Index(unique = true) + @Size(max=127) String email; boolean online; diff --git a/src/test/resources/assert/ModelBuild_compoundKeyTest/apply.sql b/src/test/resources/assert/ModelBuild_compoundKeyTest/apply.sql index 6c5a6587c..e0789ab8a 100644 --- a/src/test/resources/assert/ModelBuild_compoundKeyTest/apply.sql +++ b/src/test/resources/assert/ModelBuild_compoundKeyTest/apply.sql @@ -8,13 +8,13 @@ create table ckey_detail ( id integer auto_increment not null, something varchar(255), one_key integer, - two_key varchar(255), + two_key varchar(127), constraint pk_ckey_detail primary key (id) ); create table ckey_parent ( one_key integer not null, - two_key varchar(255) not null, + two_key varchar(127) not null, name varchar(255), assoc_id integer, version integer not null, diff --git a/src/test/resources/assert/changeset-apply.txt b/src/test/resources/assert/changeset-apply.txt index 46bf5c1b1..16d68bacc 100644 --- a/src/test/resources/assert/changeset-apply.txt +++ b/src/test/resources/assert/changeset-apply.txt @@ -177,14 +177,14 @@ create table ckey_detail ( id integer not null, something varchar(255), one_key integer, - two_key varchar(255), + two_key varchar(127), constraint pk_ckey_detail primary key (id) ); create sequence ckey_detail_seq; create table ckey_parent ( one_key integer not null, - two_key varchar(255) not null, + two_key varchar(127) not null, name varchar(255), assoc_id integer, version integer not null, diff --git a/src/test/resources/assert/changeset-pg-apply.sql b/src/test/resources/assert/changeset-pg-apply.sql index ec2f0f3f0..c995e7c84 100644 --- a/src/test/resources/assert/changeset-pg-apply.sql +++ b/src/test/resources/assert/changeset-pg-apply.sql @@ -158,13 +158,13 @@ create table ckey_detail ( id serial not null, something varchar(255), one_key integer, - two_key varchar(255), + two_key varchar(127), constraint pk_ckey_detail primary key (id) ); create table ckey_parent ( one_key integer not null, - two_key varchar(255) not null, + two_key varchar(127) not null, name varchar(255), assoc_id integer, version integer not null, diff --git a/src/test/resources/container/test-compoundkey.xml b/src/test/resources/container/test-compoundkey.xml index a38205d98..20955a77a 100644 --- a/src/test/resources/container/test-compoundkey.xml +++ b/src/test/resources/container/test-compoundkey.xml @@ -13,13 +13,13 @@ - + - + diff --git a/src/test/resources/dbmigration/migrationtest/db2/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/db2/1.0__initial.sql index 8cb33ca98..ac49b8e02 100644 --- a/src/test/resources/dbmigration/migrationtest/db2/1.0__initial.sql +++ b/src/test/resources/dbmigration/migrationtest/db2/1.0__initial.sql @@ -2,18 +2,18 @@ create table migtest_e_basic ( id integer generated by default as identity not null, status varchar(1), - name varchar(255), - description varchar(255), + name varchar(127), + description varchar(127), some_date timestamp, old_boolean boolean default false not null, old_boolean2 boolean, eref_id integer, - indextest1 varchar(255), - indextest2 varchar(255), - indextest3 varchar(255), - indextest4 varchar(255), - indextest5 varchar(255), - indextest6 varchar(255), + indextest1 varchar(127), + indextest2 varchar(127), + indextest3 varchar(127), + indextest4 varchar(127), + indextest5 varchar(127), + indextest6 varchar(127), user_id integer not null, constraint ck_migtest_e_basic_status check ( status in ('N','A','I')), constraint pk_migtest_e_basic primary key (id) diff --git a/src/test/resources/dbmigration/migrationtest/h2/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/h2/1.0__initial.sql index 92ce9e535..60dc196b2 100644 --- a/src/test/resources/dbmigration/migrationtest/h2/1.0__initial.sql +++ b/src/test/resources/dbmigration/migrationtest/h2/1.0__initial.sql @@ -2,18 +2,18 @@ create table migtest_e_basic ( id integer auto_increment not null, status varchar(1), - name varchar(255), - description varchar(255), + name varchar(127), + description varchar(127), some_date timestamp, old_boolean boolean default false not null, old_boolean2 boolean, eref_id integer, - indextest1 varchar(255), - indextest2 varchar(255), - indextest3 varchar(255), - indextest4 varchar(255), - indextest5 varchar(255), - indextest6 varchar(255), + indextest1 varchar(127), + indextest2 varchar(127), + indextest3 varchar(127), + indextest4 varchar(127), + indextest5 varchar(127), + indextest6 varchar(127), user_id integer not null, constraint ck_migtest_e_basic_status check ( status in ('N','A','I')), constraint uq_migtest_e_basic_indextest2 unique (indextest2), diff --git a/src/test/resources/dbmigration/migrationtest/hsqldb/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/hsqldb/1.0__initial.sql index 98a8aefd4..b5ba4b578 100644 --- a/src/test/resources/dbmigration/migrationtest/hsqldb/1.0__initial.sql +++ b/src/test/resources/dbmigration/migrationtest/hsqldb/1.0__initial.sql @@ -2,18 +2,18 @@ create table migtest_e_basic ( id integer generated by default as identity (start with 1) not null, status varchar(1), - name varchar(255), - description varchar(255), + name varchar(127), + description varchar(127), some_date timestamp, old_boolean boolean default false not null, old_boolean2 boolean, eref_id integer, - indextest1 varchar(255), - indextest2 varchar(255), - indextest3 varchar(255), - indextest4 varchar(255), - indextest5 varchar(255), - indextest6 varchar(255), + indextest1 varchar(127), + indextest2 varchar(127), + indextest3 varchar(127), + indextest4 varchar(127), + indextest5 varchar(127), + indextest6 varchar(127), user_id integer not null, constraint ck_migtest_e_basic_status check ( status in ('N','A','I')), constraint uq_migtest_e_basic_indextest2 unique (indextest2), diff --git a/src/test/resources/dbmigration/migrationtest/model/1.0__initial.model.xml b/src/test/resources/dbmigration/migrationtest/model/1.0__initial.model.xml index a01d7db52..e489d342c 100644 --- a/src/test/resources/dbmigration/migrationtest/model/1.0__initial.model.xml +++ b/src/test/resources/dbmigration/migrationtest/model/1.0__initial.model.xml @@ -5,18 +5,18 @@ - - + + - - - - - - + + + + + + diff --git a/src/test/resources/dbmigration/migrationtest/mysql/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/mysql/1.0__initial.sql index 8fe02c94c..d0cd55dbd 100644 --- a/src/test/resources/dbmigration/migrationtest/mysql/1.0__initial.sql +++ b/src/test/resources/dbmigration/migrationtest/mysql/1.0__initial.sql @@ -2,18 +2,18 @@ create table migtest_e_basic ( id integer auto_increment not null, status varchar(1), - name varchar(255), - description varchar(255), + name varchar(127), + description varchar(127), some_date datetime(6), old_boolean tinyint(1) default 0 not null, old_boolean2 tinyint(1) default 0, eref_id integer, - indextest1 varchar(255), - indextest2 varchar(255), - indextest3 varchar(255), - indextest4 varchar(255), - indextest5 varchar(255), - indextest6 varchar(255), + indextest1 varchar(127), + indextest2 varchar(127), + indextest3 varchar(127), + indextest4 varchar(127), + indextest5 varchar(127), + indextest6 varchar(127), user_id integer not null, constraint ck_migtest_e_basic_status check ( status in ('N','A','I')), constraint uq_migtest_e_basic_indextest2 unique (indextest2), diff --git a/src/test/resources/dbmigration/migrationtest/oracle/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/oracle/1.0__initial.sql index 439cc5a00..9cb945a13 100644 --- a/src/test/resources/dbmigration/migrationtest/oracle/1.0__initial.sql +++ b/src/test/resources/dbmigration/migrationtest/oracle/1.0__initial.sql @@ -2,18 +2,18 @@ create table migtest_e_basic ( id number(10) not null, status varchar2(1), - name varchar2(255), - description varchar2(255), + name varchar2(127), + description varchar2(127), some_date timestamp, old_boolean number(1) default 0 not null, old_boolean2 number(1) default 0, eref_id number(10), - indextest1 varchar2(255), - indextest2 varchar2(255), - indextest3 varchar2(255), - indextest4 varchar2(255), - indextest5 varchar2(255), - indextest6 varchar2(255), + indextest1 varchar2(127), + indextest2 varchar2(127), + indextest3 varchar2(127), + indextest4 varchar2(127), + indextest5 varchar2(127), + indextest6 varchar2(127), user_id number(10) not null, constraint ck_migtest_e_basic_status check ( status in ('N','A','I')), constraint uq_migtest_e_basic_indextest2 unique (indextest2), diff --git a/src/test/resources/dbmigration/migrationtest/postgres/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/postgres/1.0__initial.sql index 372bcf4ba..09be87a42 100644 --- a/src/test/resources/dbmigration/migrationtest/postgres/1.0__initial.sql +++ b/src/test/resources/dbmigration/migrationtest/postgres/1.0__initial.sql @@ -2,18 +2,18 @@ create table migtest_e_basic ( id serial not null, status varchar(1), - name varchar(255), - description varchar(255), + name varchar(127), + description varchar(127), some_date timestamptz, old_boolean boolean default false not null, old_boolean2 boolean, eref_id integer, - indextest1 varchar(255), - indextest2 varchar(255), - indextest3 varchar(255), - indextest4 varchar(255), - indextest5 varchar(255), - indextest6 varchar(255), + indextest1 varchar(127), + indextest2 varchar(127), + indextest3 varchar(127), + indextest4 varchar(127), + indextest5 varchar(127), + indextest6 varchar(127), user_id integer not null, constraint ck_migtest_e_basic_status check ( status in ('N','A','I')), constraint uq_migtest_e_basic_indextest2 unique (indextest2), diff --git a/src/test/resources/dbmigration/migrationtest/sqlite/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/sqlite/1.0__initial.sql index 88d329a2b..fb9e4c859 100644 --- a/src/test/resources/dbmigration/migrationtest/sqlite/1.0__initial.sql +++ b/src/test/resources/dbmigration/migrationtest/sqlite/1.0__initial.sql @@ -2,18 +2,18 @@ create table migtest_e_basic ( id integer not null, status varchar(1), - name varchar(255), - description varchar(255), + name varchar(127), + description varchar(127), some_date timestamp, old_boolean int default 0 not null, old_boolean2 int default 0, eref_id integer, - indextest1 varchar(255), - indextest2 varchar(255), - indextest3 varchar(255), - indextest4 varchar(255), - indextest5 varchar(255), - indextest6 varchar(255), + indextest1 varchar(127), + indextest2 varchar(127), + indextest3 varchar(127), + indextest4 varchar(127), + indextest5 varchar(127), + indextest6 varchar(127), user_id integer not null, constraint ck_migtest_e_basic_status check ( status in ('N','A','I')), constraint uq_migtest_e_basic_indextest2 unique (indextest2), diff --git a/src/test/resources/dbmigration/migrationtest/sqlserver/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/sqlserver/1.0__initial.sql index 39fff72cf..7c8eb6b47 100644 --- a/src/test/resources/dbmigration/migrationtest/sqlserver/1.0__initial.sql +++ b/src/test/resources/dbmigration/migrationtest/sqlserver/1.0__initial.sql @@ -2,18 +2,18 @@ create table migtest_e_basic ( id integer identity(1,1) not null, status varchar(1), - name varchar(255), - description varchar(255), + name varchar(127), + description varchar(127), some_date datetime2, old_boolean bit default 0 not null, old_boolean2 bit default 0, eref_id integer, - indextest1 varchar(255), - indextest2 varchar(255), - indextest3 varchar(255), - indextest4 varchar(255), - indextest5 varchar(255), - indextest6 varchar(255), + indextest1 varchar(127), + indextest2 varchar(127), + indextest3 varchar(127), + indextest4 varchar(127), + indextest5 varchar(127), + indextest6 varchar(127), user_id integer not null, constraint ck_migtest_e_basic_status check ( status in ('N','A','I')), constraint pk_migtest_e_basic primary key (id)