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

IDEMPIERE-5009 Syntax error while installing PackIn (native postgres) (#946) 

* IDEMPIERE-5009 Syntax error while installing PackIn (native postgres)

* IDEMPIERE-5009 Syntax error while installing PackIn (native postgres)

Incorporate patch from Carlos
This commit is contained in:
hengsin 2021-10-26 19:05:44 +08:00 committed by GitHub
parent 85f640ffdf
commit f863f9b652
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1480,6 +1480,7 @@ public class DB_Oracle implements AdempiereDatabase
StringBuilder sqlDefault = new StringBuilder(sqlBase) StringBuilder sqlDefault = new StringBuilder(sqlBase)
.append(" ").append(column.getSQLDataType()); .append(" ").append(column.getSQLDataType());
String defaultValue = column.getDefaultValue(); String defaultValue = column.getDefaultValue();
String originalDefaultValue = defaultValue;
if (defaultValue != null if (defaultValue != null
&& defaultValue.length() > 0 && defaultValue.length() > 0
&& defaultValue.indexOf('@') == -1 // no variables && defaultValue.indexOf('@') == -1 // no variables
@ -1512,6 +1513,17 @@ public class DB_Oracle implements AdempiereDatabase
// Null Values // Null Values
if (column.isMandatory() && defaultValue != null && defaultValue.length() > 0) if (column.isMandatory() && defaultValue != null && defaultValue.length() > 0)
{ {
if (!(DisplayType.isText(column.getAD_Reference_ID())
|| DisplayType.isList(column.getAD_Reference_ID())
|| column.getAD_Reference_ID() == DisplayType.YesNo
|| column.getAD_Reference_ID() == DisplayType.Payment
// Two special columns: Defined as Table but DB Type is String
|| column.getColumnName().equals("EntityType") || column.getColumnName().equals("AD_Language")
|| (column.getAD_Reference_ID() == DisplayType.Button &&
!(column.getColumnName().endsWith("_ID")))))
{
defaultValue = originalDefaultValue;
}
StringBuilder sqlSet = new StringBuilder("UPDATE ") StringBuilder sqlSet = new StringBuilder("UPDATE ")
.append(table.getTableName()) .append(table.getTableName())
.append(" SET ").append(column.getColumnName()) .append(" SET ").append(column.getColumnName())

17
org.compiere.db.postgresql.provider/src/org/compiere/db/DB_PostgreSQL.java
View File

@ -1390,6 +1390,7 @@ public class DB_PostgreSQL implements AdempiereDatabase
// Default // Default
String defaultValue = column.getDefaultValue(); String defaultValue = column.getDefaultValue();
String originalDefaultValue = defaultValue;
if (defaultValue != null if (defaultValue != null
&& defaultValue.length() > 0 && defaultValue.length() > 0
&& defaultValue.indexOf('@') == -1 // no variables && defaultValue.indexOf('@') == -1 // no variables
@ -1398,12 +1399,13 @@ public class DB_PostgreSQL implements AdempiereDatabase
if (defaultValue.equalsIgnoreCase("sysdate")) if (defaultValue.equalsIgnoreCase("sysdate"))
defaultValue = "getDate()"; defaultValue = "getDate()";
if (!defaultValue.startsWith("'") && !defaultValue.endsWith("'")) if (!defaultValue.startsWith("'") && !defaultValue.endsWith("'"))
defaultValue = "'" + defaultValue + "'"; defaultValue = DB.TO_STRING(defaultValue);
sql.append(defaultValue); sql.append(defaultValue);
} }
else else
{ {
sql.append("null"); sql.append("null");
defaultValue = null;
} }
sql.append(")"); sql.append(")");
@ -1411,6 +1413,19 @@ public class DB_PostgreSQL implements AdempiereDatabase
// Null Values // Null Values
if (column.isMandatory() && defaultValue != null && defaultValue.length() > 0) if (column.isMandatory() && defaultValue != null && defaultValue.length() > 0)
{ {
if (!(DisplayType.isText(column.getAD_Reference_ID())
|| DisplayType.isList(column.getAD_Reference_ID())
|| column.getAD_Reference_ID() == DisplayType.YesNo
|| column.getAD_Reference_ID() == DisplayType.Payment
// Two special columns: Defined as Table but DB Type is String
|| column.getColumnName().equals("EntityType") || column.getColumnName().equals("AD_Language")
|| (column.getAD_Reference_ID() == DisplayType.Button &&
!(column.getColumnName().endsWith("_ID")))))
{
defaultValue = originalDefaultValue;
if (defaultValue.equalsIgnoreCase("sysdate"))
defaultValue = "getDate()";
}
StringBuilder sqlSet = new StringBuilder("UPDATE ") StringBuilder sqlSet = new StringBuilder("UPDATE ")
.append(table.getTableName()) .append(table.getTableName())
.append(" SET ").append(quoteColumnName(column.getColumnName())) .append(" SET ").append(quoteColumnName(column.getColumnName()))