From e3ed5124c24550b6d49a672218c93de3aa0ef450 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Wed, 7 May 2014 18:16:28 -0500 Subject: [PATCH] IDEMPIERE-709 All Created and Updated columns must be not null default statement_timestamp() in database / packin failed creating Created column with default SYSDATE --- .../src/org/compiere/dbPort/Convert_PostgreSQL.java | 2 +- .../src/org/compiere/dbPort/Convert_PostgreSQLTest.java | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/org.compiere.db.postgresql.provider/src/org/compiere/dbPort/Convert_PostgreSQL.java b/org.compiere.db.postgresql.provider/src/org/compiere/dbPort/Convert_PostgreSQL.java index fdd327f8dc..c85bb77d7f 100644 --- a/org.compiere.db.postgresql.provider/src/org/compiere/dbPort/Convert_PostgreSQL.java +++ b/org.compiere.db.postgresql.provider/src/org/compiere/dbPort/Convert_PostgreSQL.java @@ -1013,7 +1013,7 @@ public class Convert_PostgreSQL extends Convert_SQL92 { } else { rest = ""; } - if (defaultvalue.equalsIgnoreCase("NULL")) { + if (defaultvalue.equalsIgnoreCase("NULL") || defaultvalue.equalsIgnoreCase("statement_timestamp()")) { DDL = sqlStatement.substring(0, begin_col - action.length()) + " ADD COLUMN " diff --git a/org.compiere.db.postgresql.provider/src/org/compiere/dbPort/Convert_PostgreSQLTest.java b/org.compiere.db.postgresql.provider/src/org/compiere/dbPort/Convert_PostgreSQLTest.java index cd92da9147..c7ccd085de 100644 --- a/org.compiere.db.postgresql.provider/src/org/compiere/dbPort/Convert_PostgreSQLTest.java +++ b/org.compiere.db.postgresql.provider/src/org/compiere/dbPort/Convert_PostgreSQLTest.java @@ -140,6 +140,11 @@ public final class Convert_PostgreSQLTest extends TestCase{ sqe = "INSERT INTO t_alter_column values('pp_order_nodenext','PP_Order_NodeNext_ID',null,'NULL',null)"; r = convert.convert(sql); assertEquals(sqe, r[0].trim()); + + sql = "ALTER TABLE C_InvoiceTax ADD Created DATE DEFAULT SYSDATE NOT NULL"; + sqe = "ALTER TABLE C_InvoiceTax ADD COLUMN Created TIMESTAMP DEFAULT statement_timestamp() NOT NULL"; + r = convert.convert(sql); + assertEquals(sqe, r[0].trim()); } // Convert.recoverQuotedStrings() error on strings with "<-->" - teo_sarca [ 1705768 ]