From 87432dd660b5c198da30c8910e878616b9858cd9 Mon Sep 17 00:00:00 2001 From: Diego Ruiz Date: Wed, 27 Jan 2016 19:12:47 +0100 Subject: [PATCH] IDEMPIERE-3004 View Column - View Component require SeqNo --- .../i3.1/oracle/201601161701_IDEMPIERE-3004.sql | 15 +++++++++++++++ .../postgresql/201601161701_IDEMPIERE-3004.sql | 12 ++++++++++++ .../src/org/compiere/model/MTable.java | 3 ++- 3 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 migration/i3.1/oracle/201601161701_IDEMPIERE-3004.sql create mode 100644 migration/i3.1/postgresql/201601161701_IDEMPIERE-3004.sql diff --git a/migration/i3.1/oracle/201601161701_IDEMPIERE-3004.sql b/migration/i3.1/oracle/201601161701_IDEMPIERE-3004.sql new file mode 100644 index 0000000000..af6a70bf3a --- /dev/null +++ b/migration/i3.1/oracle/201601161701_IDEMPIERE-3004.sql @@ -0,0 +1,15 @@ +SET SQLBLANKLINES ON +SET DEFINE OFF + +-- IDEMPIERE-3004: View Column - View Component require SeqNo +-- Jan 25, 2016 4:42:40 PM CET +UPDATE AD_Column SET DefaultValue='@SQL=SELECT COALESCE(MAX(SeqNo),0)+10 AS DefaultValue FROM AD_ViewComponent WHERE AD_Table_ID=@AD_Table_ID@', IsUpdateable='N',Updated=TO_DATE('2016-01-25 16:42:40','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=210567 +; + +-- Jan 25, 2016 4:49:47 PM CET +UPDATE AD_Field SET SortNo=1.0,Updated=TO_DATE('2016-01-25 16:49:47','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202233 +; + +SELECT register_migration_script('201601161701_IDEMPIERE-3004.sql') FROM dual +; + diff --git a/migration/i3.1/postgresql/201601161701_IDEMPIERE-3004.sql b/migration/i3.1/postgresql/201601161701_IDEMPIERE-3004.sql new file mode 100644 index 0000000000..2e6eaadb7c --- /dev/null +++ b/migration/i3.1/postgresql/201601161701_IDEMPIERE-3004.sql @@ -0,0 +1,12 @@ +-- IDEMPIERE-3004: View Column - View Component require SeqNo +-- Jan 25, 2016 4:42:40 PM CET +UPDATE AD_Column SET DefaultValue='@SQL=SELECT COALESCE(MAX(SeqNo),0)+10 AS DefaultValue FROM AD_ViewComponent WHERE AD_Table_ID=@AD_Table_ID@', IsUpdateable='N',Updated=TO_TIMESTAMP('2016-01-25 16:42:40','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=210567 +; + +-- Jan 25, 2016 4:49:47 PM CET +UPDATE AD_Field SET SortNo=1.0,Updated=TO_TIMESTAMP('2016-01-25 16:49:47','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202233 +; + +SELECT register_migration_script('201601161701_IDEMPIERE-3004.sql') FROM dual +; + diff --git a/org.adempiere.base/src/org/compiere/model/MTable.java b/org.adempiere.base/src/org/compiere/model/MTable.java index a293b73a5c..c00c8b031c 100644 --- a/org.adempiere.base/src/org/compiere/model/MTable.java +++ b/org.adempiere.base/src/org/compiere/model/MTable.java @@ -661,6 +661,7 @@ public class MTable extends X_AD_Table Query query = new Query(getCtx(), MViewComponent.Table_Name, MViewComponent.COLUMNNAME_AD_Table_ID + "=?", get_TrxName()); query.setParameters(getAD_Table_ID()); + query.setOrderBy(MViewComponent.COLUMNNAME_SeqNo); query.setOnlyActiveRecords(true); List list = query.list(); @@ -698,4 +699,4 @@ public class MTable extends X_AD_Table tablename.equals("M_AttributeSetInstance")); } -} // MTable \ No newline at end of file +} // MTable