From 104dd05b39ce49a50c9bae801c4be3a7483c59bb Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Mon, 18 Mar 2013 15:47:21 -0500 Subject: [PATCH] IDEMPIERE-764 Some tablenames starts with X whereas they have centralized IDs / X_OnlineTrxHistory --- .../oracle/201303181543_IDEMPIERE-764.sql | 73 +++++++++++++++++++ .../postgresql/201303181543_IDEMPIERE-764.sql | 73 +++++++++++++++++++ ...History.java => I_C_OnlineTrxHistory.java} | 28 +++---- .../org/compiere/model/MOnlineTrxHistory.java | 6 +- ...History.java => X_C_OnlineTrxHistory.java} | 46 ++++++------ 5 files changed, 186 insertions(+), 40 deletions(-) create mode 100644 migration/i1.0a-release/oracle/201303181543_IDEMPIERE-764.sql create mode 100644 migration/i1.0a-release/postgresql/201303181543_IDEMPIERE-764.sql rename org.adempiere.base/src/org/compiere/model/{I_X_OnlineTrxHistory.java => I_C_OnlineTrxHistory.java} (86%) rename org.adempiere.base/src/org/compiere/model/{X_X_OnlineTrxHistory.java => X_C_OnlineTrxHistory.java} (80%) diff --git a/migration/i1.0a-release/oracle/201303181543_IDEMPIERE-764.sql b/migration/i1.0a-release/oracle/201303181543_IDEMPIERE-764.sql new file mode 100644 index 0000000000..04a154e46f --- /dev/null +++ b/migration/i1.0a-release/oracle/201303181543_IDEMPIERE-764.sql @@ -0,0 +1,73 @@ +-- IDEMPIERE-764 Some tablenames starts with X whereas they have centralized IDs +ALTER TABLE X_OnlineTrxHistory RENAME TO C_OnlineTrxHistory +; + +ALTER TABLE C_OnlineTrxHistory RENAME COLUMN X_OnlineTrxHistory_ID TO C_OnlineTrxHistory_ID +; + +ALTER TABLE C_OnlineTrxHistory RENAME COLUMN X_OnlineTrxHistory_UU TO C_OnlineTrxHistory_UU +; + +-- Mar 18, 2013 3:42:01 PM COT +UPDATE AD_Sequence SET Description='Table C_OnlineTrxHistory', Name='C_OnlineTrxHistory',Updated=TO_DATE('2013-03-18 15:42:01','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Sequence_ID=200030 +; + +-- Mar 18, 2013 3:42:20 PM COT +UPDATE AD_Table SET TableName='C_OnlineTrxHistory',Updated=TO_DATE('2013-03-18 15:42:20','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Table_ID=200032 +; + +-- Mar 18, 2013 3:42:44 PM COT +UPDATE AD_Element SET ColumnName='C_OnlineTrxHistory_ID',Updated=TO_DATE('2013-03-18 15:42:44','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Element_ID=200201 +; + +-- Mar 18, 2013 3:42:44 PM COT +UPDATE AD_Column SET ColumnName='C_OnlineTrxHistory_ID', Name='Online Transaction History', Description=NULL, Help=NULL WHERE AD_Element_ID=200201 +; + +-- Mar 18, 2013 3:42:44 PM COT +UPDATE AD_Process_Para SET ColumnName='C_OnlineTrxHistory_ID', Name='Online Transaction History', Description=NULL, Help=NULL, AD_Element_ID=200201 WHERE UPPER(ColumnName)='C_ONLINETRXHISTORY_ID' AND IsCentrallyMaintained='Y' AND AD_Element_ID IS NULL +; + +-- Mar 18, 2013 3:42:44 PM COT +UPDATE AD_Process_Para SET ColumnName='C_OnlineTrxHistory_ID', Name='Online Transaction History', Description=NULL, Help=NULL WHERE AD_Element_ID=200201 AND IsCentrallyMaintained='Y' +; + +-- Mar 18, 2013 3:42:44 PM COT +UPDATE AD_InfoColumn SET ColumnName='C_OnlineTrxHistory_ID', Name='Online Transaction History', Description=NULL, Help=NULL WHERE AD_Element_ID=200201 AND IsCentrallyMaintained='Y' +; + +-- Mar 18, 2013 3:42:59 PM COT +UPDATE AD_Element SET ColumnName='C_OnlineTrxHistory_UU', Name='C_OnlineTrxHistory_UU', PrintName='C_OnlineTrxHistory_UU',Updated=TO_DATE('2013-03-18 15:42:59','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Element_ID=200200 +; + +-- Mar 18, 2013 3:42:59 PM COT +UPDATE AD_Element_Trl SET IsTranslated='N' WHERE AD_Element_ID=200200 +; + +-- Mar 18, 2013 3:42:59 PM COT +UPDATE AD_Column SET ColumnName='C_OnlineTrxHistory_UU', Name='C_OnlineTrxHistory_UU', Description=NULL, Help=NULL WHERE AD_Element_ID=200200 +; + +-- Mar 18, 2013 3:42:59 PM COT +UPDATE AD_Process_Para SET ColumnName='C_OnlineTrxHistory_UU', Name='C_OnlineTrxHistory_UU', Description=NULL, Help=NULL, AD_Element_ID=200200 WHERE UPPER(ColumnName)='C_ONLINETRXHISTORY_UU' AND IsCentrallyMaintained='Y' AND AD_Element_ID IS NULL +; + +-- Mar 18, 2013 3:42:59 PM COT +UPDATE AD_Process_Para SET ColumnName='C_OnlineTrxHistory_UU', Name='C_OnlineTrxHistory_UU', Description=NULL, Help=NULL WHERE AD_Element_ID=200200 AND IsCentrallyMaintained='Y' +; + +-- Mar 18, 2013 3:42:59 PM COT +UPDATE AD_InfoColumn SET ColumnName='C_OnlineTrxHistory_UU', Name='C_OnlineTrxHistory_UU', Description=NULL, Help=NULL WHERE AD_Element_ID=200200 AND IsCentrallyMaintained='Y' +; + +-- Mar 18, 2013 3:42:59 PM COT +UPDATE AD_Field SET Name='C_OnlineTrxHistory_UU', Description=NULL, Help=NULL WHERE AD_Column_ID IN (SELECT AD_Column_ID FROM AD_Column WHERE AD_Element_ID=200200) AND IsCentrallyMaintained='Y' +; + +-- Mar 18, 2013 3:42:59 PM COT +UPDATE AD_PrintFormatItem SET PrintName='C_OnlineTrxHistory_UU', Name='C_OnlineTrxHistory_UU' WHERE IsCentrallyMaintained='Y' AND EXISTS (SELECT * FROM AD_Column c WHERE c.AD_Column_ID=AD_PrintFormatItem.AD_Column_ID AND c.AD_Element_ID=200200) +; + +SELECT register_migration_script('201303181543_IDEMPIERE-764.sql') FROM dual +; + diff --git a/migration/i1.0a-release/postgresql/201303181543_IDEMPIERE-764.sql b/migration/i1.0a-release/postgresql/201303181543_IDEMPIERE-764.sql new file mode 100644 index 0000000000..428991e711 --- /dev/null +++ b/migration/i1.0a-release/postgresql/201303181543_IDEMPIERE-764.sql @@ -0,0 +1,73 @@ +-- IDEMPIERE-764 Some tablenames starts with X whereas they have centralized IDs +ALTER TABLE X_OnlineTrxHistory RENAME TO C_OnlineTrxHistory +; + +ALTER TABLE C_OnlineTrxHistory RENAME X_OnlineTrxHistory_ID TO C_OnlineTrxHistory_ID +; + +ALTER TABLE C_OnlineTrxHistory RENAME X_OnlineTrxHistory_UU TO C_OnlineTrxHistory_UU +; + +-- Mar 18, 2013 3:42:01 PM COT +UPDATE AD_Sequence SET Description='Table C_OnlineTrxHistory', Name='C_OnlineTrxHistory',Updated=TO_TIMESTAMP('2013-03-18 15:42:01','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Sequence_ID=200030 +; + +-- Mar 18, 2013 3:42:20 PM COT +UPDATE AD_Table SET TableName='C_OnlineTrxHistory',Updated=TO_TIMESTAMP('2013-03-18 15:42:20','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Table_ID=200032 +; + +-- Mar 18, 2013 3:42:44 PM COT +UPDATE AD_Element SET ColumnName='C_OnlineTrxHistory_ID',Updated=TO_TIMESTAMP('2013-03-18 15:42:44','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Element_ID=200201 +; + +-- Mar 18, 2013 3:42:44 PM COT +UPDATE AD_Column SET ColumnName='C_OnlineTrxHistory_ID', Name='Online Transaction History', Description=NULL, Help=NULL WHERE AD_Element_ID=200201 +; + +-- Mar 18, 2013 3:42:44 PM COT +UPDATE AD_Process_Para SET ColumnName='C_OnlineTrxHistory_ID', Name='Online Transaction History', Description=NULL, Help=NULL, AD_Element_ID=200201 WHERE UPPER(ColumnName)='C_ONLINETRXHISTORY_ID' AND IsCentrallyMaintained='Y' AND AD_Element_ID IS NULL +; + +-- Mar 18, 2013 3:42:44 PM COT +UPDATE AD_Process_Para SET ColumnName='C_OnlineTrxHistory_ID', Name='Online Transaction History', Description=NULL, Help=NULL WHERE AD_Element_ID=200201 AND IsCentrallyMaintained='Y' +; + +-- Mar 18, 2013 3:42:44 PM COT +UPDATE AD_InfoColumn SET ColumnName='C_OnlineTrxHistory_ID', Name='Online Transaction History', Description=NULL, Help=NULL WHERE AD_Element_ID=200201 AND IsCentrallyMaintained='Y' +; + +-- Mar 18, 2013 3:42:59 PM COT +UPDATE AD_Element SET ColumnName='C_OnlineTrxHistory_UU', Name='C_OnlineTrxHistory_UU', PrintName='C_OnlineTrxHistory_UU',Updated=TO_TIMESTAMP('2013-03-18 15:42:59','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Element_ID=200200 +; + +-- Mar 18, 2013 3:42:59 PM COT +UPDATE AD_Element_Trl SET IsTranslated='N' WHERE AD_Element_ID=200200 +; + +-- Mar 18, 2013 3:42:59 PM COT +UPDATE AD_Column SET ColumnName='C_OnlineTrxHistory_UU', Name='C_OnlineTrxHistory_UU', Description=NULL, Help=NULL WHERE AD_Element_ID=200200 +; + +-- Mar 18, 2013 3:42:59 PM COT +UPDATE AD_Process_Para SET ColumnName='C_OnlineTrxHistory_UU', Name='C_OnlineTrxHistory_UU', Description=NULL, Help=NULL, AD_Element_ID=200200 WHERE UPPER(ColumnName)='C_ONLINETRXHISTORY_UU' AND IsCentrallyMaintained='Y' AND AD_Element_ID IS NULL +; + +-- Mar 18, 2013 3:42:59 PM COT +UPDATE AD_Process_Para SET ColumnName='C_OnlineTrxHistory_UU', Name='C_OnlineTrxHistory_UU', Description=NULL, Help=NULL WHERE AD_Element_ID=200200 AND IsCentrallyMaintained='Y' +; + +-- Mar 18, 2013 3:42:59 PM COT +UPDATE AD_InfoColumn SET ColumnName='C_OnlineTrxHistory_UU', Name='C_OnlineTrxHistory_UU', Description=NULL, Help=NULL WHERE AD_Element_ID=200200 AND IsCentrallyMaintained='Y' +; + +-- Mar 18, 2013 3:42:59 PM COT +UPDATE AD_Field SET Name='C_OnlineTrxHistory_UU', Description=NULL, Help=NULL WHERE AD_Column_ID IN (SELECT AD_Column_ID FROM AD_Column WHERE AD_Element_ID=200200) AND IsCentrallyMaintained='Y' +; + +-- Mar 18, 2013 3:42:59 PM COT +UPDATE AD_PrintFormatItem SET PrintName='C_OnlineTrxHistory_UU', Name='C_OnlineTrxHistory_UU' WHERE IsCentrallyMaintained='Y' AND EXISTS (SELECT * FROM AD_Column c WHERE c.AD_Column_ID=AD_PrintFormatItem.AD_Column_ID AND c.AD_Element_ID=200200) +; + +SELECT register_migration_script('201303181543_IDEMPIERE-764.sql') FROM dual +; + diff --git a/org.adempiere.base/src/org/compiere/model/I_X_OnlineTrxHistory.java b/org.adempiere.base/src/org/compiere/model/I_C_OnlineTrxHistory.java similarity index 86% rename from org.adempiere.base/src/org/compiere/model/I_X_OnlineTrxHistory.java rename to org.adempiere.base/src/org/compiere/model/I_C_OnlineTrxHistory.java index cf1bfa7f36..3989b0f173 100644 --- a/org.adempiere.base/src/org/compiere/model/I_X_OnlineTrxHistory.java +++ b/org.adempiere.base/src/org/compiere/model/I_C_OnlineTrxHistory.java @@ -20,15 +20,15 @@ import java.math.BigDecimal; import java.sql.Timestamp; import org.compiere.util.KeyNamePair; -/** Generated Interface for X_OnlineTrxHistory +/** Generated Interface for C_OnlineTrxHistory * @author Adempiere (generated) * @version Release 3.6.0LTS */ -public interface I_X_OnlineTrxHistory +public interface I_C_OnlineTrxHistory { - /** TableName=X_OnlineTrxHistory */ - public static final String Table_Name = "X_OnlineTrxHistory"; + /** TableName=C_OnlineTrxHistory */ + public static final String Table_Name = "C_OnlineTrxHistory"; /** AD_Table_ID=200032 */ public static final int Table_ID = 200032; @@ -174,21 +174,21 @@ public interface I_X_OnlineTrxHistory */ public int getUpdatedBy(); - /** Column name X_OnlineTrxHistory_ID */ - public static final String COLUMNNAME_X_OnlineTrxHistory_ID = "X_OnlineTrxHistory_ID"; + /** Column name C_OnlineTrxHistory_ID */ + public static final String COLUMNNAME_C_OnlineTrxHistory_ID = "C_OnlineTrxHistory_ID"; /** Set Online Transaction History */ - public void setX_OnlineTrxHistory_ID (int X_OnlineTrxHistory_ID); + public void setC_OnlineTrxHistory_ID (int C_OnlineTrxHistory_ID); /** Get Online Transaction History */ - public int getX_OnlineTrxHistory_ID(); + public int getC_OnlineTrxHistory_ID(); - /** Column name X_OnlineTrxHistory_UU */ - public static final String COLUMNNAME_X_OnlineTrxHistory_UU = "X_OnlineTrxHistory_UU"; + /** Column name C_OnlineTrxHistory_UU */ + public static final String COLUMNNAME_C_OnlineTrxHistory_UU = "C_OnlineTrxHistory_UU"; - /** Set X_OnlineTrxHistory_UU */ - public void setX_OnlineTrxHistory_UU (String X_OnlineTrxHistory_UU); + /** Set C_OnlineTrxHistory_UU */ + public void setC_OnlineTrxHistory_UU (String C_OnlineTrxHistory_UU); - /** Get X_OnlineTrxHistory_UU */ - public String getX_OnlineTrxHistory_UU(); + /** Get C_OnlineTrxHistory_UU */ + public String getC_OnlineTrxHistory_UU(); } diff --git a/org.adempiere.base/src/org/compiere/model/MOnlineTrxHistory.java b/org.adempiere.base/src/org/compiere/model/MOnlineTrxHistory.java index f0492ef140..d306ceb898 100644 --- a/org.adempiere.base/src/org/compiere/model/MOnlineTrxHistory.java +++ b/org.adempiere.base/src/org/compiere/model/MOnlineTrxHistory.java @@ -22,16 +22,16 @@ import java.util.Properties; * @author Elaine * */ -public class MOnlineTrxHistory extends X_X_OnlineTrxHistory { +public class MOnlineTrxHistory extends X_C_OnlineTrxHistory { /** * */ private static final long serialVersionUID = 2160888813932490117L; - public MOnlineTrxHistory(Properties ctx, int X_OnlineTrxHistory_ID, String trxName) + public MOnlineTrxHistory(Properties ctx, int C_OnlineTrxHistory_ID, String trxName) { - super(ctx, X_OnlineTrxHistory_ID, trxName); + super(ctx, C_OnlineTrxHistory_ID, trxName); } public MOnlineTrxHistory(Properties ctx, ResultSet rs, String trxName) diff --git a/org.adempiere.base/src/org/compiere/model/X_X_OnlineTrxHistory.java b/org.adempiere.base/src/org/compiere/model/X_C_OnlineTrxHistory.java similarity index 80% rename from org.adempiere.base/src/org/compiere/model/X_X_OnlineTrxHistory.java rename to org.adempiere.base/src/org/compiere/model/X_C_OnlineTrxHistory.java index 105d5a243f..e7833aa09e 100644 --- a/org.adempiere.base/src/org/compiere/model/X_X_OnlineTrxHistory.java +++ b/org.adempiere.base/src/org/compiere/model/X_C_OnlineTrxHistory.java @@ -20,10 +20,10 @@ package org.compiere.model; import java.sql.ResultSet; import java.util.Properties; -/** Generated Model for X_OnlineTrxHistory +/** Generated Model for C_OnlineTrxHistory * @author Adempiere (generated) * @version Release 3.6.0LTS - $Id$ */ -public class X_X_OnlineTrxHistory extends PO implements I_X_OnlineTrxHistory, I_Persistent +public class X_C_OnlineTrxHistory extends PO implements I_C_OnlineTrxHistory, I_Persistent { /** @@ -32,10 +32,10 @@ public class X_X_OnlineTrxHistory extends PO implements I_X_OnlineTrxHistory, I_ private static final long serialVersionUID = 20121031L; /** Standard Constructor */ - public X_X_OnlineTrxHistory (Properties ctx, int X_OnlineTrxHistory_ID, String trxName) + public X_C_OnlineTrxHistory (Properties ctx, int C_OnlineTrxHistory_ID, String trxName) { - super (ctx, X_OnlineTrxHistory_ID, trxName); - /** if (X_OnlineTrxHistory_ID == 0) + super (ctx, C_OnlineTrxHistory_ID, trxName); + /** if (C_OnlineTrxHistory_ID == 0) { setAD_Table_ID (0); setIsError (false); @@ -43,12 +43,12 @@ public class X_X_OnlineTrxHistory extends PO implements I_X_OnlineTrxHistory, I_ setProcessed (false); // N setRecord_ID (0); - setX_OnlineTrxHistory_ID (0); + setC_OnlineTrxHistory_ID (0); } */ } /** Load Constructor */ - public X_X_OnlineTrxHistory (Properties ctx, ResultSet rs, String trxName) + public X_C_OnlineTrxHistory (Properties ctx, ResultSet rs, String trxName) { super (ctx, rs, trxName); } @@ -70,7 +70,7 @@ public class X_X_OnlineTrxHistory extends PO implements I_X_OnlineTrxHistory, I_ public String toString() { - StringBuffer sb = new StringBuffer ("X_X_OnlineTrxHistory[") + StringBuffer sb = new StringBuffer ("X_C_OnlineTrxHistory[") .append(get_ID()).append("]"); return sb.toString(); } @@ -192,36 +192,36 @@ public class X_X_OnlineTrxHistory extends PO implements I_X_OnlineTrxHistory, I_ } /** Set Online Transaction History. - @param X_OnlineTrxHistory_ID Online Transaction History */ - public void setX_OnlineTrxHistory_ID (int X_OnlineTrxHistory_ID) + @param C_OnlineTrxHistory_ID Online Transaction History */ + public void setC_OnlineTrxHistory_ID (int C_OnlineTrxHistory_ID) { - if (X_OnlineTrxHistory_ID < 1) - set_ValueNoCheck (COLUMNNAME_X_OnlineTrxHistory_ID, null); + if (C_OnlineTrxHistory_ID < 1) + set_ValueNoCheck (COLUMNNAME_C_OnlineTrxHistory_ID, null); else - set_ValueNoCheck (COLUMNNAME_X_OnlineTrxHistory_ID, Integer.valueOf(X_OnlineTrxHistory_ID)); + set_ValueNoCheck (COLUMNNAME_C_OnlineTrxHistory_ID, Integer.valueOf(C_OnlineTrxHistory_ID)); } /** Get Online Transaction History. @return Online Transaction History */ - public int getX_OnlineTrxHistory_ID () + public int getC_OnlineTrxHistory_ID () { - Integer ii = (Integer)get_Value(COLUMNNAME_X_OnlineTrxHistory_ID); + Integer ii = (Integer)get_Value(COLUMNNAME_C_OnlineTrxHistory_ID); if (ii == null) return 0; return ii.intValue(); } - /** Set X_OnlineTrxHistory_UU. - @param X_OnlineTrxHistory_UU X_OnlineTrxHistory_UU */ - public void setX_OnlineTrxHistory_UU (String X_OnlineTrxHistory_UU) + /** Set C_OnlineTrxHistory_UU. + @param C_OnlineTrxHistory_UU C_OnlineTrxHistory_UU */ + public void setC_OnlineTrxHistory_UU (String C_OnlineTrxHistory_UU) { - set_Value (COLUMNNAME_X_OnlineTrxHistory_UU, X_OnlineTrxHistory_UU); + set_Value (COLUMNNAME_C_OnlineTrxHistory_UU, C_OnlineTrxHistory_UU); } - /** Get X_OnlineTrxHistory_UU. - @return X_OnlineTrxHistory_UU */ - public String getX_OnlineTrxHistory_UU () + /** Get C_OnlineTrxHistory_UU. + @return C_OnlineTrxHistory_UU */ + public String getC_OnlineTrxHistory_UU () { - return (String)get_Value(COLUMNNAME_X_OnlineTrxHistory_UU); + return (String)get_Value(COLUMNNAME_C_OnlineTrxHistory_UU); } } \ No newline at end of file