Merged V4.0-BUG-FIX to HEAD

36915: ALF-12874: Schema reference files are out of date
   - Difference: expected primary key .alf_tenant.PRIMARY.columnNames[0]="id", but was .alf_tenant.PRIMARY.columnNames[0]="tenant_domain"
   - fixed the rename of alf_tenant PK "id" -> "tenant_domain" (for all 5 DB types)
   36950: Merged V4.0 to V4.0-BUG-FIX (RECORD ONLY)
      36917: Merged V4.0-BUG-FIX to V4.0
         36915: ALF-12874: Schema reference files are out of date
         - Difference: expected primary key .alf_tenant.PRIMARY.columnNames[0]="id", but was .alf_tenant.PRIMARY.columnNames[0]="tenant_domain"
         - fixed the rename of alf_tenant PK "id" -> "tenant_domain" (for all 5 DB types)
   36951: Merged V4.0 (4.0.2) to V4.0-BUG-FIX (4.0.3)
      36949: ALF-13745: Merged V3.4-BUG-FIX (3.4.10) to V4.0 (4.0.2)
         36948: ALF-13667 Additional OpenOffice mimetypes to be added to the mime-type maps
            - On reflection the maxSourceSizeKBytes limits for power point files were too small. Did not take into account
              images in the files rather than just text.
      36923: Merged DEV to V4.0
         36600: ALF-14129 : Failed to do upgrade from 3.4.8 to 4.0.2
            Statements from ActivitiTaskIdIndexes.sql script were marked as optional.
      36922: Merged DEV to V4.0
         36729: ALF-14129 : Failed to do upgrade from 3.4.8 to 4.0.2
            Outdated Schema-Reference-ACT.xml were updated for all dialects and regression after ALF-12874 was fixed.
   36953: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.0-BUG-FIX
      36905: ALF-14178 Share - Path issue with number of character limitation. Updated qname to max DB limit of 255 chars.
   36954: ALF-14209 SOLR - does not support query for all stores
   - it is now possible for SOLR to track any store and Alfresco to execute queries against that store (no federation or sharding yet ....)
   36965: Extra debugging after review of ALF-14238
   37032: ALF-12723: Missing mergeinfo for r34655
   37033: Merged V4.0 to V4.0-BUG-FIX
      36999: ALF-5285: Reverse merging r26226, as it causes regressions ALF-14202, ALF-14242 and ALF-14245
      37001: ALF-14169: Alfresco startup fails if XAM module was deployed
         Jan approved fix
      37005: ALF-14169: Fix unit test compilation
      37020: Resolved some "Patch description is not available" warnings in 4.0.2
      37022: ALF-12874: Schema reference files are out of date
      - Fixed up PostgreSQL diffs
      37027: ALF-12874: Schema reference files are out of date
      - DB2 fixes by Dmitry


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@37036 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Dave Ward
2012-05-25 17:19:13 +00:00
parent 18ad785d32
commit ff2ae89c08
22 changed files with 366 additions and 130 deletions

View File

@@ -2455,7 +2455,7 @@
</columns>
<primarykey name="PRIMARY">
<columnnames>
<columnname order="1">id</columnname>
<columnname order="1">tenant_domain</columnname>
</columnnames>
</primarykey>
<foreignkeys/>

View File

@@ -377,6 +377,11 @@
<columnname>proc_inst_id_</columnname>
</columnnames>
</index>
<index name="act_idx_hi_detail_task_id" unique="false">
<columnnames>
<columnname>task_id_</columnname>
</columnnames>
</index>
<index name="act_idx_hi_detail_time" unique="false">
<columnnames>
<columnname>time_</columnname>
@@ -449,7 +454,7 @@
</primarykey>
<foreignkeys/>
<indexes>
<index name="act_hi_procinst_proc_def_id__key" unique="true">
<index name="act_hi_procinst_proc_def_id__business_key__key" unique="true">
<columnnames>
<columnname>proc_def_id_</columnname>
<columnname>business_key_</columnname>
@@ -898,7 +903,7 @@
</foreignkey>
</foreignkeys>
<indexes>
<index name="act_ru_execution_proc_def_id__key" unique="true">
<index name="act_ru_execution_proc_def_id__business_key__key" unique="true">
<columnnames>
<columnname>proc_def_id_</columnname>
<columnname>business_key_</columnname>
@@ -1311,6 +1316,11 @@
<columnname>proc_inst_id_</columnname>
</columnnames>
</index>
<index name="act_idx_variable_task_id" unique="false">
<columnnames>
<columnname>task_id_</columnname>
</columnnames>
</index>
</indexes>
</table>
</objects>

