details: https://code.openbravo.com/erp/devel/pi/rev/c25f30b54f5e changeset: 19949:c25f30b54f5e user: Sandra Huguet <sandra.huguet <at> openbravo.com> date: Tue Mar 19 09:57:46 2013 +0100 summary: Fixed bug 23330 Add AD_Client_AcctDimension in dataset for sampledata
details: https://code.openbravo.com/erp/devel/pi/rev/4d0c78bf59db changeset: 19950:4d0c78bf59db user: Sandra Huguet <sandra.huguet <at> openbravo.com> date: Tue Mar 19 10:38:25 2013 +0100 summary: Fixed bug 23332 InitializeAcctDimensionsInClient is not filtering by client diffstat: src-db/database/sourcedata/AD_DATASET_TABLE.xml | 14 + src-util/modulescript/build/classes/org/openbravo/modulescript/InitializeAcctDimensionsInClient.class | 0 src-util/modulescript/build/classes/org/openbravo/modulescript/InitializeAcctDimensionsInClientData.class | 0 src-util/modulescript/build/javasqlc/src/org/openbravo/modulescript/InitializeAcctDimensionsInClientData.java | 81 +--------- src-util/modulescript/src/org/openbravo/modulescript/InitializeAcctDimensionsInClient.java | 8 +- src-util/modulescript/src/org/openbravo/modulescript/InitializeAcctDimensionsInClient_data.xsql | 38 +--- 6 files changed, 27 insertions(+), 114 deletions(-) diffs (207 lines): diff -r cbf0d0cb2164 -r 4d0c78bf59db src-db/database/sourcedata/AD_DATASET_TABLE.xml --- a/src-db/database/sourcedata/AD_DATASET_TABLE.xml Wed Mar 20 19:36:11 2013 +0100 +++ b/src-db/database/sourcedata/AD_DATASET_TABLE.xml Tue Mar 19 10:38:25 2013 +0100 @@ -350,6 +350,20 @@ <!--15B28DD526BF496FA492BCB427F5BEA2--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--15B28DD526BF496FA492BCB427F5BEA2--></AD_DATASET_TABLE> +<!--16F4F31620434F048B109911886873A8--><AD_DATASET_TABLE> +<!--16F4F31620434F048B109911886873A8--> <AD_DATASET_TABLE_ID><![CDATA[16F4F31620434F048B109911886873A8]]></AD_DATASET_TABLE_ID> +<!--16F4F31620434F048B109911886873A8--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--16F4F31620434F048B109911886873A8--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--16F4F31620434F048B109911886873A8--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--16F4F31620434F048B109911886873A8--> <AD_DATASET_ID><![CDATA[D81C5C810AEF47C690E4F688ABC8AAC8]]></AD_DATASET_ID> +<!--16F4F31620434F048B109911886873A8--> <AD_TABLE_ID><![CDATA[C994C3B6AB5A4D2DA0CC2085191CF0EB]]></AD_TABLE_ID> +<!--16F4F31620434F048B109911886873A8--> <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS> +<!--16F4F31620434F048B109911886873A8--> <WHERECLAUSE><![CDATA[client.id=:ClientID]]></WHERECLAUSE> +<!--16F4F31620434F048B109911886873A8--> <EXCLUDEAUDITINFO><![CDATA[N]]></EXCLUDEAUDITINFO> +<!--16F4F31620434F048B109911886873A8--> <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT> +<!--16F4F31620434F048B109911886873A8--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--16F4F31620434F048B109911886873A8--></AD_DATASET_TABLE> + <!--195DBAE026F74F0BA21072EB6698EB33--><AD_DATASET_TABLE> <!--195DBAE026F74F0BA21072EB6698EB33--> <AD_DATASET_TABLE_ID><![CDATA[195DBAE026F74F0BA21072EB6698EB33]]></AD_DATASET_TABLE_ID> <!--195DBAE026F74F0BA21072EB6698EB33--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r cbf0d0cb2164 -r 4d0c78bf59db src-util/modulescript/build/classes/org/openbravo/modulescript/InitializeAcctDimensionsInClient.class Binary file src-util/modulescript/build/classes/org/openbravo/modulescript/InitializeAcctDimensionsInClient.class has changed diff -r cbf0d0cb2164 -r 4d0c78bf59db src-util/modulescript/build/classes/org/openbravo/modulescript/InitializeAcctDimensionsInClientData.class Binary file src-util/modulescript/build/classes/org/openbravo/modulescript/InitializeAcctDimensionsInClientData.class has changed diff -r cbf0d0cb2164 -r 4d0c78bf59db src-util/modulescript/build/javasqlc/src/org/openbravo/modulescript/InitializeAcctDimensionsInClientData.java --- a/src-util/modulescript/build/javasqlc/src/org/openbravo/modulescript/InitializeAcctDimensionsInClientData.java Wed Mar 20 19:36:11 2013 +0100 +++ b/src-util/modulescript/build/javasqlc/src/org/openbravo/modulescript/InitializeAcctDimensionsInClientData.java Tue Mar 19 10:38:25 2013 +0100 @@ -92,80 +92,6 @@ return(objectInitializeAcctDimensionsInClientData); } - public static boolean isExecuted(ConnectionProvider connectionProvider) throws ServletException { - String strSql = ""; - strSql = strSql + - " SELECT count(*) as exist" + - " FROM DUAL" + - " WHERE EXISTS (SELECT 1 FROM ad_preference" + - " WHERE attribute = 'DimensionDisplayConfigured')"; - - ResultSet result; - boolean boolReturn = false; - PreparedStatement st = null; - - try { - st = connectionProvider.getPreparedStatement(strSql); - - result = st.executeQuery(); - if(result.next()) { - boolReturn = !UtilSql.getValue(result, "exist").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); - } - - public static int createPreference(Connection conn, ConnectionProvider connectionProvider, String client) throws ServletException { - String strSql = ""; - strSql = strSql + - " INSERT INTO ad_preference (" + - " ad_preference_id, ad_client_id, ad_org_id, isactive," + - " createdby, created, updatedby, updated," + - " attribute" + - " ) VALUES (" + - " get_uuid(), ?, '0', 'Y'," + - " '0', NOW(), '0', NOW()," + - " 'DimensionDisplayConfigured'" + - " )"; - - int updateCount = 0; - PreparedStatement st = null; - - int iParameter = 0; - try { - st = connectionProvider.getPreparedStatement(conn, strSql); - iParameter++; UtilSql.setValue(st, iParameter, 12, null, client); - - updateCount = st.executeUpdate(); - } 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.releaseTransactionalPreparedStatement(st); - } catch(Exception ignore){ - ignore.printStackTrace(); - } - } - return(updateCount); - } - public static int updateDimClient(Connection conn, ConnectionProvider connectionProvider) throws ServletException { String strSql = ""; strSql = strSql + @@ -1257,9 +1183,10 @@ public static InitializeAcctDimensionsInClientData[] getClients(ConnectionProvider connectionProvider, int firstRegister, int numberRegisters) throws ServletException { String strSql = ""; strSql = strSql + - " SELECT ad_client_id" + - " FROM ad_client" + - " where ad_client_id <> '0'"; + " select ad_client_id " + + " from ad_client " + + " where ad_Client_id not in(select ad_client_id from AD_Client_AcctDimension )" + + " and ad_client_id <> '0'"; ResultSet result; Vector<java.lang.Object> vector = new Vector<java.lang.Object>(0); diff -r cbf0d0cb2164 -r 4d0c78bf59db src-util/modulescript/src/org/openbravo/modulescript/InitializeAcctDimensionsInClient.java --- a/src-util/modulescript/src/org/openbravo/modulescript/InitializeAcctDimensionsInClient.java Wed Mar 20 19:36:11 2013 +0100 +++ b/src-util/modulescript/src/org/openbravo/modulescript/InitializeAcctDimensionsInClient.java Tue Mar 19 10:38:25 2013 +0100 @@ -34,8 +34,7 @@ ConnectionProvider cp = getConnectionProvider(); Connection conn = cp.getTransactionConnection(); try { - boolean isInitialized= InitializeAcctDimensionsInClientData.isExecuted(cp); - if (!isInitialized){ + for (InitializeAcctDimensionsInClientData client : InitializeAcctDimensionsInClientData .getClients(cp)) { InitializeAcctDimensionsInClientData.updateDimClient(conn, cp); @@ -92,10 +91,9 @@ InitializeAcctDimensionsInClientData.updateoorec(conn, cp, client.adClientId); InitializeAcctDimensionsInClientData.updateoosoo(conn, cp, client.adClientId); - InitializeAcctDimensionsInClientData.createPreference(conn, cp, client.adClientId); - } + } cp.releaseCommitConnection(conn); - } + } catch (Exception e) { cp.releaseRollbackConnection(conn); handleError(e); diff -r cbf0d0cb2164 -r 4d0c78bf59db src-util/modulescript/src/org/openbravo/modulescript/InitializeAcctDimensionsInClient_data.xsql --- a/src-util/modulescript/src/org/openbravo/modulescript/InitializeAcctDimensionsInClient_data.xsql Wed Mar 20 19:36:11 2013 +0100 +++ b/src-util/modulescript/src/org/openbravo/modulescript/InitializeAcctDimensionsInClient_data.xsql Tue Mar 19 10:38:25 2013 +0100 @@ -27,35 +27,7 @@ from dual ]]> </Sql> - </SqlMethod> - <SqlMethod name="isExecuted" type="preparedStatement" return="boolean"> - <SqlMethodComment></SqlMethodComment> - <Sql> - <![CDATA[ - SELECT count(*) as exist - FROM DUAL - WHERE EXISTS (SELECT 1 FROM ad_preference - WHERE attribute = 'DimensionDisplayConfigured') - ]]> - </Sql> - </SqlMethod> - <SqlMethod name="createPreference" type="preparedStatement" connection="true" return="rowcount"> - <SqlMethodComment></SqlMethodComment> - <Sql> - <![CDATA[ - INSERT INTO ad_preference ( - ad_preference_id, ad_client_id, ad_org_id, isactive, - createdby, created, updatedby, updated, - attribute - ) VALUES ( - get_uuid(), ?, '0', 'Y', - '0', NOW(), '0', NOW(), - 'DimensionDisplayConfigured' - ) - ]]> - </Sql> - <Parameter name="client"/> - </SqlMethod> + </SqlMethod> <SqlMethod name="updateDimClient" type="preparedStatement" connection="true" return="rowcount"> <SqlMethodComment></SqlMethodComment> <Sql> @@ -410,9 +382,11 @@ <SqlMethod name="getClients" type="preparedStatement" return="multiple"> <SqlMethodComment></SqlMethodComment> <Sql><![CDATA[ - SELECT ad_client_id - FROM ad_client - where ad_client_id <> '0' + select ad_client_id + from ad_client + where ad_Client_id not in(select ad_client_id from AD_Client_AcctDimension ) + and ad_client_id <> '0' + ]]> </Sql> </SqlMethod> ------------------------------------------------------------------------------ Everyone hates slow websites. So do we. Make your web apps faster with AppDynamics Download AppDynamics Lite for free today: http://p.sf.net/sfu/appdyn_d2d_mar _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
