From 2d7ef6d21e10876575ac994b6a5c6ed64baed567 Mon Sep 17 00:00:00 2001 From: Heng Sin Low Date: Thu, 26 Apr 2007 01:09:19 +0000 Subject: [PATCH] * [ 1707611 ] Column synchronization for mandatory columns doesn't work - Fixed a bug in previous commit. --- dbPort/src/org/compiere/dbPort/Convert_PostgreSQL.java | 2 +- dbPort/src/org/compiere/dbPort/Convert_PostgreSQLTest.java | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dbPort/src/org/compiere/dbPort/Convert_PostgreSQL.java b/dbPort/src/org/compiere/dbPort/Convert_PostgreSQL.java index 07b44ee8cd..101f915767 100644 --- a/dbPort/src/org/compiere/dbPort/Convert_PostgreSQL.java +++ b/dbPort/src/org/compiere/dbPort/Convert_PostgreSQL.java @@ -1039,7 +1039,7 @@ public class Convert_PostgreSQL extends Convert_SQL92 { } else if ( rest.toUpperCase().indexOf("NULL") >= 0) { DDL += sqlStatement.substring(0, begin_col - action.length()) - + " ALTER COLUMN " + column + " SET " + rest.trim() + + " ALTER COLUMN " + column + " DROP NOT NULL" + ";"; } diff --git a/dbPort/src/org/compiere/dbPort/Convert_PostgreSQLTest.java b/dbPort/src/org/compiere/dbPort/Convert_PostgreSQLTest.java index ce84b0421b..014945d319 100644 --- a/dbPort/src/org/compiere/dbPort/Convert_PostgreSQLTest.java +++ b/dbPort/src/org/compiere/dbPort/Convert_PostgreSQLTest.java @@ -34,6 +34,11 @@ public final class Convert_PostgreSQLTest { r = convert.convert(sql); verify(sql, r, sqe); + sql = "ALTER TABLE Test MODIFY T_Integer NUMBER(10) NULL"; + sqe = "ALTER TABLE Test ALTER COLUMN T_Integer TYPE NUMERIC(10); ALTER TABLE Test ALTER COLUMN T_Integer DROP NOT NULL;"; + r = convert.convert(sql); + verify(sql, r, sqe); + // Convert.recoverQuotedStrings() error on strings with "<-->" - teo_sarca [ 1705768 ] // http://sourceforge.net/tracker/index.php?func=detail&aid=1705768&group_id=176962&atid=879332 sql = "SELECT 'Partner <--> Organization', 's2\\$', 's3' FROM DUAL";