View File

@@ -2470,7 +2470,7 @@
<autoincrement>false</autoincrement>
</column>
<column name="enabled" order="3">
<type>bit</type>
<type>bool</type>
<nullable>false</nullable>
<autoincrement>false</autoincrement>
</column>
@@ -2490,9 +2490,9 @@
<autoincrement>false</autoincrement>
</column>
</columns>
<primarykey name="PRIMARY">
<primarykey name="alf_tenant_pkey">
<columnnames>
<columnname order="1">id</columnname>
<columnname order="1">tenant_domain</columnname>
</columnnames>
</primarykey>
<foreignkeys/>

View File

@@ -719,7 +719,7 @@
</foreignkey>
</foreignkeys>
<indexes>
<index name="avm_version_roots_version_id_key" unique="true">
<index name="avm_version_roots_version_id_avm_store_id_key" unique="true">
<columnnames>
<columnname>version_id</columnname>
<columnname>avm_store_id</columnname>

View File

@@ -8,10 +8,10 @@
--
-- Add index to runtime variable table
create index ACT_IDX_VARIABLE_TASK_ID on ACT_RU_VARIABLE(TASK_ID_);
create index ACT_IDX_VARIABLE_TASK_ID on ACT_RU_VARIABLE(TASK_ID_); --(optional)
-- Add index to history variable table
create index ACT_IDX_HI_DETAIL_TASK_ID on ACT_HI_DETAIL(TASK_ID_);
create index ACT_IDX_HI_DETAIL_TASK_ID on ACT_HI_DETAIL(TASK_ID_); --(optional)
--
-- Record script finish

View File

@@ -1,26 +0,0 @@
--
-- Title: Add missing Activiti indexes on task-id for runtime and history variables.
-- Database: MySQL
-- Since: V4.0 Schema 5029
-- Author: Frederik Heremans
--
-- Please contact support@alfresco.com if you need assistance with the upgrade.
--
-- Add index to runtime variable table
create index ACT_IDX_VARIABLE_TASK_ID on ACT_RU_VARIABLE(TASK_ID_);
-- Add index to history variable table
create index ACT_IDX_HI_DETAIL_TASK_ID on ACT_HI_DETAIL(TASK_ID_);
--
-- Record script finish
--
DELETE FROM alf_applied_patch WHERE id = 'patch.db-V4.0-Activiti-task-id-indexes';
INSERT INTO alf_applied_patch
(id, description, fixes_from_schema, fixes_to_schema, applied_to_schema, target_schema, applied_on_date, applied_to_server, was_executed, succeeded, report)
VALUES
(
'patch.db-V4.0-Activiti-task-id-indexes', 'Manually executed script upgrade V4.0: Add missing Activiti indexes on task-id',
0, 6003, -1, 6004, null, 'UNKNOWN', ${TRUE}, ${TRUE}, 'Script completed'
);

View File

@@ -1,26 +0,0 @@
--
-- Title: Add missing Activiti indexes on task-id for runtime and history variables.
-- Database: PostgreSQL
-- Since: V4.0 Schema 5029
-- Author: Frederik Heremans
--
-- Please contact support@alfresco.com if you need assistance with the upgrade.
--
-- Add index to runtime variable table
create index ACT_IDX_VARIABLE_TASK_ID on ACT_RU_VARIABLE(TASK_ID_); --(optional)
-- Add index to history variable table
create index ACT_IDX_HI_DETAIL_TASK_ID on ACT_HI_DETAIL(TASK_ID_); --(optional)
--
-- Record script finish
--
DELETE FROM alf_applied_patch WHERE id = 'patch.db-V4.0-Activiti-task-id-indexes';
INSERT INTO alf_applied_patch
(id, description, fixes_from_schema, fixes_to_schema, applied_to_schema, target_schema, applied_on_date, applied_to_server, was_executed, succeeded, report)
VALUES
(
'patch.db-V4.0-Activiti-task-id-indexes', 'Manually executed script upgrade V4.0: Add missing Activiti indexes on task-id',
0, 6003, -1, 6004, null, 'UNKNOWN', ${TRUE}, ${TRUE}, 'Script completed'
);