From bf8171b20018c8ea0255a2d0226113fc0a923f24 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Sat, 16 Nov 2013 09:58:16 -0500 Subject: [PATCH] IDEMPIERE-1533 Constraint Name shouldn't be copied / Thanks to Nicolas Micoud (nmicoud) --- migration/i2.0/oracle/201311151945_IDEMPIERE-1533.sql | 10 ++++++++++ .../i2.0/postgresql/201311151945_IDEMPIERE-1533.sql | 7 +++++++ .../src/org/compiere/model/Callout_AD_Column.java | 5 ++++- 3 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 migration/i2.0/oracle/201311151945_IDEMPIERE-1533.sql create mode 100644 migration/i2.0/postgresql/201311151945_IDEMPIERE-1533.sql diff --git a/migration/i2.0/oracle/201311151945_IDEMPIERE-1533.sql b/migration/i2.0/oracle/201311151945_IDEMPIERE-1533.sql new file mode 100644 index 0000000000..589c386b9a --- /dev/null +++ b/migration/i2.0/oracle/201311151945_IDEMPIERE-1533.sql @@ -0,0 +1,10 @@ +SET SQLBLANKLINES ON +SET DEFINE OFF + +-- Nov 15, 2013 7:35:45 PM CET +-- IDEMPIERE-1533 Constraint Name shouldn't be copied +UPDATE AD_Column SET IsAllowCopy='N',Updated=TO_DATE('2013-11-15 19:35:45','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=210871 +; + +SELECT register_migration_script('201311151945_IDEMPIERE-1533.sql') FROM dual +; diff --git a/migration/i2.0/postgresql/201311151945_IDEMPIERE-1533.sql b/migration/i2.0/postgresql/201311151945_IDEMPIERE-1533.sql new file mode 100644 index 0000000000..a9a4485c61 --- /dev/null +++ b/migration/i2.0/postgresql/201311151945_IDEMPIERE-1533.sql @@ -0,0 +1,7 @@ +-- Nov 15, 2013 7:35:45 PM CET +-- IDEMPIERE-1533 Constraint Name shouldn't be copied +UPDATE AD_Column SET IsAllowCopy='N',Updated=TO_TIMESTAMP('2013-11-15 19:35:45','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=210871 +; + +SELECT register_migration_script('201311151945_IDEMPIERE-1533.sql') FROM dual +; diff --git a/org.adempiere.base.callout/src/org/compiere/model/Callout_AD_Column.java b/org.adempiere.base.callout/src/org/compiere/model/Callout_AD_Column.java index a568648f89..31229a0a41 100644 --- a/org.adempiere.base.callout/src/org/compiere/model/Callout_AD_Column.java +++ b/org.adempiere.base.callout/src/org/compiere/model/Callout_AD_Column.java @@ -74,6 +74,7 @@ public class Callout_AD_Column extends CalloutEngine + " IsIdentifier, " + " IsUpdateable, " + " IsAlwaysUpdateable, " + + " FKConstraintType," + " COUNT(*) " + "FROM AD_Column " + "WHERE ColumnName = ? " @@ -86,7 +87,8 @@ public class Callout_AD_Column extends CalloutEngine + " ReadOnlyLogic, " + " IsIdentifier, " + " IsUpdateable, " - + " IsAlwaysUpdateable " + + " IsAlwaysUpdateable, " + + " FKConstraintType " + "ORDER BY COUNT(*) DESC "; PreparedStatement pstmt = null; ResultSet rs = null; @@ -109,6 +111,7 @@ public class Callout_AD_Column extends CalloutEngine column.setIsIdentifier("Y".equals(rs.getString(8))); column.setIsUpdateable("Y".equals(rs.getString(9))); column.setIsAlwaysUpdateable("Y".equals(rs.getString(10))); + column.setFKConstraintType(rs.getString(11)); } } catch (SQLException e)