Merge pull request #3619 from ebean-orm/feature/column-length-255

For Postgres @column(length=255) means varchar(255)

Author: rbygrave

ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanEmbeddedMetaFactory.java

@@ -58,7 +58,7 @@ private static boolean dbNullable(Column override, BeanProperty source) {
   }
 
   private static int dbLength(Column override, BeanProperty source) {
-    return (override != null && (override.length() != 255)) ? override.length() : source.dbLength();
+    return (override != null && (override.length() != 0)) ? override.length() : source.dbLength();
   }
 
   private static int dbScale(Column override, BeanProperty source) {

ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationParser.java

@@ -98,7 +98,7 @@ void readColumn(Column columnAnn, DeployBeanProperty prop) {
     prop.setUnique(columnAnn.unique());
     if (columnAnn.precision() > 0) {
       prop.setDbLength(columnAnn.precision());
-    } else if (columnAnn.length() != 255) {
+    } else if (columnAnn.length() != 0) {
       // set default 255 on DbTypeMap
       prop.setDbLength(columnAnn.length());
     }

ebean-test/src/test/java/misc/migration/v1_0/CKeyDetail.java

@@ -1,5 +1,6 @@
 package misc.migration.v1_0;
 
+import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
 import jakarta.persistence.Table;
@@ -11,6 +12,7 @@ public class CKeyDetail {
   @Id
   Integer id;
 
+  @Column(length = 255)
   String something;
 
 

ebean-test/src/test/java/org/tests/model/pview/Pview.java

@@ -14,7 +14,7 @@ public class Pview {
   private String name;
 
   @Basic(optional = false)
-  @Column(length = 100, nullable = false)
+  @Column(length = 255, nullable = false)
   private String value;
 
   @JoinTable(name = "pp_to_ww", joinColumns = {@JoinColumn(name = "pp_id", referencedColumnName = "id")}, inverseJoinColumns = {@JoinColumn(name = "ww_id", referencedColumnName = "id")})

ebean-test/src/test/resources/migrationtest/dbmigration/cockroach/1.0__initial.sql

@@ -8,7 +8,7 @@ create table migtest_ckey_assoc (
 
 create table migtest_ckey_detail (
   id                            integer generated by default as identity not null,
-  something                     varchar,
+  something                     varchar(255),
   constraint pk_migtest_ckey_detail primary key (id)
 );
 

ebean-test/src/test/resources/migrationtest/dbmigration/cockroach/1.1.sql

@@ -174,6 +174,7 @@ update migtest_e_history6 set test_number1 = 42 where test_number1 is null;
 alter table "table" alter column textfield drop not null;
 alter table "table" add column "select" varchar;
 alter table "table" add column textfield2 varchar;
+alter table migtest_ckey_detail alter column something type varchar;
 alter table migtest_ckey_detail add column one_key integer;
 alter table migtest_ckey_detail add column two_key varchar(127);
 alter table migtest_ckey_parent add column assoc_id integer;

ebean-test/src/test/resources/migrationtest/dbmigration/cockroach/idx_cockroach.migrations

@@ -1,5 +1,5 @@
-479024598,      1.0__initial.sql
-51162323,       1.1.sql
+-1873582099,    1.0__initial.sql
+-105047402,     1.1.sql
 856096334,      1.2__dropsFor_1.1.sql
 -1876375912,    1.3.sql
 -1416035730,    1.4__dropsFor_1.3.sql

ebean-test/src/test/resources/migrationtest/dbmigration/model/1.0__initial.model.xml

@@ -7,7 +7,7 @@
         </createTable>
         <createTable name="migtest_ckey_detail" pkName="pk_migtest_ckey_detail">
             <column name="id" type="integer" primaryKey="true"/>
-            <column name="something" type="varchar"/>
+            <column name="something" type="varchar(255)"/>
         </createTable>
         <createTable name="migtest_ckey_parent" pkName="pk_migtest_ckey_parent">
             <column name="one_key" type="integer" primaryKey="true"/>

ebean-test/src/test/resources/migrationtest/dbmigration/model/1.1.model.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <migration xmlns="http://ebean-orm.github.io/xml/ns/dbmigration">
     <changeSet type="apply">
+        <alterColumn columnName="something" tableName="migtest_ckey_detail" type="varchar" currentType="varchar(255)" currentNotnull="false"/>
         <addColumn tableName="migtest_ckey_detail">
             <column name="one_key" type="integer"/>
             <column name="two_key" type="varchar(127)"/>

ebean-test/src/test/resources/migrationtest/dbmigration/postgres/1.0__initial.sql

@@ -8,7 +8,7 @@ create table migtest_ckey_assoc (
 
 create table migtest_ckey_detail (
   id                            integer generated by default as identity not null,
-  something                     varchar,
+  something                     varchar(255),
   constraint pk_migtest_ckey_detail primary key (id)
 );