details: https://code.openbravo.com/erp/devel/pi/rev/a2c903436f86
changeset: 24159:a2c903436f86
user: Atul Gaware <atul.gaware <at> openbravo.com>
date: Mon Aug 04 19:31:59 2014 +0530
summary: Fixes Issue 0027273:Avoids upgrade failure from 2.50 to 3.0
diffstat:
src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/DuplicatedOrgWarehouse.class
| 0
src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/DuplicatedOrgWarehouseData.class
| 0
src-util/buildvalidation/build/javasqlc/src/org/openbravo/buildvalidation/DuplicatedOrgWarehouseData.java
| 38 ++++++++++
src-util/buildvalidation/src/org/openbravo/buildvalidation/DuplicatedOrgWarehouse.java
| 18 ++--
src-util/buildvalidation/src/org/openbravo/buildvalidation/DuplicatedOrgWarehouse_data.xsql
| 9 ++
5 files changed, 57 insertions(+), 8 deletions(-)
diffs (97 lines):
diff -r 752c92d2f31a -r a2c903436f86
src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/DuplicatedOrgWarehouse.class
Binary file
src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/DuplicatedOrgWarehouse.class
has changed
diff -r 752c92d2f31a -r a2c903436f86
src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/DuplicatedOrgWarehouseData.class
Binary file
src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/DuplicatedOrgWarehouseData.class
has changed
diff -r 752c92d2f31a -r a2c903436f86
src-util/buildvalidation/build/javasqlc/src/org/openbravo/buildvalidation/DuplicatedOrgWarehouseData.java
---
a/src-util/buildvalidation/build/javasqlc/src/org/openbravo/buildvalidation/DuplicatedOrgWarehouseData.java
Mon Aug 04 18:26:03 2014 +0200
+++
b/src-util/buildvalidation/build/javasqlc/src/org/openbravo/buildvalidation/DuplicatedOrgWarehouseData.java
Mon Aug 04 19:31:59 2014 +0530
@@ -132,4 +132,42 @@
}
return(boolReturn);
}
+
+/**
+Check if the AD_Org_Warehouse table exist
+ */
+ public static boolean existOrgWarehouseTable(ConnectionProvider
connectionProvider) throws ServletException {
+ String strSql = "";
+ strSql = strSql +
+ " SELECT count(*) AS EXISTING" +
+ " FROM ad_table" +
+ " WHERE ad_table_id = '26673F55911848E894D837F57207A92B'";
+
+ ResultSet result;
+ boolean boolReturn = false;
+ PreparedStatement st = null;
+
+ try {
+ st = connectionProvider.getPreparedStatement(strSql);
+
+ result = st.executeQuery();
+ if(result.next()) {
+ boolReturn = !UtilSql.getValue(result, "existing").equals("0");
+ }
+ result.close();
+ } catch(SQLException e){
+ log4j.error("SQL error in query: " + strSql + "Exception:"+ e);
+ throw new ServletException("@CODE=" + Integer.toString(e.getErrorCode())
+ "@" + e.getMessage());
+ } catch(Exception ex){
+ log4j.error("Exception in query: " + strSql + "Exception:"+ ex);
+ throw new ServletException("@CODE=@" + ex.getMessage());
+ } finally {
+ try {
+ connectionProvider.releasePreparedStatement(st);
+ } catch(Exception ignore){
+ ignore.printStackTrace();
+ }
+ }
+ return(boolReturn);
+ }
}
diff -r 752c92d2f31a -r a2c903436f86
src-util/buildvalidation/src/org/openbravo/buildvalidation/DuplicatedOrgWarehouse.java
---
a/src-util/buildvalidation/src/org/openbravo/buildvalidation/DuplicatedOrgWarehouse.java
Mon Aug 04 18:26:03 2014 +0200
+++
b/src-util/buildvalidation/src/org/openbravo/buildvalidation/DuplicatedOrgWarehouse.java
Mon Aug 04 19:31:59 2014 +0530
@@ -33,16 +33,18 @@
ConnectionProvider cp = getConnectionProvider();
ArrayList<String> errors = new ArrayList<String>();
try{
- if (DuplicatedOrgWarehouseData.existsDuplicatedOrgWarehouse(cp)) {
- DuplicatedOrgWarehouseData[] orgWarehouse =
DuplicatedOrgWarehouseData.DuplicatedOrganizationWarehouse(cp);
- errors.add("Due to a database constraint modification, is no longer
allowed to "+
+ if (DuplicatedOrgWarehouseData.existOrgWarehouseTable(cp)) {
+ if (DuplicatedOrgWarehouseData.existsDuplicatedOrgWarehouse(cp)) {
+ DuplicatedOrgWarehouseData[] orgWarehouse =
DuplicatedOrgWarehouseData.DuplicatedOrganizationWarehouse(cp);
+ errors.add("Due to a database constraint modification, is no longer
allowed to "+
"assign the same Warehouse more than once in each
Organization. "+
"There exists data in your database that do not fit this
new constraint. Please review following:- ");
- for(int i = 0; i < orgWarehouse.length ;i++) {
- errors.add(" Client: " + orgWarehouse[i].client + ", Organization: " +
orgWarehouse[i].organization + ", Warehouse: " + orgWarehouse[i].warehouse);
- }
- }
- } catch (Exception e) {
+ for(int i = 0; i < orgWarehouse.length ;i++) {
+ errors.add(" Client: " + orgWarehouse[i].client + ", Organization:
" + orgWarehouse[i].organization + ", Warehouse: " + orgWarehouse[i].warehouse);
+ }
+ }
+ }
+ }catch (Exception e) {
return handleError(e);
}
return errors;
diff -r 752c92d2f31a -r a2c903436f86
src-util/buildvalidation/src/org/openbravo/buildvalidation/DuplicatedOrgWarehouse_data.xsql
---
a/src-util/buildvalidation/src/org/openbravo/buildvalidation/DuplicatedOrgWarehouse_data.xsql
Mon Aug 04 18:26:03 2014 +0200
+++
b/src-util/buildvalidation/src/org/openbravo/buildvalidation/DuplicatedOrgWarehouse_data.xsql
Mon Aug 04 19:31:59 2014 +0530
@@ -40,4 +40,13 @@
HAVING count(*)>1
]]></Sql>
</SqlMethod>
+ <SqlMethod name="existOrgWarehouseTable" type="preparedStatement"
return="boolean">
+ <SqlMethodComment>Check if the AD_Org_Warehouse table
exist</SqlMethodComment>
+ <Sql><![CDATA[
+ SELECT count(*) AS EXISTING
+ FROM ad_table
+ WHERE ad_table_id = '26673F55911848E894D837F57207A92B'
+ ]]>
+ </Sql>
+ </SqlMethod>
</SqlClass>
------------------------------------------------------------------------------
Infragistics Professional
Build stunning WinForms apps today!
Reboot your WinForms applications with our WinForms controls.
Build a bridge from your legacy apps to the future.
http://pubads.g.doubleclick.net/gampad/clk?id=153845071&iu=/4140/ostg.clktrk
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
