|
From: <one...@us...> - 2002-11-26 08:37:28
|
Update of /cvsroot/hibernate/Hibernate/cirrus/hibernate/persister
In directory sc8-pr-cvs1:/tmp/cvs-serv3044/cirrus/hibernate/persister
Modified Files:
EntityPersister.java Loadable.java
MultiTableEntityPersister.java
Log Message:
fixed bugs in one-to-many relationships to <joined-subclasses>
Index: EntityPersister.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/persister/EntityPersister.java,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** EntityPersister.java 25 Nov 2002 10:41:59 -0000 1.43
--- EntityPersister.java 26 Nov 2002 08:37:25 -0000 1.44
***************
*** 896,899 ****
--- 896,904 ----
return buf.toString();
}
+
+ public String getConcreteClassAlias(String alias) {
+ return alias;
+ }
+
}
Index: Loadable.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/persister/Loadable.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Loadable.java 26 Nov 2002 03:35:44 -0000 1.14
--- Loadable.java 26 Nov 2002 08:37:25 -0000 1.15
***************
*** 104,107 ****
--- 104,111 ----
*/
public String outerJoinsAfterWhere(String name, boolean innerJoin);
+ /**
+ *
+ */
+ public String getConcreteClassAlias(String alias);
}
Index: MultiTableEntityPersister.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/persister/MultiTableEntityPersister.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** MultiTableEntityPersister.java 25 Nov 2002 10:00:05 -0000 1.38
--- MultiTableEntityPersister.java 26 Nov 2002 08:37:25 -0000 1.39
***************
*** 1049,1058 ****
int tab = ( (Integer) tableNumberByPropertyPath.get(property) ).intValue();
! return StringHelper.prefix( cols, name + ( (tab==0) ? "" : '_' +Integer.toString(tab) ) + '.' );
}
public String[] toColumns(String name, int i) {
int tab = subclassPropertyTableNumberClosure[i];
! return StringHelper.prefix( subclassPropertyColumnNameClosure[i], name + ( (tab==0) ? "" : '_' +Integer.toString(tab) ) + '.' );
}
--- 1049,1058 ----
int tab = ( (Integer) tableNumberByPropertyPath.get(property) ).intValue();
! return StringHelper.prefix( cols, name + ( (tab==0) ? "" : '_' + Integer.toString(tab) ) + '.' );
}
public String[] toColumns(String name, int i) {
int tab = subclassPropertyTableNumberClosure[i];
! return StringHelper.prefix( subclassPropertyColumnNameClosure[i], name + ( (tab==0) ? "" : '_' + Integer.toString(tab) ) + '.' );
}
***************
*** 1090,1093 ****
--- 1090,1098 ----
}
return buf.toString();
+ }
+
+ public String getConcreteClassAlias(String alias) {
+ int tab = tableNumbers[ tableNumbers.length-1 ];
+ return alias + ( (tab==0) ? "" : '_' +Integer.toString(tab) );
}
|