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

Fix SQL error with Merge entities and don't ignore some errors 

Link to SF Tracker: http://sourceforge.net/support/tracker.php?aid=2936826
This commit is contained in:
phib 2010-02-23 01:55:33 +00:00
parent b8f54de8f9
commit 24ee390c32
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
client/src/org/compiere/apps/form/Merge.java
View File

@ -108,7 +108,7 @@ public class Merge
+ "(SELECT rt.AD_Reference_ID FROM AD_Ref_Table rt" + "(SELECT rt.AD_Reference_ID FROM AD_Ref_Table rt"
+ " INNER JOIN AD_Column cc ON (rt.AD_Table_ID=cc.AD_Table_ID AND rt.AD_Key=cc.AD_Column_ID) " + " INNER JOIN AD_Column cc ON (rt.AD_Table_ID=cc.AD_Table_ID AND rt.AD_Key=cc.AD_Column_ID) "
+ "WHERE cc.IsKey='Y' AND cc.ColumnName=?)" // #2 + "WHERE cc.IsKey='Y' AND cc.ColumnName=?)" // #2
+ ") AND c.ColumnSQL IS NULL" + ") AND c.ColumnSQL IS NULL "
+ "ORDER BY t.LoadSeq DESC"; + "ORDER BY t.LoadSeq DESC";
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
@ -159,8 +159,8 @@ public class Merge
} }
// //
if (success) if ( success )
m_trx.commit(); success = m_trx.commit();
else else
m_trx.rollback(); m_trx.rollback();
@ -170,6 +170,7 @@ public class Merge
catch (Exception ex) catch (Exception ex)
{ {
log.log(Level.SEVERE, ColumnName, ex); log.log(Level.SEVERE, ColumnName, ex);
success = false;
} }
// Cleanup // Cleanup
try try