|
From: <one...@us...> - 2002-10-31 14:00:31
|
Update of /cvsroot/hibernate/Hibernate/cirrus/hibernate/impl
In directory usw-pr-cvs1:/tmp/cvs-serv519/cirrus/hibernate/impl
Modified Files:
CollectionPersister.java
Log Message:
support for SQL quoted identifiers
Index: CollectionPersister.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/impl/CollectionPersister.java,v
retrieving revision 1.82
retrieving revision 1.83
diff -C2 -d -r1.82 -r1.83
*** CollectionPersister.java 22 Oct 2002 14:05:09 -0000 1.82
--- CollectionPersister.java 31 Oct 2002 14:00:26 -0000 1.83
***************
*** 54,58 ****
--- 54,60 ----
private transient final String[] keyColumnNames;
private transient final String[] indexColumnNames;
+ private transient final String[] unquotedIndexColumnNames;
private transient final String[] elementColumnNames;
+ private transient final String[] unquotedElementColumnNames;
private transient final String[] rowSelectColumnNames;
private transient final Type rowSelectType;
***************
*** 145,151 ****
elementColumnNames[i] = col.getName();
i++;
! }
!
}
if ( hasIndex = collection.isIndexed() ) {
--- 147,154 ----
elementColumnNames[i] = col.getName();
i++;
! }
}
+ unquotedElementColumnNames = StringHelper.unQuote(elementColumnNames);
+
if ( hasIndex = collection.isIndexed() ) {
***************
*** 162,169 ****
--- 165,174 ----
rowSelectColumnNames = indexColumnNames;
rowSelectType = indexType;
+ unquotedIndexColumnNames = StringHelper.unQuote(indexColumnNames);
}
else {
indexType = null;
indexColumnNames = null;
+ unquotedIndexColumnNames = null;
rowSelectColumnNames = elementColumnNames;
rowSelectType = elementType;
***************
*** 300,308 ****
public Object readElement(ResultSet rs, SessionImplementor session) throws HibernateException, SQLException {
! Object element = getElementType().nullSafeGet(rs, elementColumnNames, session, null);
return element;
}
public Object readIndex(ResultSet rs, SessionImplementor session) throws HibernateException, SQLException {
! return getIndexType().nullSafeGet(rs, indexColumnNames, session, null);
}
--- 305,313 ----
public Object readElement(ResultSet rs, SessionImplementor session) throws HibernateException, SQLException {
! Object element = getElementType().nullSafeGet(rs, unquotedElementColumnNames, session, null);
return element;
}
public Object readIndex(ResultSet rs, SessionImplementor session) throws HibernateException, SQLException {
! return getIndexType().nullSafeGet(rs, unquotedIndexColumnNames, session, null);
}
|