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

hg merge release-2.1 (merge release2.1 into development)

This commit is contained in:
Carlos Ruiz 2015-06-17 18:19:25 -05:00
parent 5cd07c4c26 c4e93a15f7
commit 236e4ee928
10 changed files with 62 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
db/ddlutils/oracle/ant.sh
View File

@ -1 +1 @@
java -Xms128m -Xmx512m -classpath "../../../tools/lib/ant.jar;../../../tools/lib/ant-launcher.jar;../../../tools/lib/ant-swing.jar;../../../tools/lib/ant-commons-net.jar;../../../tools/lib/commons-net.jar" -Dant.home="." org.apache.tools.ant.Main $*
java -Xms128m -Xmx512m -classpath "../../../targetPlatform/plugins/org.apache.ant_1.7.1.v20100518-1145/lib/ant.jar:../../../targetPlatform/plugins/org.apache.ant_1.7.1.v20100518-1145/lib/ant-launcher.jar:../../../targetPlatform/plugins/org.apache.ant_1.7.1.v20100518-1145/lib/ant-swing.jar:../../../targetPlatform/plugins/org.apache.ant_1.7.1.v20100518-1145/lib/ant-commons-net.jar" -Dant.home="." org.apache.tools.ant.Main $*

14
migration/i2.1/oracle/201506162003_IDEMPIERE-2685.sql Normal file
View File

