Index: src/main/org/castor/jdo/engine/SQLTypeInfos.java
===================================================================
RCS file: /scm/castor/castor/src/main/org/castor/jdo/engine/SQLTypeInfos.java,v
retrieving revision 1.1
diff -u -r1.1 SQLTypeInfos.java
--- src/main/org/castor/jdo/engine/SQLTypeInfos.java	25 Nov 2005 23:37:03 -0000	1.1
+++ src/main/org/castor/jdo/engine/SQLTypeInfos.java	17 Dec 2005 21:30:16 -0000
@@ -19,9 +19,12 @@
 import java.io.InputStream;
 import java.sql.Blob;
 import java.sql.Clob;
+import java.sql.Date;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.sql.Time;
+import java.sql.Timestamp;
 import java.sql.Types;
 import java.util.Calendar;
 import java.util.GregorianCalendar;
@@ -281,6 +284,15 @@
                 // by Castor to java.io.InputStream and java.io.Reader, respectively,
                 // while JDBC driver expects java.sql.Blob and java.sql.Clob.
                 switch (sqlType) {
+                case Types.TIME:
+                    stmt.setTime(index, (Time) value, getCalendar());
+                    break;
+                case Types.DATE:
+                    stmt.setDate(index, (Date) value, getCalendar());
+                    break;
+                case Types.TIMESTAMP:
+                    stmt.setTimestamp(index, (Timestamp) value, getCalendar());
+                    break;
                 case Types.FLOAT:
                 case Types.DOUBLE:
                     stmt.setDouble(index, ((Double) value).doubleValue());
Index: src/main/org/exolab/castor/jdo/engine/SQLEngine.java
===================================================================
RCS file: /scm/castor/castor/src/main/org/exolab/castor/jdo/engine/SQLEngine.java,v
retrieving revision 1.42
diff -u -r1.42 SQLEngine.java
--- src/main/org/exolab/castor/jdo/engine/SQLEngine.java	1 Dec 2005 20:18:53 -0000	1.42
+++ src/main/org/exolab/castor/jdo/engine/SQLEngine.java	17 Dec 2005 21:30:19 -0000
@@ -506,28 +506,40 @@
     }
 
     private Object idToSQL(int index, Object object) {
-        if (object == null || _ids[index].convertFrom == null)
+        if (object == null || _ids[index].convertFrom == null) {
             return object;
+        }
         return _ids[index].convertFrom.convert(object, _ids[index].convertParam);
     }
 
+    /**
+     * Converts the field value given to the corresponding SQL type as specified
+     * in the field mapping.
+     * @param field Number of the field
+     * @param column Number of the field column 
+     * @param object Object instance to be converted
+     * @return The converted objefct instance
+     */
     private Object toSQL(int field, int column, Object object) {
         ColumnInfo col = _fields[field].columns[column];
-        if (object == null || col.convertFrom == null)
+        if (object == null || col.convertFrom == null) {
             return object;
+        }
         return col.convertFrom.convert(object, col.convertParam);
     }
 
     private Object idToJava(int index, Object object) {
-        if (object == null || _ids[index].convertTo == null)
+        if (object == null || _ids[index].convertTo == null) {
             return object;
+        }
         return _ids[index].convertTo.convert(object, _ids[index].convertParam);
     }
 
     private Object toJava(int field, int column, Object object) {
         ColumnInfo col = _fields[field].columns[column];
-        if (object == null || col.convertTo == null)
+        if (object == null || col.convertTo == null) {
             return object;
+        }
         return col.convertTo.convert(object, col.convertParam);
     }
 
@@ -1982,7 +1994,7 @@
         final String  name;
 
         /**
-         * SQL type of teh coplumn
+         * SQL type of the column
          */
         final int sqlType;
 
@@ -2001,8 +2013,16 @@
          */
         final String convertParam;
 
