From 0f00ed4e063c8d76c54b288d443826d581abef6e Mon Sep 17 00:00:00 2001 From: Derek Hulley Date: Fri, 3 Oct 2008 16:12:52 +0000 Subject: [PATCH] Merged V2.2 to HEAD 10635: Fixed ETWOTWO-686: Oracle upgrade from pre-2.1 fails 10936: Merged V2.1 to V2.2 10279: Add shutdown script for file system receiver 10345: 10462: Fixed ETWOONE-325: RuntimeExec picks up character encoding from JVM; it can be manually overridden, too. 10469: Fix for https://issues.alfresco.com/jira/browse/ETWOONE-329 10470: Hibernate patch diff 10483: Fixed use of Java 1.6 APIs 10484: More JDK 1.6 API usage remove 10489: Use Shift-JS characterset to attempt to induce expected failure 10491: Fixed missed hibernate reference 10501: Removed failing test git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@11168 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../upgrade-0-create-missing-tables.sql | 6 +++--- source/java/org/alfresco/repo/domain/hibernate/Node.hbm.xml | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.Oracle9Dialect/upgrade-0-create-missing-tables.sql b/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.Oracle9Dialect/upgrade-0-create-missing-tables.sql index f0ac38d00a..ed46264cce 100644 --- a/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.Oracle9Dialect/upgrade-0-create-missing-tables.sql +++ b/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.Oracle9Dialect/upgrade-0-create-missing-tables.sql @@ -26,7 +26,7 @@ ALTER TABLE alf_audit_date RENAME COLUMN year TO full_year; create table avm_aspects_new ( id number(19,0) not null, - qname_id number(19,0) not null, + name varchar2(200 char) not null, primary key (id, qname_id) ); -- (optional) @@ -57,14 +57,14 @@ ALTER TABLE alf_audit_date RENAME COLUMN year TO full_year; double_value double precision, string_value varchar2(1024 char), serializable_value long raw, - qname_id number(19,0) not null, + qname varchar2(200 char) not null, primary key (node_id, qname_id) ); -- (optional) create table avm_store_properties ( id number(19,0) not null, avm_store_id number(19,0), - qname_id number(19,0) not null, + qname varchar2(200 char) not null, actual_type_n number(10,0) not null, persisted_type_n number(10,0) not null, multi_valued number(1,0) not null, diff --git a/source/java/org/alfresco/repo/domain/hibernate/Node.hbm.xml b/source/java/org/alfresco/repo/domain/hibernate/Node.hbm.xml index 9fa2a14a65..c23ce075bc 100644 --- a/source/java/org/alfresco/repo/domain/hibernate/Node.hbm.xml +++ b/source/java/org/alfresco/repo/domain/hibernate/Node.hbm.xml @@ -656,9 +656,10 @@ node from org.alfresco.repo.domain.hibernate.NodeImpl as node + join node.properties as props where - node.properties.serializableValue is not null and - node.properties.multiValued = false + props.serializableValue is not null and + props.multiValued = false