Author: aadamchik
Date: Sun Jun 5 14:18:58 2011
New Revision: 1132414
URL: http://svn.apache.org/viewvc?rev=1132414&view=rev
Log:
CAY-1578 unicode character types on MS SQL 2008 server aren't recognized.
patch by Andreas Kiefer
Modified:
cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/dba/sqlserver/types.xml
Modified: cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt?rev=1132414&r1=1132413&r2=1132414&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt Sun Jun 5
14:18:58 2011
@@ -138,6 +138,7 @@ CAY-1506 Reserverd words mapping in WHER
CAY-1518 cgen: duplicate callback methods
CAY-1557 Vertical inheritance is broken for subclasses with more than one
flattened attribute
CAY-1567 BaseQueryMetadata.setPrefetches() causes a shared lock
+CAY-1578 unicode character types on MS SQL 2008 server aren't recognized.
----------------------------------
Release: 3.0.1
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/dba/sqlserver/types.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/dba/sqlserver/types.xml?rev=1132414&r1=1132413&r2=1132414&view=diff
==============================================================================
---
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/dba/sqlserver/types.xml
(original)
+++
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/dba/sqlserver/types.xml
Sun Jun 5 14:18:58 2011
@@ -40,9 +40,11 @@
</jdbc-type>
<jdbc-type name="CHAR">
<db-type name="char"/>
+ <db-type name="nchar"/>
</jdbc-type>
<jdbc-type name="CLOB">
<db-type name="text"/>
+ <db-type name="ntext"/>
</jdbc-type>
<jdbc-type name="DATALINK"/>
<jdbc-type name="DATE">
@@ -66,6 +68,7 @@
</jdbc-type>
<jdbc-type name="LONGVARCHAR">
<db-type name="text"/>
+ <db-type name="ntext"/>
</jdbc-type>
<jdbc-type name="NUMERIC">
<db-type name="numeric"/>
@@ -93,5 +96,6 @@
</jdbc-type>
<jdbc-type name="VARCHAR">
<db-type name="varchar"/>
+ <db-type name="nvarchar"/>
</jdbc-type>
</types>