midsuit
/
core-jgi
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-2981 Implement JSON Field type + IDEMPIERE-6227 - fixes (#2449) 

* IDEMPIERE-2981 Implement JSON Field type

- Fix the JSON Editor, is sending to the database the value non prettified

* - Fix issue adding a JSON column with log migration script enabled

When logging migration script the Convert layer is applied, and we didn't implement Convert for the JSON column

* IDEMPIERE-6227 Cannot add a column with spaces on the default value (Convert layer logging migration script)
This commit is contained in:
Carlos Ruiz 2024-09-09 15:37:08 +02:00
parent eb5f03f8e5
commit aaaecb42e9
4 changed files with 76 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WJsonEditor.java
View File

@ -1,5 +1,6 @@
package org.adempiere.webui.editor;
import org.adempiere.webui.event.ValueChangeEvent;
import org.compiere.model.GridField;
import org.compiere.util.Util;
@ -31,9 +32,15 @@ public class WJsonEditor extends WStringEditor {
@Override
public void setValue(Object value) {
super.setValue(value);
if (value != null && !Util.isEmpty(value.toString()))
getComponent().setValue(Util.prettifyJSONString(value.toString()));
String prettyValue = null;
if (value != null && !Util.isEmpty(value.toString())) {
prettyValue = Util.prettifyJSONString(value.toString());
if (! prettyValue.equals(value)) {
ValueChangeEvent vce = new ValueChangeEvent(this, getColumnName(), value, prettyValue);
super.fireValueChange(vce);
}
}
}
}

2
org.compiere.db.oracle.provider/src/org/compiere/db/DB_Oracle.java
View File

@ -1169,6 +1169,8 @@ public class DB_Oracle implements AdempiereDatabase
sql.append(sqlDefault);
// Constraint
if (column.getAD_Reference_ID() == DisplayType.JSON)
sql.append(" CONSTRAINT ").append(column.getAD_Table().getTableName()).append("_").append(column.getColumnName()).append("_isjson CHECK (").append(column.getColumnName()).append(" IS JSON)");
// Null Values
if (column.isMandatory() && defaultValue != null && defaultValue.length() > 0)

46
org.compiere.db.postgresql.provider/src/org/compiere/dbPort/Convert_PostgreSQL.java
View File

@ -103,6 +103,7 @@ public class Convert_PostgreSQL extends Convert_SQL92 {
} else {
statement = convertAddJson(statement);
statement = convertWithConvertMap(statement);
statement = convertSimilarTo(statement);
statement = DB_PostgreSQL.removeNativeKeyworkMarker(statement);
@ -1105,10 +1106,16 @@ public class Convert_PostgreSQL extends Convert_SQL92 {
begin_default = rest.toUpperCase().indexOf(
" DEFAULT ") + 9;
defaultvalue = rest.substring(begin_default);
int nextspace = defaultvalue.indexOf(' ');
if (nextspace > -1) {
rest = defaultvalue.substring(nextspace);
defaultvalue = defaultvalue.substring(0, defaultvalue.indexOf(' '));
String endDefaultChar = " ";
int shift = 0;
if (defaultvalue.startsWith("'")) {
endDefaultChar = "'";
shift = 1;
}
int endDefault = defaultvalue.substring(shift).indexOf(endDefaultChar) + shift;
if (endDefault > -1+shift) {
rest = defaultvalue.substring(endDefault+shift);
defaultvalue = defaultvalue.substring(0, endDefault+shift);
} else {
rest = "";
}
@ -1167,10 +1174,16 @@ public class Convert_PostgreSQL extends Convert_SQL92 {
begin_default = rest.toUpperCase().indexOf(
" DEFAULT ") + 9;
defaultvalue = rest.substring(begin_default);
int nextspace = defaultvalue.indexOf(' ');
if (nextspace > -1) {
rest = defaultvalue.substring(nextspace);
defaultvalue = defaultvalue.substring(0, defaultvalue.indexOf(' '));
String endDefaultChar = " ";
int shift = 0;
if (defaultvalue.startsWith("'")) {
endDefaultChar = "'";
shift = 1;
}
int endDefault = defaultvalue.substring(shift).indexOf(endDefaultChar) + shift;
if (endDefault > -1+shift) {
rest = defaultvalue.substring(endDefault+shift);
defaultvalue = defaultvalue.substring(0, endDefault+shift);
} else {
rest = "";
}
@ -1220,4 +1233,21 @@ public class Convert_PostgreSQL extends Convert_SQL92 {
return sqlStatement;
}
/**
* For JSON columns Oracle uses CLOB ... CONSTRAINT ... CHECK IS JSON
* while oracle uses JSONB, no constraint
* @param statement
* @return
*/
private String convertAddJson(String statement) {
if (statement.toUpperCase().matches(".*\\bCLOB\\b.*\\bCONSTRAINT\\b.*CHECK\\b.*\\bIS JSON\\).*")) {
// remove the CONSTRAINT ... IS JSON part
statement = statement.replaceAll("(?i)\\bCONSTRAINT\\b.*CHECK\\b.*\\(.*\\bIS JSON\\)", "");
// change type CLOB to JSONB
statement = statement.replaceAll("(?i)\\bCLOB\\b", "JSONB");
}
return statement;
}
} // Convert

26
org.idempiere.test/src/org/idempiere/test/base/Convert_PostgreSQLTest.java
View File

@ -201,6 +201,32 @@ public final class Convert_PostgreSQLTest extends AbstractTestCase {
sqe = "ALTER TABLE C_InvoiceTax ADD COLUMN Created TIMESTAMP DEFAULT statement_timestamp() NOT NULL";
r = DB.getDatabase().convertStatement(sql);
assertEquals(sqe, r.trim());
sql = "ALTER TABLE M_FreightCategory MODIFY Description VARCHAR2(255 CHAR) DEFAULT 'Test Default with Spaces'";
sqe = "INSERT INTO t_alter_column values('m_freightcategory','Description','VARCHAR(255)',null,'Test Default with Spaces')";
r = DB.getDatabase().convertStatement(sql);
assertEquals(sqe, r.trim());
sql = "ALTER TABLE M_FreightCategory ADD Description VARCHAR2(255 CHAR) DEFAULT 'Test Default with Spaces'";
sqe = "ALTER TABLE M_FreightCategory ADD COLUMN Description VARCHAR(255) DEFAULT 'Test Default with Spaces'";
r = DB.getDatabase().convertStatement(sql);
assertEquals(sqe, r.trim());
sql = "ALTER TABLE M_FreightCategory ADD JsonData CLOB DEFAULT NULL CONSTRAINT M_FreightCategory_JsonData_isjson CHECK (JsonData IS JSON)";
sqe = "ALTER TABLE M_FreightCategory ADD COLUMN JsonData JSONB DEFAULT NULL";
r = DB.getDatabase().convertStatement(sql);
assertEquals(sqe, r.trim());
sql = "ALTER TABLE M_FreightCategory ADD JsonData CLOB DEFAULT '{ \"color\": \"red\" }' CONSTRAINT M_FreightCategory_JsonData_isjson CHECK (JsonData IS JSON) NOT NULL";
sqe = "ALTER TABLE M_FreightCategory ADD COLUMN JsonData JSONB DEFAULT '{ \"color\": \"red\" }' NOT NULL";
r = DB.getDatabase().convertStatement(sql);
assertEquals(sqe, r.trim());
sql = "ALTER TABLE M_FreightCategory MODIFY JsonData CLOB DEFAULT '{ \"color\": \"red\" }' CONSTRAINT M_FreightCategory_JsonData_isjson CHECK (JsonData IS JSON)";
sqe = "INSERT INTO t_alter_column values('m_freightcategory','JsonData','JSONB',null,'{ \"color\": \"red\" }')";
r = DB.getDatabase().convertStatement(sql);
assertEquals(sqe, r.trim());
} finally {
Ini.setProperty(P_POSTGRE_SQL_NATIVE, originalNative);
}