-        ColumnInfo( String name, int type, TypeConvertor convertTo,
-                TypeConvertor convertFrom, String convertParam ) {
+        /**
+         * Creates an instance of ColumnInfo
+         * @param name Name of the column
+         * @param type SQL type fo the column
+         * @param convertTo Type convertor used for converting to SQL type
+         * @param convertFrom Type convertor used for converting from SQL type
+         * @param convertParam Type conversion parameter
+         */
+        ColumnInfo(String name, int type, TypeConvertor convertTo,
+                TypeConvertor convertFrom, String convertParam) {
             this.name = name;
             this.sqlType = type;
             this.convertTo = convertTo;
@@ -2010,35 +2030,40 @@
             this.convertParam = convertParam;
         }
 
-		/* (non-Javadoc)
+		/**
+         * @inheritDoc
 		 * @see org.exolab.castor.persist.spi.Persistence.ColumnInfo#getName()
 		 */
 		public String getName() {
 			return name;
 		}
 
-		/* (non-Javadoc)
+		/**
+         * @inheritDoc
 		 * @see org.exolab.castor.persist.spi.Persistence.ColumnInfo#getSqlType()
 		 */
 		public int getSqlType() {
 			return sqlType;
 		}
 
-		/* (non-Javadoc)
+		/**
+         * @inheritDoc
 		 * @see org.exolab.castor.persist.spi.Persistence.ColumnInfo#getConvertTo()
 		 */
 		public TypeConvertor getConvertTo() {
 			return convertTo;
 		}
 
-		/* (non-Javadoc)
+		/**
+         * @inheritDoc
 		 * @see org.exolab.castor.persist.spi.Persistence.ColumnInfo#getConvertFrom()
 		 */
 		public TypeConvertor getConvertFrom() {
 			return convertFrom;
 		}
 
-		/* (non-Javadoc)
+		/**
+         * @inheritDoc
 		 * @see org.exolab.castor.persist.spi.Persistence.ColumnInfo#getConvertParam()
 		 */
 		public String getConvertParam() {
Index: src/tests/jdo/mysql.xml
===================================================================
RCS file: /scm/castor/castor/src/tests/jdo/mysql.xml,v
retrieving revision 1.18
diff -u -r1.18 mysql.xml
--- src/tests/jdo/mysql.xml	6 Dec 2005 22:25:13 -0000	1.18
+++ src/tests/jdo/mysql.xml	17 Dec 2005 21:30:20 -0000
@@ -4,9 +4,15 @@
 
 <jdo-conf>
     <database name="mysql" engine="mysql" >
+<<<<<<< mysql.xml
+        <driver url="jdbc:mysql://localhost:3306/test1276" class-name="com.mysql.jdbc.Driver">
+            <param name="user" value="root" />
+            <param name="password" value="uLive2C" />
+=======
         <driver url="jdbc:mysql://localhost:3306/test" class-name="com.mysql.jdbc.Driver">
             <param name="user" value="test" />
             <param name="password" value="test" />
+>>>>>>> 1.18
         </driver>
 <!--
         <data-source class-name="org.apache.commons.dbcp.BasicDataSource">
Index: src/tests/xml/MasterTestSuite/introspection/ByteArrays/Foo.class
===================================================================
RCS file: src/tests/xml/MasterTestSuite/introspection/ByteArrays/Foo.class
diff -N src/tests/xml/MasterTestSuite/introspection/ByteArrays/Foo.class
Binary files /tmp/cvsiXO9sd and /dev/null differ
Index: src/tests/xml/MasterTestSuite/introspection/ComplexType-DirectAccess/Builder.class
===================================================================
RCS file: src/tests/xml/MasterTestSuite/introspection/ComplexType-DirectAccess/Builder.class
diff -N src/tests/xml/MasterTestSuite/introspection/ComplexType-DirectAccess/Builder.class
Binary files /tmp/cvsCERiv7 and /dev/null differ
Index: src/tests/xml/MasterTestSuite/introspection/ComplexType-DirectAccess/Data.class
===================================================================
RCS file: src/tests/xml/MasterTestSuite/introspection/ComplexType-DirectAccess/Data.class
diff -N src/tests/xml/MasterTestSuite/introspection/ComplexType-DirectAccess/Data.class
Binary files /tmp/cvss0Byx1 and /dev/null differ
Index: src/tests/xml/MasterTestSuite/introspection/ComplexType-DirectAccess/Root.class
===================================================================
RCS file: src/tests/xml/MasterTestSuite/introspection/ComplexType-DirectAccess/Root.class
diff -N src/tests/xml/MasterTestSuite/introspection/ComplexType-DirectAccess/Root.class
Binary files /tmp/cvsuWzUzV and /dev/null differ
Index: src/tests/xml/MasterTestSuite/introspection/SimpleType-DirectAccess/Builder.class
===================================================================
RCS file: src/tests/xml/MasterTestSuite/introspection/SimpleType-DirectAccess/Builder.class
diff -N src/tests/xml/MasterTestSuite/introspection/SimpleType-DirectAccess/Builder.class
Binary files /tmp/cvsufhwCP and /dev/null differ
Index: src/tests/xml/MasterTestSuite/introspection/SimpleType-DirectAccess/Root.class
===================================================================
RCS file: src/tests/xml/MasterTestSuite/introspection/SimpleType-DirectAccess/Root.class
diff -N src/tests/xml/MasterTestSuite/introspection/SimpleType-DirectAccess/Root.class
Binary files /tmp/cvsq4BeFJ and /dev/null differ
Index: src/tests/xml/MasterTestSuite/mapping/ByteArrays/Foo.class
===================================================================
RCS file: src/tests/xml/MasterTestSuite/mapping/ByteArrays/Foo.class
diff -N src/tests/xml/MasterTestSuite/mapping/ByteArrays/Foo.class
Binary files /tmp/cvsa5ckID and /dev/null differ
Index: src/tests/xml/MasterTestSuite/mapping/Class_inheritance/A.class
===================================================================
RCS file: src/tests/xml/MasterTestSuite/mapping/Class_inheritance/A.class
diff -N src/tests/xml/MasterTestSuite/mapping/Class_inheritance/A.class
Binary files /tmp/cvsWG3DLx and /dev/null differ
Index: src/tests/xml/MasterTestSuite/mapping/Class_inheritance/B.class
===================================================================
RCS file: src/tests/xml/MasterTestSuite/mapping/Class_inheritance/B.class
diff -N src/tests/xml/MasterTestSuite/mapping/Class_inheritance/B.class
Binary files /tmp/cvscey4Or and /dev/null differ
Index: src/tests/xml/MasterTestSuite/mapping/Class_inheritance/Builder.class
===================================================================
RCS file: src/tests/xml/MasterTestSuite/mapping/Class_inheritance/Builder.class
diff -N src/tests/xml/MasterTestSuite/mapping/Class_inheritance/Builder.class
Binary files /tmp/cvsCobBSl and /dev/null differ
Index: src/tests/xml/MasterTestSuite/mapping/Get-Method/Get_Builder.class
===================================================================
RCS file: src/tests/xml/MasterTestSuite/mapping/Get-Method/Get_Builder.class
diff -N src/tests/xml/MasterTestSuite/mapping/Get-Method/Get_Builder.class
Binary files /tmp/cvsCZzoWf and /dev/null differ
Index: src/tests/xml/MasterTestSuite/mapping/Get-Method/Get_Root.class
===================================================================
RCS file: src/tests/xml/MasterTestSuite/mapping/Get-Method/Get_Root.class
diff -N src/tests/xml/MasterTestSuite/mapping/Get-Method/Get_Root.class
Binary files /tmp/cvsewzi09 and /dev/null differ
Index: src/tests/xml/MasterTestSuite/mapping/Get-Method/Set_Root.class
===================================================================
RCS file: src/tests/xml/MasterTestSuite/mapping/Get-Method/Set_Root.class
diff -N src/tests/xml/MasterTestSuite/mapping/Get-Method/Set_Root.class
Binary files /tmp/cvs8hQi43 and /dev/null differ
Index: src/tests/xml/MasterTestSuite/mapping/Include/A.class
===================================================================
RCS file: src/tests/xml/MasterTestSuite/mapping/Include/A.class
diff -N src/tests/xml/MasterTestSuite/mapping/Include/A.class
Binary files /tmp/cvsY5sC8X and /dev/null differ
Index: src/tests/xml/MasterTestSuite/mapping/Include/B.class
===================================================================
RCS file: src/tests/xml/MasterTestSuite/mapping/Include/B.class
diff -N src/tests/xml/MasterTestSuite/mapping/Include/B.class
Binary files /tmp/cvsAUF2cS and /dev/null differ
Index: src/tests/xml/MasterTestSuite/mapping/Include/Builder.class
===================================================================
RCS file: src/tests/xml/MasterTestSuite/mapping/Include/Builder.class
diff -N src/tests/xml/MasterTestSuite/mapping/Include/Builder.class
Binary files /tmp/cvsmw6yhM and /dev/null differ
Index: src/tests/xml/MasterTestSuite/mapping/Include/C.class
===================================================================
RCS file: src/tests/xml/MasterTestSuite/mapping/Include/C.class
diff -N src/tests/xml/MasterTestSuite/mapping/Include/C.class
Binary files /tmp/cvs4HObmG and /dev/null differ
Index: src/tests/xml/MasterTestSuite/mapping/NCName/NCName_Root.class
===================================================================
RCS file: src/tests/xml/MasterTestSuite/mapping/NCName/NCName_Root.class
diff -N src/tests/xml/MasterTestSuite/mapping/NCName/NCName_Root.class
Binary files /tmp/cvsW6EJrA and /dev/null differ
Index: src/tests/xml/MasterTestSuite/mapping/QNameSupport/QName_Builder.class
===================================================================
RCS file: src/tests/xml/MasterTestSuite/mapping/QNameSupport/QName_Builder.class
diff -N src/tests/xml/MasterTestSuite/mapping/QNameSupport/QName_Builder.class
Binary files /tmp/cvsWheCxu and /dev/null differ
Index: src/tests/xml/MasterTestSuite/mapping/QNameSupport/QName_Root.class
===================================================================
RCS file: src/tests/xml/MasterTestSuite/mapping/QNameSupport/QName_Root.class
diff -N src/tests/xml/MasterTestSuite/mapping/QNameSupport/QName_Root.class
Binary files /tmp/cvseCkBDo and /dev/null differ
Index: src/tests/xml/MasterTestSuite/mapping/SetMethod/Set_Root.class
===================================================================
RCS file: src/tests/xml/MasterTestSuite/mapping/SetMethod/Set_Root.class
diff -N src/tests/xml/MasterTestSuite/mapping/SetMethod/Set_Root.class
Binary files /tmp/cvs4R5OJi and /dev/null differ
Index: src/tests/xml/MasterTestSuite/mapping/constructor/Foo.class
===================================================================
RCS file: src/tests/xml/MasterTestSuite/mapping/constructor/Foo.class
diff -N src/tests/xml/MasterTestSuite/mapping/constructor/Foo.class
Binary files /tmp/cvsItSuQc and /dev/null differ
Index: src/tests/xml/MasterTestSuite/mapping/container/A.class
===================================================================
RCS file: src/tests/xml/MasterTestSuite/mapping/container/A.class
diff -N src/tests/xml/MasterTestSuite/mapping/container/A.class
Binary files /tmp/cvsSLypX6 and /dev/null differ
Index: src/tests/xml/MasterTestSuite/mapping/container/B.class
===================================================================
RCS file: src/tests/xml/MasterTestSuite/mapping/container/B.class
diff -N src/tests/xml/MasterTestSuite/mapping/container/B.class
Binary files /tmp/cvsmEKq40 and /dev/null differ
Index: src/tests/xml/MasterTestSuite/mapping/container/Builder.class
===================================================================
RCS file: src/tests/xml/MasterTestSuite/mapping/container/Builder.class
diff -N src/tests/xml/MasterTestSuite/mapping/container/Builder.class
Binary files /tmp/cvsa7mybV and /dev/null differ
Index: src/tests/xml/MasterTestSuite/mapping/container/R.class
===================================================================
RCS file: src/tests/xml/MasterTestSuite/mapping/container/R.class
diff -N src/tests/xml/MasterTestSuite/mapping/container/R.class
Binary files /tmp/cvssL8LiP and /dev/null differ
Index: src/tests/xml/MasterTestSuite/mapping/container/RandS.class
===================================================================
RCS file: src/tests/xml/MasterTestSuite/mapping/container/RandS.class
diff -N src/tests/xml/MasterTestSuite/mapping/container/RandS.class
Binary files /tmp/cvsIe95pJ and /dev/null differ
Index: src/tests/xml/MasterTestSuite/mapping/container/X.class
===================================================================
RCS file: src/tests/xml/MasterTestSuite/mapping/container/X.class
diff -N src/tests/xml/MasterTestSuite/mapping/container/X.class
Binary files /tmp/cvsYlwyxD and /dev/null differ
Index: src/tests/xml/MasterTestSuite/mapping/container/XandZ.class
===================================================================
RCS file: src/tests/xml/MasterTestSuite/mapping/container/XandZ.class
diff -N src/tests/xml/MasterTestSuite/mapping/container/XandZ.class
Binary files /tmp/cvsqtn7Ex and /dev/null differ
Index: src/tests/xml/MasterTestSuite/mapping/listeners/A.class
===================================================================
RCS file: src/tests/xml/MasterTestSuite/mapping/listeners/A.class
diff -N src/tests/xml/MasterTestSuite/mapping/listeners/A.class
Binary files /tmp/cvssNI7Mr and /dev/null differ
Index: src/tests/xml/MasterTestSuite/mapping/listeners/B.class
===================================================================
RCS file: src/tests/xml/MasterTestSuite/mapping/listeners/B.class
diff -N src/tests/xml/MasterTestSuite/mapping/listeners/B.class
Binary files /tmp/cvsIqIeVl and /dev/null differ
Index: src/tests/xml/MasterTestSuite/mapping/listeners/BaseClass.class
===================================================================
RCS file: src/tests/xml/MasterTestSuite/mapping/listeners/BaseClass.class
diff -N src/tests/xml/MasterTestSuite/mapping/listeners/BaseClass.class
Binary files /tmp/cvsSYZr3f and /dev/null differ
Index: src/tests/xml/MasterTestSuite/mapping/listeners/C.class
===================================================================
RCS file: src/tests/xml/MasterTestSuite/mapping/listeners/C.class
diff -N src/tests/xml/MasterTestSuite/mapping/listeners/C.class
Binary files /tmp/cvsW9DLba and /dev/null differ
Index: src/tests/xml/MasterTestSuite/mapping/listeners/LogEntry.class
===================================================================
RCS file: src/tests/xml/MasterTestSuite/mapping/listeners/LogEntry.class
diff -N src/tests/xml/MasterTestSuite/mapping/listeners/LogEntry.class
Binary files /tmp/cvsOwsbk4 and /dev/null differ
Index: src/tests/xml/MasterTestSuite/mapping/listeners/MutatingListener.class
===================================================================
RCS file: src/tests/xml/MasterTestSuite/mapping/listeners/MutatingListener.class
diff -N src/tests/xml/MasterTestSuite/mapping/listeners/MutatingListener.class
Binary files /tmp/cvsWZwHsY and /dev/null differ
Index: src/tests/xml/MasterTestSuite/mapping/listeners/SimpleListener.class
===================================================================
RCS file: src/tests/xml/MasterTestSuite/mapping/listeners/SimpleListener.class
diff -N src/tests/xml/MasterTestSuite/mapping/listeners/SimpleListener.class
Binary files /tmp/cvsgXSjBS and /dev/null differ
Index: src/tests/xml/MasterTestSuite/mapping/location/Foo.class
===================================================================
RCS file: src/tests/xml/MasterTestSuite/mapping/location/Foo.class
diff -N src/tests/xml/MasterTestSuite/mapping/location/Foo.class
Binary files /tmp/cvsUCHBKM and /dev/null differ
Index: src/tests/xml/MasterTestSuite/mapping/namespace-node/Namespaces_Root.class
===================================================================
RCS file: src/tests/xml/MasterTestSuite/mapping/namespace-node/Namespaces_Root.class
diff -N src/tests/xml/MasterTestSuite/mapping/namespace-node/Namespaces_Root.class
Binary files /tmp/cvsWo6eUG and /dev/null differ
Index: src/tests/xml/MasterTestSuite/mapping/namespaces/Child.class
===================================================================
RCS file: src/tests/xml/MasterTestSuite/mapping/namespaces/Child.class
diff -N src/tests/xml/MasterTestSuite/mapping/namespaces/Child.class
Binary files /tmp/cvs8Nxa4A and /dev/null differ
Index: src/tests/xml/MasterTestSuite/mapping/namespaces/Root.class
===================================================================
RCS file: src/tests/xml/MasterTestSuite/mapping/namespaces/Root.class
diff -N src/tests/xml/MasterTestSuite/mapping/namespaces/Root.class
Binary files /tmp/cvsKkCcev and /dev/null differ
Index: src/tests/xml/MasterTestSuite/mapping/required/Required_Builder.class
===================================================================
RCS file: src/tests/xml/MasterTestSuite/mapping/required/Required_Builder.class
diff -N src/tests/xml/MasterTestSuite/mapping/required/Required_Builder.class
Binary files /tmp/cvsIUYvop and /dev/null differ
Index: src/tests/xml/MasterTestSuite/mapping/required/Required_Root.class
===================================================================
RCS file: src/tests/xml/MasterTestSuite/mapping/required/Required_Root.class
diff -N src/tests/xml/MasterTestSuite/mapping/required/Required_Root.class
Binary files /tmp/cvsQ10Vyj and /dev/null differ
Index: src/tests/xml/RegressionTestSuite/mapping/Inheritance_Regression1/A.class
===================================================================
RCS file: src/tests/xml/RegressionTestSuite/mapping/Inheritance_Regression1/A.class
diff -N src/tests/xml/RegressionTestSuite/mapping/Inheritance_Regression1/A.class
Binary files /tmp/cvsW3eYOd and /dev/null differ
Index: src/tests/xml/RegressionTestSuite/mapping/Inheritance_Regression1/A_Builder.class
===================================================================
RCS file: src/tests/xml/RegressionTestSuite/mapping/Inheritance_Regression1/A_Builder.class
diff -N src/tests/xml/RegressionTestSuite/mapping/Inheritance_Regression1/A_Builder.class
Binary files /tmp/cvsGSt747 and /dev/null differ
Index: src/tests/xml/RegressionTestSuite/mapping/Inheritance_Regression1/B.class
===================================================================
RCS file: src/tests/xml/RegressionTestSuite/mapping/Inheritance_Regression1/B.class
diff -N src/tests/xml/RegressionTestSuite/mapping/Inheritance_Regression1/B.class
Binary files /tmp/cvsMK3ml2 and /dev/null differ
Index: src/tests/xml/RegressionTestSuite/mapping/Inheritance_Regression1/C.class
===================================================================
RCS file: src/tests/xml/RegressionTestSuite/mapping/Inheritance_Regression1/C.class
diff -N src/tests/xml/RegressionTestSuite/mapping/Inheritance_Regression1/C.class
Binary files /tmp/cvsa0IIBW and /dev/null differ
Index: src/tests/xml/RegressionTestSuite/mapping/bug907i/Foo.class
===================================================================
RCS file: src/tests/xml/RegressionTestSuite/mapping/bug907i/Foo.class
diff -N src/tests/xml/RegressionTestSuite/mapping/bug907i/Foo.class
Binary files /tmp/cvskSvkSQ and /dev/null differ
Index: src/tests/xml/RegressionTestSuite/mapping/containers/primitive/Bar.class
===================================================================
RCS file: src/tests/xml/RegressionTestSuite/mapping/containers/primitive/Bar.class
diff -N src/tests/xml/RegressionTestSuite/mapping/containers/primitive/Bar.class
Binary files /tmp/cvsSU6h9K and /dev/null differ
Index: src/tests/xml/RegressionTestSuite/mapping/containers/primitive/Foo.class
===================================================================
RCS file: src/tests/xml/RegressionTestSuite/mapping/containers/primitive/Foo.class
diff -N src/tests/xml/RegressionTestSuite/mapping/containers/primitive/Foo.class
Binary files /tmp/cvsksTlqF and /dev/null differ
Index: .classpath
===================================================================
RCS file: .classpath
diff -N .classpath
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ .classpath	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src/main"/>
+	<classpathentry kind="src" path="src/bugs"/>
+	<classpathentry excluding="main/|xml/MasterTestSuite/|xml/RegressionTestSuite/" kind="src" path="src/tests"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="lib" path="lib/tests/geronimo-spec-j2ee-1.4-rc2.jar"/>
+	<classpathentry kind="lib" path="lib/adaptx-0.9.13.jar"/>
+	<classpathentry kind="lib" path="lib/ant-1.6.jar"/>
+	<classpathentry kind="lib" path="lib/ant-1.6-launcher.jar"/>
+	<classpathentry kind="lib" path="lib/cglib-full-2.0.2.jar"/>
+	<classpathentry kind="lib" path="lib/commons-logging.jar"/>
+	<classpathentry kind="lib" path="lib/jakarta-oro-2.0.5.jar"/>
+	<classpathentry kind="lib" path="lib/jakarta-regexp-1.1.jar"/>
+	<classpathentry kind="lib" path="lib/jdbc-se2.0.jar"/>
+	<classpathentry kind="lib" path="lib/jndi_1.2.1.jar"/>
+	<classpathentry kind="lib" path="lib/jta1.0.1.jar"/>
+	<classpathentry kind="lib" path="lib/jtf-0.1.jar"/>
+	<classpathentry kind="lib" path="lib/junit_3.8.1.jar"/>
+	<classpathentry kind="lib" path="lib/ldapjdk_4.1.jar"/>
+	<classpathentry kind="lib" path="lib/log4j-1.2.8.jar"/>
+	<classpathentry kind="lib" path="lib/postgresql.jar"/>
+	<classpathentry kind="lib" path="lib/servlet.jar"/>
+	<classpathentry kind="lib" path="lib/xerces-J_1.4.0.jar"/>
+	<classpathentry kind="lib" path="lib/tests/mockejb.jar"/>
+	<classpathentry kind="lib" path="lib/tests/ots-jts_1.0.jar"/>
+	<classpathentry kind="lib" path="lib/tests/tyrex-1.0.jar"/>
+	<classpathentry kind="lib" path="C:/dev/bin/mysql-connector-java-3.1.11/mysql-connector-java-3.1.11-bin.jar"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
Index: .project
===================================================================
RCS file: .project
diff -N .project
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ .project	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>CASTOR-1276</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
Index: .settings/org.eclipse.jdt.core.prefs
===================================================================
RCS file: .settings/org.eclipse.jdt.core.prefs
diff -N .settings/org.eclipse.jdt.core.prefs
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ .settings/org.eclipse.jdt.core.prefs	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,12 @@
+#Tue Dec 06 23:45:32 CET 2005
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.4
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
+org.eclipse.jdt.core.compiler.source=1.3
Index: .settings/org.eclipse.jdt.ui.prefs
===================================================================
RCS file: .settings/org.eclipse.jdt.ui.prefs
diff -N .settings/org.eclipse.jdt.ui.prefs
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ .settings/org.eclipse.jdt.ui.prefs	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,3 @@
+#Sat Dec 17 20:21:56 CET 2005
+eclipse.preferences.version=1
+internal.default.compliance=default
Index: lib/oqlquery.bat
===================================================================
RCS file: lib/oqlquery.bat
diff -N lib/oqlquery.bat
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lib/oqlquery.bat	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,18 @@
+@echo off
+REM $Id: oqlquery.bat,v 1.1.1.1 2003/03/03 07:05:45 kvisco Exp $
+set JAVA=%JAVA_HOME%\bin\java
+set OLDCP=%CLASSPATH%
+set CLASSPATH=build\classes;build\tests;build\examples;%CLASSPATH%
+set cp=%CLASSPATH%
+for %%i in (lib\*.jar) do call cp.bat %%i
+
+if not "%2"=="" goto run
+echo Usage: oqlquery.bat DatabaseName DatabaseConfig
+echo Example: oqlquery.bat test file:build/examples/jdo/database.xml
+goto end
+
+:run
+%JAVA% -classpath %CP% org.exolab.castor.gui.QueryAnalyser %1 %2
+
+:end
+set CLASSPATH=%OLDCP%
Index: src/bugs/jdo/bug1276/EntityOne.java
===================================================================
RCS file: src/bugs/jdo/bug1276/EntityOne.java
diff -N src/bugs/jdo/bug1276/EntityOne.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ src/bugs/jdo/bug1276/EntityOne.java	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,33 @@
+package jdo.bug1276;
+
+import java.util.Date;
+
+public final class EntityOne {
+    private Integer _id;
+    private String _name;
+    private Date startDate;
+    
+    public Integer getId() {
+        return _id;
+    }
+    
+    public void setId(final Integer id) {
+        _id = id;
+    }
+    
+    public String getName() {
+        return _name;
+    }
+    
+    public void setName(final String name) {
+        _name = name;
+    }
+
+    public Date getStartDate() {
+        return startDate;
+    }
+
+    public void setStartDate(Date startDate) {
+        this.startDate = startDate;
+    }
+}
Index: src/bugs/jdo/bug1276/README.txt
===================================================================
RCS file: src/bugs/jdo/bug1276/README.txt
diff -N src/bugs/jdo/bug1276/README.txt
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ src/bugs/jdo/bug1276/README.txt	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,5 @@
+bug number: 1820
+description: Bug report template for castor jdo.
+castor: version 0.9.6 or CVS of 2005-03-31 13:44
+database: MySQL version 4.1
+driver: mysql-connector-java-3.0.16-ga-bin.jar
Index: src/bugs/jdo/bug1276/TestTemplate.java
===================================================================
RCS file: src/bugs/jdo/bug1276/TestTemplate.java
diff -N src/bugs/jdo/bug1276/TestTemplate.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ src/bugs/jdo/bug1276/TestTemplate.java	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,80 @@
+package jdo.bug1276;
+
+import java.util.Date;
+
+import junit.framework.TestCase;
+
+import org.exolab.castor.jdo.Database;
+import org.exolab.castor.jdo.JDOManager;
+import org.exolab.castor.jdo.OQLQuery;
+import org.exolab.castor.jdo.QueryResults;
+
+public final class TestTemplate extends TestCase {
+    private static final String JDO_CONF_FILE = "jdo-conf.xml";
+    private static final String DATABASE_NAME = "bugTemplate";
+    
+    private JDOManager _jdo = null;
+
+    public static void main(final String[] args) throws Exception {
+        TestTemplate test = new TestTemplate();
+        test.setUp();
+        test.testQueryEntityOne();
+        test.tearDown();
+    }
+    
+    public TestTemplate() {
+        super();
+    }
+    
+    public TestTemplate(final String name) {
+        super(name);
+    }
+
+    protected void setUp() throws Exception {
+        super.setUp();
+        
+        String config = getClass().getResource(JDO_CONF_FILE).toString();
+        JDOManager.loadConfiguration(config, getClass().getClassLoader());
+        _jdo = JDOManager.createInstance(DATABASE_NAME);
+    }
+    
+    protected void tearDown() throws Exception {
+        super.tearDown();
+    }
+    
+    /**
+     * Test method.
+     * @throws Exception For any exception thrown.
+     */
+    public void testQueryEntityOne() throws Exception {
+        Database db = _jdo.getDatabase();
+        db.begin();
+        
+        OQLQuery query = db.getOQLQuery("SELECT entity FROM "
+                + EntityOne.class.getName() + " entity WHERE id = $1");
+        query.bind(new Integer(1));
+        QueryResults results = query.execute();
+        
+        EntityOne entity = (EntityOne) results.next();
+
+        assertNotNull(entity);
+        assertEquals(new Integer(1), entity.getId());
+        
+        db.commit();
+        db.close();
+    }
+    
+    public void testCreateEntity() throws Exception {
+        Database db = _jdo.getDatabase();
+        db.begin();
+        EntityOne entity = new EntityOne();
+        entity.setId(new Integer(100));
+        entity.setName("entity 100");
+        Date now = new Date();
+        entity.setStartDate(now);
+        db.create(entity);
+        db.commit();
+        db.close();
+        
+    }
+}
Index: src/bugs/jdo/bug1276/create.sql
===================================================================
RCS file: src/bugs/jdo/bug1276/create.sql
diff -N src/bugs/jdo/bug1276/create.sql
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ src/bugs/jdo/bug1276/create.sql	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,11 @@
+drop table entity1;
+create table entity1 (
+  id        int not null,
+  name      varchar(200) not null,
+  start_date date
+);
+
+-- create unique index entity1_pk on entity1 ( id );
+-- grant all privileges on entity1 to test;
+
+insert into entity1 (id, name) values (1, 'entity1', null);
Index: src/bugs/jdo/bug1276/jdo-conf.xml
===================================================================
RCS file: src/bugs/jdo/bug1276/jdo-conf.xml
diff -N src/bugs/jdo/bug1276/jdo-conf.xml
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ src/bugs/jdo/bug1276/jdo-conf.xml	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,14 @@
+<?xml version="1.0" ?>
+<!DOCTYPE jdo-conf PUBLIC "-//EXOLAB/Castor JDO Configuration DTD Version 1.0//EN"
+                           "http://castor.org/jdo-conf.dtd">
+
+<jdo-conf>
+    <database name="bugTemplate" engine="mysql" >
+        <driver url="jdbc:mysql://localhost/1276" class-name="org.gjt.mm.mysql.Driver">
+            <param name="user" value="root" />
+            <param name="password" value="uLive2C" />
+        </driver>
+        <mapping href="bug1276/mapping.xml" />
+    </database>
+    <transaction-demarcation mode="local" />
+</jdo-conf>
Index: src/bugs/jdo/bug1276/mapping.xml
===================================================================
RCS file: src/bugs/jdo/bug1276/mapping.xml
diff -N src/bugs/jdo/bug1276/mapping.xml
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ src/bugs/jdo/bug1276/mapping.xml	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,21 @@
+<?xml version="1.0" ?>
+<!DOCTYPE mapping PUBLIC "-//EXOLAB/Castor Mapping DTD Version 1.0//EN"
+                           "http://castor.org/mapping.dtd">
+<mapping>
+
+  <class name="jdo.bug1276.EntityOne" identity="id">
+    <description>Entite one</description>
+    <map-to table="entity1" xml="entity1" />
+    <field name="id" type="integer" >
+      <sql name="id" type="integer"/>
+    </field>
+    <field name="name" type="string">
+      <sql name="name" type="char" />
+    </field>
+    <field name="startDate" type="date">
+        <sql name="start_date" type="date" />
+    </field>
+  </class>
+
+</mapping>
+