This is an automated email from the ASF dual-hosted git repository.
jleroux pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new a8b252f Reverted: "description" and "comment" datatypes unnecessarily
limited to 255 char (OFBIZ-12021)
a8b252f is described below
commit a8b252f7dd588ca35f82779179f47980e3e31d53
Author: Jacques Le Roux <[email protected]>
AuthorDate: Sat Oct 3 13:41:41 2020 +0200
Reverted: "description" and "comment" datatypes unnecessarily limited to
255 char (OFBIZ-12021)
This reverts commit 8736162c74e931753a5adacfca0af9ee88144c3e.
We have test integration issues to fix
Due to TortoiseGIt, something weird happened, confused me to revert the
revert :/
---
applications/datamodel/DATAMODEL_CHANGES.adoc | 3 ---
framework/entity/fieldtype/fieldtypeadvantage.xml | 4 ++--
framework/entity/fieldtype/fieldtypeaxion.xml | 4 ++--
framework/entity/fieldtype/fieldtypedaffodil.xml | 4 ++--
framework/entity/fieldtype/fieldtypederby.xml | 4 ++--
framework/entity/fieldtype/fieldtypefirebird.xml | 4 ++--
framework/entity/fieldtype/fieldtypehsql.xml | 4 ++--
framework/entity/fieldtype/fieldtypemssql.xml | 6 +++---
framework/entity/fieldtype/fieldtypemysql.xml | 4 ++--
framework/entity/fieldtype/fieldtypeoracle.xml | 4 ++--
framework/entity/fieldtype/fieldtypepostgres.xml | 4 ++--
framework/entity/fieldtype/fieldtypesapdb.xml | 4 ++--
framework/entity/fieldtype/fieldtypesybase.xml | 4 ++--
13 files changed, 25 insertions(+), 28 deletions(-)
diff --git a/applications/datamodel/DATAMODEL_CHANGES.adoc
b/applications/datamodel/DATAMODEL_CHANGES.adoc
index 3fc80a5..bdb52b4 100644
--- a/applications/datamodel/DATAMODEL_CHANGES.adoc
+++ b/applications/datamodel/DATAMODEL_CHANGES.adoc
@@ -37,9 +37,6 @@ The following file contains information about the data model
changes in the Apac
1. ProductPromoCodeEmail
-=== Field type changes
-field types "description" and "comment" are now made the same type as
"very-long", (meaning people can now have comments that go longer then 255
charactors)
-
=== Field Changes
[cols="<,^,^,^,>",options="header",]
|=======================================================
diff --git a/framework/entity/fieldtype/fieldtypeadvantage.xml
b/framework/entity/fieldtype/fieldtypeadvantage.xml
index c7fd691..9f81c3e 100644
--- a/framework/entity/fieldtype/fieldtypeadvantage.xml
+++ b/framework/entity/fieldtype/fieldtypeadvantage.xml
@@ -50,8 +50,8 @@ under the License.
<field-type-def type="long-varchar" sql-type="Char(255)"
java-type="String"/>
<field-type-def type="very-long" sql-type="Memo" java-type="String"/>
- <field-type-def type="comment" sql-type="Memo" java-type="String"/>
- <field-type-def type="description" sql-type="Memo" java-type="String"/>
+ <field-type-def type="comment" sql-type="Char(255)" java-type="String"/>
+ <field-type-def type="description" sql-type="Char(255)"
java-type="String"/>
<field-type-def type="name" sql-type="Char(100)" java-type="String"/>
<field-type-def type="value" sql-type="Char(255)" java-type="String"/>
diff --git a/framework/entity/fieldtype/fieldtypeaxion.xml
b/framework/entity/fieldtype/fieldtypeaxion.xml
index bc9cd40..2ce5f3b 100644
--- a/framework/entity/fieldtype/fieldtypeaxion.xml
+++ b/framework/entity/fieldtype/fieldtypeaxion.xml
@@ -46,8 +46,8 @@ under the License.
<field-type-def type="long-varchar" sql-type="VARCHAR(255)"
java-type="String"/>
<field-type-def type="very-long" sql-type="CLOB" java-type="String"/>
- <field-type-def type="comment" sql-type="CLOB" java-type="String"/>
- <field-type-def type="description" sql-type="CLOB" java-type="String"/>
+ <field-type-def type="comment" sql-type="VARCHAR(255)" java-type="String"/>
+ <field-type-def type="description" sql-type="VARCHAR(255)"
java-type="String"/>
<field-type-def type="name" sql-type="VARCHAR(100)" java-type="String"/>
<field-type-def type="value" sql-type="VARCHAR(255)" java-type="String"/>
diff --git a/framework/entity/fieldtype/fieldtypedaffodil.xml
b/framework/entity/fieldtype/fieldtypedaffodil.xml
index 5a43a1e..8abda56 100644
--- a/framework/entity/fieldtype/fieldtypedaffodil.xml
+++ b/framework/entity/fieldtype/fieldtypedaffodil.xml
@@ -46,8 +46,8 @@ under the License.
<field-type-def type="long-varchar" sql-type="VARCHAR2(255)"
java-type="String"/>
<field-type-def type="very-long" sql-type="CLOB" java-type="String"/>
- <field-type-def type="comment" sql-type="CLOB" java-type="String"/>
- <field-type-def type="description" sql-type="CLOB" java-type="String"/>
+ <field-type-def type="comment" sql-type="VARCHAR2(255)"
java-type="String"/>
+ <field-type-def type="description" sql-type="VARCHAR2(255)"
java-type="String"/>
<field-type-def type="name" sql-type="VARCHAR2(100)" java-type="String"/>
<field-type-def type="value" sql-type="VARCHAR2(255)" java-type="String"/>
diff --git a/framework/entity/fieldtype/fieldtypederby.xml
b/framework/entity/fieldtype/fieldtypederby.xml
index daf7f15..1f40642 100644
--- a/framework/entity/fieldtype/fieldtypederby.xml
+++ b/framework/entity/fieldtype/fieldtypederby.xml
@@ -47,8 +47,8 @@ under the License.
<field-type-def type="long-varchar" sql-type="VARCHAR(255)"
java-type="String"/>
<field-type-def type="very-long" sql-type="CLOB" java-type="String"/>
- <field-type-def type="comment" sql-type="CLOB" java-type="String"/>
- <field-type-def type="description" sql-type="CLOB" java-type="String"/>
+ <field-type-def type="comment" sql-type="VARCHAR(255)" java-type="String"/>
+ <field-type-def type="description" sql-type="VARCHAR(255)"
java-type="String"/>
<field-type-def type="name" sql-type="VARCHAR(100)" java-type="String"/>
<field-type-def type="value" sql-type="VARCHAR(255)" java-type="String"/>
diff --git a/framework/entity/fieldtype/fieldtypefirebird.xml
b/framework/entity/fieldtype/fieldtypefirebird.xml
index 191ef84..d449c1c 100644
--- a/framework/entity/fieldtype/fieldtypefirebird.xml
+++ b/framework/entity/fieldtype/fieldtypefirebird.xml
@@ -46,8 +46,8 @@ under the License.
<field-type-def type="long-varchar" sql-type="VARCHAR(255)"
java-type="String"/>
<field-type-def type="very-long" sql-type="BLOB SUB_TYPE 1"
java-type="String"/>
- <field-type-def type="comment" sql-type="BLOB SUB_TYPE 1"
java-type="String"/>
- <field-type-def type="description" sql-type="BLOB SUB_TYPE 1"
java-type="String"/>
+ <field-type-def type="comment" sql-type="VARCHAR(255)" java-type="String"/>
+ <field-type-def type="description" sql-type="VARCHAR(255)"
java-type="String"/>
<field-type-def type="name" sql-type="VARCHAR(100)" java-type="String"/>
<field-type-def type="value" sql-type="VARCHAR(255)" java-type="String"/>
diff --git a/framework/entity/fieldtype/fieldtypehsql.xml
b/framework/entity/fieldtype/fieldtypehsql.xml
index 3c72490..fe96fff 100644
--- a/framework/entity/fieldtype/fieldtypehsql.xml
+++ b/framework/entity/fieldtype/fieldtypehsql.xml
@@ -46,8 +46,8 @@ under the License.
<field-type-def type="long-varchar" sql-type="VARCHAR(255)"
java-type="String"/>
<field-type-def type="very-long" sql-type="CLOB" java-type="String"/>
- <field-type-def type="comment" sql-type="CLOB" java-type="String"/>
- <field-type-def type="description" sql-type="CLOB" java-type="String"/>
+ <field-type-def type="comment" sql-type="VARCHAR(255)" java-type="String"/>
+ <field-type-def type="description" sql-type="VARCHAR(255)"
java-type="String"/>
<field-type-def type="name" sql-type="VARCHAR(100)" java-type="String"/>
<field-type-def type="value" sql-type="VARCHAR(255)" java-type="String"/>
diff --git a/framework/entity/fieldtype/fieldtypemssql.xml
b/framework/entity/fieldtype/fieldtypemssql.xml
index 115dc46..25e2d05 100644
--- a/framework/entity/fieldtype/fieldtypemssql.xml
+++ b/framework/entity/fieldtype/fieldtypemssql.xml
@@ -44,10 +44,10 @@ under the License.
<field-type-def type="very-short" sql-type="VARCHAR(10)"
java-type="String"/>
<field-type-def type="short-varchar" sql-type="VARCHAR(60)"
java-type="String"/>
<field-type-def type="long-varchar" sql-type="VARCHAR(255)"
java-type="String"/>
- <field-type-def type="very-long" sql-type="VARCHAR(MAX)"
java-type="String"/>
+ <field-type-def type="very-long" sql-type="TEXT" java-type="String"/>
- <field-type-def type="comment" sql-type="VARCHAR(MAX)" java-type="String"/>
- <field-type-def type="description" sql-type="VARCHAR(MAX)"
java-type="String"/>
+ <field-type-def type="comment" sql-type="VARCHAR(255)" java-type="String"/>
+ <field-type-def type="description" sql-type="VARCHAR(255)"
java-type="String"/>
<field-type-def type="name" sql-type="VARCHAR(100)" java-type="String"/>
<field-type-def type="value" sql-type="VARCHAR(255)" java-type="String"/>
diff --git a/framework/entity/fieldtype/fieldtypemysql.xml
b/framework/entity/fieldtype/fieldtypemysql.xml
index a384465..843a697 100644
--- a/framework/entity/fieldtype/fieldtypemysql.xml
+++ b/framework/entity/fieldtype/fieldtypemysql.xml
@@ -47,8 +47,8 @@ under the License.
<field-type-def type="long-varchar" sql-type="VARCHAR(255)"
java-type="String"/>
<field-type-def type="very-long" sql-type="LONGTEXT" java-type="String"/>
- <field-type-def type="comment" sql-type="LONGTEXT" java-type="String"/>
- <field-type-def type="description" sql-type="LONGTEXT" java-type="String"/>
+ <field-type-def type="comment" sql-type="VARCHAR(255)" java-type="String"/>
+ <field-type-def type="description" sql-type="VARCHAR(255)"
java-type="String"/>
<field-type-def type="name" sql-type="VARCHAR(100)" java-type="String"/>
<field-type-def type="value" sql-type="VARCHAR(255)" java-type="String"/>
diff --git a/framework/entity/fieldtype/fieldtypeoracle.xml
b/framework/entity/fieldtype/fieldtypeoracle.xml
index 394951a..03e66ab 100644
--- a/framework/entity/fieldtype/fieldtypeoracle.xml
+++ b/framework/entity/fieldtype/fieldtypeoracle.xml
@@ -60,8 +60,8 @@ under the License.
<field-type-def type="long-varchar" sql-type="VARCHAR2(255)"
java-type="String"/>
<field-type-def type="very-long" sql-type="CLOB" java-type="String"/>
- <field-type-def type="comment" sql-type="CLOB" java-type="String"/>
- <field-type-def type="description" sql-type="CLOB" java-type="String"/>
+ <field-type-def type="comment" sql-type="VARCHAR2(255)"
java-type="String"/>
+ <field-type-def type="description" sql-type="VARCHAR2(255)"
java-type="String"/>
<field-type-def type="name" sql-type="VARCHAR2(100)" java-type="String"/>
<field-type-def type="value" sql-type="VARCHAR2(255)" java-type="String"/>
diff --git a/framework/entity/fieldtype/fieldtypepostgres.xml
b/framework/entity/fieldtype/fieldtypepostgres.xml
index 6d0bd64..a2ac980 100644
--- a/framework/entity/fieldtype/fieldtypepostgres.xml
+++ b/framework/entity/fieldtype/fieldtypepostgres.xml
@@ -47,8 +47,8 @@ under the License.
<field-type-def type="long-varchar" sql-type="VARCHAR(255)"
java-type="String"/>
<field-type-def type="very-long" sql-type="TEXT" java-type="String"/>
- <field-type-def type="comment" sql-type="TEXT" java-type="String"/>
- <field-type-def type="description" sql-type="TEXT" java-type="String"/>
+ <field-type-def type="comment" sql-type="VARCHAR(255)" java-type="String"/>
+ <field-type-def type="description" sql-type="VARCHAR(255)"
java-type="String"/>
<field-type-def type="name" sql-type="VARCHAR(100)" java-type="String"/>
<field-type-def type="value" sql-type="VARCHAR(255)" java-type="String"/>
diff --git a/framework/entity/fieldtype/fieldtypesapdb.xml
b/framework/entity/fieldtype/fieldtypesapdb.xml
index 2b44d60..d10aea3 100644
--- a/framework/entity/fieldtype/fieldtypesapdb.xml
+++ b/framework/entity/fieldtype/fieldtypesapdb.xml
@@ -46,8 +46,8 @@ under the License.
<field-type-def type="long-varchar" sql-type="VARCHAR(255) UNICODE"
sql-type-alias="VARCHAR() UNICODE" java-type="String"/>
<field-type-def type="very-long" sql-type="LONG UNICODE"
sql-type-alias="LONG UNICODE" java-type="String"/>
- <field-type-def type="comment" sql-type="LONG UNICODE"
sql-type-alias="VARCHAR() UNICODE" java-type="String"/>
- <field-type-def type="description" sql-type="LONG UNICODE"
sql-type-alias="VARCHAR() UNICODE" java-type="String"/>
+ <field-type-def type="comment" sql-type="VARCHAR(255) UNICODE"
sql-type-alias="VARCHAR() UNICODE" java-type="String"/>
+ <field-type-def type="description" sql-type="VARCHAR(255) UNICODE"
sql-type-alias="VARCHAR() UNICODE" java-type="String"/>
<field-type-def type="name" sql-type="VARCHAR(100) UNICODE"
sql-type-alias="VARCHAR() UNICODE" java-type="String"/>
<field-type-def type="value" sql-type="VARCHAR(255) UNICODE"
sql-type-alias="VARCHAR() UNICODE" java-type="String"/>
diff --git a/framework/entity/fieldtype/fieldtypesybase.xml
b/framework/entity/fieldtype/fieldtypesybase.xml
index 5cd0231..e61cd84 100644
--- a/framework/entity/fieldtype/fieldtypesybase.xml
+++ b/framework/entity/fieldtype/fieldtypesybase.xml
@@ -46,8 +46,8 @@ under the License.
<field-type-def type="long-varchar" sql-type="VARCHAR(255)"
java-type="String"/>
<field-type-def type="very-long" sql-type="TEXT" java-type="String"/>
- <field-type-def type="comment" sql-type="TEXT" java-type="String"/>
- <field-type-def type="description" sql-type="TEXT" java-type="String"/>
+ <field-type-def type="comment" sql-type="VARCHAR(255)" java-type="String"/>
+ <field-type-def type="description" sql-type="VARCHAR(255)"
java-type="String"/>
<field-type-def type="name" sql-type="VARCHAR(100)" java-type="String"/>
<field-type-def type="value" sql-type="VARCHAR(255)" java-type="String"/>
