midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-385 Resolve M_Storage locking and data consistency / M_StorageReservation requires IsSOTrx part of they key / PO.java need changes to manage Boolean on multi-column primary key

This commit is contained in:
Carlos Ruiz 2012-11-20 17:30:16 -05:00
parent bba1082d4e
commit d74f7933ba
3 changed files with 55 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
migration/i1.0a-release/oracle/201211191100_IDEMPIERE-385_DB.sql
View File

@ -370,6 +370,26 @@ SELECT s.ad_client_id,
mp.name mp.name
; ;
-- Nov 20, 2012 5:06:02 PM COT
-- IDEMPIERE-385 Resolve M_Storage locking and data consistency
UPDATE AD_Column SET IsParent='Y', IsUpdateable='N', IsToolbarButton='N',Updated=TO_DATE('2012-11-20 17:06:02','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=200640
;
-- Nov 20, 2012 5:28:27 PM COT
-- IDEMPIERE-385 Resolve M_Storage locking and data consistency
UPDATE AD_Column SET IsMandatory='Y', IsUpdateable='N',Updated=TO_DATE('2012-11-20 17:28:27','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=200640
;
-- Nov 20, 2012 5:28:36 PM COT
-- IDEMPIERE-385 Resolve M_Storage locking and data consistency
ALTER TABLE M_StorageReservation MODIFY IsSOTrx CHAR(1) DEFAULT 'Y'
;
-- Nov 20, 2012 5:28:36 PM COT
-- IDEMPIERE-385 Resolve M_Storage locking and data consistency
UPDATE M_StorageReservation SET IsSOTrx='Y' WHERE IsSOTrx IS NULL
;
SELECT register_migration_script('201211191100_IDEMPIERE-385_DB.sql') FROM dual SELECT register_migration_script('201211191100_IDEMPIERE-385_DB.sql') FROM dual
; ;

20
migration/i1.0a-release/postgresql/201211191100_IDEMPIERE-385_DB.sql
View File

@ -489,6 +489,26 @@ SELECT s.ad_client_id,
mp.name mp.name
; ;
-- Nov 20, 2012 5:06:02 PM COT
-- IDEMPIERE-385 Resolve M_Storage locking and data consistency
UPDATE AD_Column SET IsParent='Y', IsUpdateable='N', IsToolbarButton='N',Updated=TO_TIMESTAMP('2012-11-20 17:06:02','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=200640
;
-- Nov 20, 2012 5:28:27 PM COT
-- IDEMPIERE-385 Resolve M_Storage locking and data consistency
UPDATE AD_Column SET IsMandatory='Y', IsUpdateable='N',Updated=TO_TIMESTAMP('2012-11-20 17:28:27','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=200640
;
-- Nov 20, 2012 5:28:36 PM COT
-- IDEMPIERE-385 Resolve M_Storage locking and data consistency
INSERT INTO t_alter_column values('m_storagereservation','IsSOTrx','CHAR(1)',null,'Y')
;
-- Nov 20, 2012 5:28:36 PM COT
-- IDEMPIERE-385 Resolve M_Storage locking and data consistency
UPDATE M_StorageReservation SET IsSOTrx='Y' WHERE IsSOTrx IS NULL
;
SELECT register_migration_script('201211191100_IDEMPIERE-385_DB.sql') FROM dual SELECT register_migration_script('201211191100_IDEMPIERE-385_DB.sql') FROM dual
; ;

17
org.adempiere.base/src/org/compiere/model/PO.java
View File

@ -1319,6 +1319,8 @@ public abstract class PO
Object oo = m_IDs[i]; Object oo = m_IDs[i];
if (oo instanceof Integer) if (oo instanceof Integer)
pstmt.setInt(i+1, ((Integer)m_IDs[i]).intValue()); pstmt.setInt(i+1, ((Integer)m_IDs[i]).intValue());
else if (oo instanceof Boolean)
pstmt.setString(i+1, ((Boolean) m_IDs[i] ? "Y" : "N"));
else else
pstmt.setString(i+1, m_IDs[i].toString()); pstmt.setString(i+1, m_IDs[i].toString());
} }
@ -2953,8 +2955,19 @@ public abstract class PO
{ {
if (m_KeyColumns[i].endsWith("_ID")) if (m_KeyColumns[i].endsWith("_ID"))
sb.append(m_IDs[i]); sb.append(m_IDs[i]);
else else {
sb.append("'").append(m_IDs[i]).append("'"); sb.append("'");
if (m_IDs[i] instanceof Boolean) {
if ((Boolean) m_IDs[i]) {
sb.append("Y");
} else {
sb.append("N");
}
} else {
sb.append(m_IDs[i]);
}
sb.append("'");
}
} }
else else
sb.append("?"); sb.append("?");