details: /erp/devel/main/rev/372a01f54d05
changeset: 7818:372a01f54d05
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Mon Jul 05 12:45:27 2010 +0200
summary: fixed issue 13885: process "install updates" does not work
The issue was reproduceble when:
-In an instance with several modules, scan for updates is executed
and there are updates for different modules.
-One of these updates is installed for a module which requires a
complete rebuild (core or a template)
The problem is that after rebuilding the system ad_module.update_ver_id
column is set to null.
The solution includes:
-Add ad_module.update_ver_id column to AD dataset column exclussion, so
when doing update.database the original value is preserved.
-When doing scan for updates again, repopulate its value.
details: /erp/devel/main/rev/6f09e1d5b161
changeset: 7819:6f09e1d5b161
user: Iván Perdomo <ivan.perdomo <at> openbravo.com>
date: Mon Jul 05 13:15:25 2010 +0200
summary: Fixes issue 13667: Code cleanup. Removed unused methods, class
commented
details: /erp/devel/main/rev/07f43ff3dea5
changeset: 7820:07f43ff3dea5
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Mon Jul 05 18:41:44 2010 +0000
summary: CI: promote changesets from pi to main
details: /erp/devel/main/rev/a11139370c90
changeset: 7821:a11139370c90
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Mon Jul 05 18:41:45 2010 +0000
summary: CI: update AD_MODULE - Core version and label
diffstat:
src-db/database/sourcedata/AD_DATASET_COLUMN.xml
| 11 +++++++++
src-db/database/sourcedata/AD_MODULE.xml
| 4 +-
src-util/modulescript/build/classes/org/openbravo/modulescript/HBFix.class
| 0
src-util/modulescript/build/classes/org/openbravo/modulescript/HBFixData.class
| 0
src-util/modulescript/src/org/openbravo/modulescript/HBFix.java
| 6 +++++
src-util/modulescript/src/org/openbravo/modulescript/HBFix_data.xsql
| 12 ----------
src/org/openbravo/erpCommon/modules/ImportModule.java
| 3 +-
src/org/openbravo/erpCommon/modules/ImportModule_data.xsql
| 2 +
8 files changed, 23 insertions(+), 15 deletions(-)
diffs (111 lines):
diff -r 12bae6920c74 -r a11139370c90
src-db/database/sourcedata/AD_DATASET_COLUMN.xml
--- a/src-db/database/sourcedata/AD_DATASET_COLUMN.xml Sat Jul 03 00:12:10
2010 +0200
+++ b/src-db/database/sourcedata/AD_DATASET_COLUMN.xml Mon Jul 05 18:41:45
2010 +0000
@@ -165,6 +165,17 @@
<!--A454B3DF927D414BB779F310A45CD83C-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--A454B3DF927D414BB779F310A45CD83C--></AD_DATASET_COLUMN>
+<!--A5C5C9527EE34F53813AFEC2730C21C3--><AD_DATASET_COLUMN>
+<!--A5C5C9527EE34F53813AFEC2730C21C3-->
<AD_DATASET_COLUMN_ID><![CDATA[A5C5C9527EE34F53813AFEC2730C21C3]]></AD_DATASET_COLUMN_ID>
+<!--A5C5C9527EE34F53813AFEC2730C21C3-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--A5C5C9527EE34F53813AFEC2730C21C3--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--A5C5C9527EE34F53813AFEC2730C21C3--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--A5C5C9527EE34F53813AFEC2730C21C3-->
<AD_DATASET_TABLE_ID><![CDATA[7AF5DEC896E011DDA8AC001B388C61A4]]></AD_DATASET_TABLE_ID>
+<!--A5C5C9527EE34F53813AFEC2730C21C3-->
<AD_COLUMN_ID><![CDATA[5B04E3CC29ED3D9EE040007F01007E8D]]></AD_COLUMN_ID>
+<!--A5C5C9527EE34F53813AFEC2730C21C3--> <ISEXCLUDED><![CDATA[Y]]></ISEXCLUDED>
+<!--A5C5C9527EE34F53813AFEC2730C21C3-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--A5C5C9527EE34F53813AFEC2730C21C3--></AD_DATASET_COLUMN>
+
<!--D42FA26F3CA444278494E2212D2B8B23--><AD_DATASET_COLUMN>
<!--D42FA26F3CA444278494E2212D2B8B23-->
<AD_DATASET_COLUMN_ID><![CDATA[D42FA26F3CA444278494E2212D2B8B23]]></AD_DATASET_COLUMN_ID>
<!--D42FA26F3CA444278494E2212D2B8B23-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 12bae6920c74 -r a11139370c90 src-db/database/sourcedata/AD_MODULE.xml
--- a/src-db/database/sourcedata/AD_MODULE.xml Sat Jul 03 00:12:10 2010 +0200
+++ b/src-db/database/sourcedata/AD_MODULE.xml Mon Jul 05 18:41:45 2010 +0000
@@ -6,7 +6,7 @@
<!--0--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--0--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--0--> <NAME><![CDATA[core]]></NAME>
-<!--0--> <VERSION><![CDATA[2.50.17732]]></VERSION>
+<!--0--> <VERSION><![CDATA[2.50.17820]]></VERSION>
<!--0--> <DESCRIPTION><![CDATA[Core module is the base one]]></DESCRIPTION>
<!--0--> <HELP><![CDATA[Core module is the base one, all developments in core
are included as part of the standard Openbravo ERP.]]></HELP>
<!--0--> <URL><![CDATA[www.openbravo.com]]></URL>
@@ -21,7 +21,7 @@
<!--0--> <HASCHARTOFACCOUNTS><![CDATA[N]]></HASCHARTOFACCOUNTS>
<!--0--> <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
<!--0--> <HASREFERENCEDATA><![CDATA[Y]]></HASREFERENCEDATA>
-<!--0--> <VERSION_LABEL><![CDATA[dev]]></VERSION_LABEL>
+<!--0--> <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
<!--0--> <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
<!--0--></AD_MODULE>
diff -r 12bae6920c74 -r a11139370c90
src-util/modulescript/build/classes/org/openbravo/modulescript/HBFix.class
Binary file
src-util/modulescript/build/classes/org/openbravo/modulescript/HBFix.class has
changed
diff -r 12bae6920c74 -r a11139370c90
src-util/modulescript/build/classes/org/openbravo/modulescript/HBFixData.class
Binary file
src-util/modulescript/build/classes/org/openbravo/modulescript/HBFixData.class
has changed
diff -r 12bae6920c74 -r a11139370c90
src-util/modulescript/src/org/openbravo/modulescript/HBFix.java
--- a/src-util/modulescript/src/org/openbravo/modulescript/HBFix.java Sat Jul
03 00:12:10 2010 +0200
+++ b/src-util/modulescript/src/org/openbravo/modulescript/HBFix.java Mon Jul
05 18:41:45 2010 +0000
@@ -20,6 +20,12 @@
import org.openbravo.database.ConnectionProvider;
+/**
+ * ModuleScript that fixes the Process Request for Heartbeat. In some cases
the process request is
+ * in status "misfired" (MIS) and the so it won't be schedule by OBScheduler.
This scripts fixes the
+ * data for instances that have Hearbeat enabled.
+ *
+ */
public class HBFix extends ModuleScript {
private static String HB_PROCESS_ID = "1005800000";
diff -r 12bae6920c74 -r a11139370c90
src-util/modulescript/src/org/openbravo/modulescript/HBFix_data.xsql
--- a/src-util/modulescript/src/org/openbravo/modulescript/HBFix_data.xsql
Sat Jul 03 00:12:10 2010 +0200
+++ b/src-util/modulescript/src/org/openbravo/modulescript/HBFix_data.xsql
Mon Jul 05 18:41:45 2010 +0000
@@ -74,18 +74,6 @@
<Parameter name="adProcessRequestId" />
<Parameter name="adProcessId" />
</SqlMethod>
- <SqlMethod name="updateNotActive" type="preparedStatement"
return="rowCount">
- <Sql>
- UPDATE ad_system_info
- SET isheartbeatactive = 'N'
- </Sql>
- </SqlMethod>
- <SqlMethod name="selectUserId" type="preparedStatement" return="string">
- <Sql>
- SELECT updatedby
- FROM ad_system_info
- </Sql>
- </SqlMethod>
<SqlMethod name="insert" type="preparedStatement" return="rowCount">
<Sql>
<![CDATA[
diff -r 12bae6920c74 -r a11139370c90
src/org/openbravo/erpCommon/modules/ImportModule.java
--- a/src/org/openbravo/erpCommon/modules/ImportModule.java Sat Jul 03
00:12:10 2010 +0200
+++ b/src/org/openbravo/erpCommon/modules/ImportModule.java Mon Jul 05
18:41:45 2010 +0000
@@ -1297,7 +1297,8 @@
if (updates != null && updates.length > 0) {
for (int i = 0; i < updates.length; i++) {
- if (!ImportModuleData.existsVersion(conn,
updates[i].getVersionNo())) {
+ if (!ImportModuleData.existsVersion(conn, updates[i].getVersionNo(),
updates[i]
+ .getModuleVersionID())) {
ImportModuleData.updateNewVersionAvailable(conn,
updates[i].getVersionNo(), updates[i]
.getModuleVersionID(), updates[i].getModuleID());
ImportModuleData.insertLog(conn, user, updates[i].getModuleID(),
updates[i]
diff -r 12bae6920c74 -r a11139370c90
src/org/openbravo/erpCommon/modules/ImportModule_data.xsql
--- a/src/org/openbravo/erpCommon/modules/ImportModule_data.xsql Sat Jul
03 00:12:10 2010 +0200
+++ b/src/org/openbravo/erpCommon/modules/ImportModule_data.xsql Mon Jul
05 18:41:45 2010 +0000
@@ -51,8 +51,10 @@
SELECT COUNT(*) AS TOTAL
FROM AD_MODULE
WHERE COALESCE(UPDATE_AVAILABLE,'.') = ?
+ AND UPDATE_VER_ID = ?
</Sql>
<Parameter name="moduleVersionNo"/>
+ <Parameter name="updateVerID"/>
</SqlMethod>
<SqlMethod name="moduleInstalled" type="preparedStatement" return="boolean">
------------------------------------------------------------------------------
This SF.net email is sponsored by Sprint
What will you do first with EVO, the first 4G phone?
Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first
_______________________________________________
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