@ -0,0 +1,14 @@
SET SQLBLANKLINES ON
SET DEFINE OFF
-- Jun 16, 2015 7:11:44 PM CEST
-- IDEMPIERE - 2685
UPDATE AD_Column SET ReadOnlyLogic='@#ShowAdvanced@ = N',Updated=TO_DATE('2015-06-16 19:11:44','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Column_ID=50209
;
-- Jun 16, 2015 7:11:49 PM CEST
UPDATE AD_Column SET ReadOnlyLogic='@#ShowAdvanced@ = N',Updated=TO_DATE('2015-06-16 19:11:49','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Column_ID=54091
;
SELECT register_migration_script('201506162003_IDEMPIERE-2685.sql') FROM dual
;

11
migration/i2.1/postgresql/201506162003_IDEMPIERE-2685.sql Normal file
View File

@ -0,0 +1,11 @@
-- Jun 16, 2015 7:11:44 PM CEST
-- IDEMPIERE - 2685
UPDATE AD_Column SET ReadOnlyLogic='@#ShowAdvanced@ = N',Updated=TO_TIMESTAMP('2015-06-16 19:11:44','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Column_ID=50209
;
-- Jun 16, 2015 7:11:49 PM CEST
UPDATE AD_Column SET ReadOnlyLogic='@#ShowAdvanced@ = N',Updated=TO_TIMESTAMP('2015-06-16 19:11:49','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Column_ID=54091
;
SELECT register_migration_script('201506162003_IDEMPIERE-2685.sql') FROM dual
;

16
org.adempiere.base.process/src/org/compiere/process/ColumnEncryption.java
View File

@ -320,7 +320,8 @@ public class ColumnEncryption extends SvrProcess {
ResultSet rs = null;
try {
selectStmt = m_conn.prepareStatement(selectSql.toString(),
String selectSqlStr = DB.getDatabase().convertStatement(selectSql.toString());
selectStmt = m_conn.prepareStatement(selectSqlStr,
ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_UPDATABLE);
updateStmt = m_conn.prepareStatement(updateSql.toString());
@ -397,7 +398,8 @@ public class ColumnEncryption extends SvrProcess {
ResultSet rs = null;
try {
selectStmt = m_conn.prepareStatement(selectSql.toString(),
String selectSqlStr = DB.getDatabase().convertStatement(selectSql.toString());
selectStmt = m_conn.prepareStatement(selectSqlStr,
ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_UPDATABLE);
updateStmt = m_conn.prepareStatement(updateSql.toString());
@ -460,10 +462,7 @@ public class ColumnEncryption extends SvrProcess {
int rowsEffected = -1;
// Select SQL
StringBuilder selectSql = new StringBuilder();
selectSql.append("SELECT FieldLength");
selectSql.append(" FROM AD_Column");
selectSql.append(" WHERE AD_Column_ID=?");
String selectSql = "SELECT FieldLength FROM AD_Column WHERE AD_Column_ID=?";
// Alter SQL
StringBuilder alterSql = new StringBuilder();
@ -482,7 +481,8 @@ public class ColumnEncryption extends SvrProcess {
ResultSet rs = null;
try {
selectStmt = m_conn.prepareStatement(selectSql.toString(),
selectSql = DB.getDatabase().convertStatement(selectSql);
selectStmt = m_conn.prepareStatement(selectSql,
ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_UPDATABLE);
selectStmt.setInt(1, columnID);
@ -490,6 +490,7 @@ public class ColumnEncryption extends SvrProcess {
if (rs.next()) {
// Change the column size physically.
alterSql = new StringBuilder(DB.getDatabase().convertStatement(alterSql.toString()));
if (DB.executeUpdate(alterSql.toString(), false, m_trx
.getTrxName()) == -1) {
log.severe("EncryptError [ChangeFieldLength]: ColumnID="
@ -498,6 +499,7 @@ public class ColumnEncryption extends SvrProcess {
}
// Change the column size in AD.
updateSql = new StringBuilder(DB.getDatabase().convertStatement(updateSql.toString()));
if (DB.executeUpdate(updateSql.toString(), false, m_trx
.getTrxName()) == -1) {
log.severe("EncryptError [ChangeFieldLength]: ColumnID="

1
org.adempiere.base.process/src/org/compiere/process/ReplicationLocal.java
View File

@ -541,6 +541,7 @@ public class ReplicationLocal extends SvrProcess
//
try
{
sql = DB.getDatabase().convertStatement(sql);
pstmt = conn.prepareStatement(sql,
ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY);
// Set Parameters

2
org.adempiere.base/src/org/compiere/model/GridField.java
View File

@ -784,7 +784,7 @@ public class GridField
private Object createDefault (String value)
{
// true NULL
if (value == null || value.toString().length() == 0)
if (value == null || value.toString().length() == 0 || value.toUpperCase().equals("NULL"))
return null;
// see also MTable.readData
try

23
org.adempiere.base/src/org/compiere/model/MSequence.java
View File

@ -125,6 +125,8 @@ public class MSequence extends X_AD_Sequence
+ " AND IsActive='Y' AND IsTableID='Y' AND IsAutoSequence='Y' ";
}
if (!DB.isOracle() && !DB.isPostgreSQL())
selectSQL = DB.getDatabase().convertStatement(selectSQL);
Connection conn = null;
PreparedStatement pstmt = null;
@ -221,12 +223,16 @@ public class MSequence extends X_AD_Sequence
{
int incrementNo = rs.getInt(3);
if (adempiereSys) {
updateSQL = conn
.prepareStatement("UPDATE AD_Sequence SET CurrentNextSys = CurrentNextSys + ? WHERE AD_Sequence_ID = ?");
String updateCmd = "UPDATE AD_Sequence SET CurrentNextSys=CurrentNextSys+? WHERE AD_Sequence_ID=?";
if (!DB.isOracle() && !DB.isPostgreSQL())
updateCmd = DB.getDatabase().convertStatement(updateCmd);
updateSQL = conn.prepareStatement(updateCmd);
retValue = rs.getInt(2);
} else {
updateSQL = conn
.prepareStatement("UPDATE AD_Sequence SET CurrentNext = CurrentNext + ? WHERE AD_Sequence_ID = ?");
String updateCmd = "UPDATE AD_Sequence SET CurrentNext=CurrentNext+? WHERE AD_Sequence_ID=?";
if (!DB.isOracle() && !DB.isPostgreSQL())
updateCmd = DB.getDatabase().convertStatement(updateCmd);
updateSQL = conn.prepareStatement(updateCmd);
retValue = rs.getInt(1);
}
updateSQL.setInt(1, incrementNo);
@ -367,6 +373,8 @@ public class MSequence extends X_AD_Sequence
selectSQL = selectSQL + " FOR UPDATE OF s";
}
}
if (!DB.isOracle() && !DB.isPostgreSQL())
selectSQL = DB.getDatabase().convertStatement(selectSQL);
Connection conn = null;
Trx trx = trxName == null ? null : Trx.get(trxName, true);
//
@ -439,7 +447,10 @@ public class MSequence extends X_AD_Sequence
try
{
if (adempiereSys) {
updateSQL = conn.prepareStatement("UPDATE AD_Sequence SET CurrentNextSys = CurrentNextSys + ? WHERE AD_Sequence_ID = ?");
String updateCmd = "UPDATE AD_Sequence SET CurrentNextSys = CurrentNextSys + ? WHERE AD_Sequence_ID = ?";
if (!DB.isOracle() && !DB.isPostgreSQL())
updateCmd = DB.getDatabase().convertStatement(updateCmd);
updateSQL = conn.prepareStatement(updateCmd);
next = rs.getInt(2);
} else {
String sql;
@ -447,6 +458,8 @@ public class MSequence extends X_AD_Sequence
sql = "UPDATE AD_Sequence_No SET CurrentNext = CurrentNext + ? WHERE AD_Sequence_ID=? AND CalendarYearMonth=? AND AD_Org_ID=?";
else
sql = "UPDATE AD_Sequence SET CurrentNext = CurrentNext + ? WHERE AD_Sequence_ID=?";
if (!DB.isOracle() && !DB.isPostgreSQL())
sql = DB.getDatabase().convertStatement(sql);
updateSQL = conn.prepareStatement(sql);
next = rs.getInt(1);
}

2
org.adempiere.base/src/org/compiere/model/PO_LOB.java
View File

@ -115,6 +115,8 @@ public class PO_LOB implements Serializable
.append(m_tableName)
.append(" SET ").append(m_columnName)
.append("=? WHERE ").append(m_whereClause);
if (!DB.isPostgreSQL() && !DB.isOracle())
sql = new StringBuffer(DB.getDatabase().convertStatement(sql.toString()));
//
if (log.isLoggable(Level.FINE)) log.fine("[" + trxName + "] - Local - " + m_value);

5
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/AbstractADWindowContent.java
View File

@ -1564,10 +1564,9 @@ public abstract class AbstractADWindowContent extends AbstractUIPart implements
{
GridTab gt = adTabbox.getSelectedGridTab();
String trxInfo = gt.getStatusLine();
if (trxInfo != null)
{
if (trxInfo == null)
trxInfo = "";
statusBar.setInfo(trxInfo);
}
SessionManager.getAppDesktop().updateHelpQuickInfo(gt);
}

4
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoGeneralPanel.java
View File

@ -409,12 +409,12 @@ public class InfoGeneralPanel extends InfoPanel implements EventListener<Event>
{
if (Env.isBaseLanguage(Env.getCtx(), "AD_Ref_List"))
colSql = new StringBuffer("(SELECT l.Name FROM AD_Ref_List l WHERE l.AD_Reference_ID=")
.append(AD_Reference_Value_ID).append(" AND l.Value=").append(columnSql)
.append(AD_Reference_Value_ID).append(" AND l.Value=").append(tableName).append(".").append(columnSql)
.append(") AS ").append(columnName);
else
colSql = new StringBuffer("(SELECT t.Name FROM AD_Ref_List l, AD_Ref_List_Trl t "
+ "WHERE l.AD_Ref_List_ID=t.AD_Ref_List_ID AND l.AD_Reference_ID=")
.append(AD_Reference_Value_ID).append(" AND l.Value=").append(columnSql)
.append(AD_Reference_Value_ID).append(" AND l.Value=").append(tableName).append(".").append(columnSql)
.append(" AND t.AD_Language='").append(Env.getAD_Language(Env.getCtx()))
.append("') AS ").append(columnName);
colClass = String.class;