Skip to content

Commit

Permalink
Added MySql handling of zero date values, updated MySql driver.
Browse files Browse the repository at this point in the history
  • Loading branch information
@schuemie
schuemie committed Oct 30, 2015
1 parent e54943b commit 6838c66
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .classpath
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<classpathentry kind="lib" path="lib/ojdbc5.jar"/>
<classpathentry kind="lib" path="lib/ojdbc6.jar"/>
<classpathentry kind="lib" path="lib/sqljdbc4.jar"/>
<classpathentry kind="lib" path="lib/mysql-connector-java-5.1.30-bin.jar"/>
<classpathentry kind="lib" path="lib/dom4j-1.6.1.jar"/>
<classpathentry kind="lib" path="lib/poi-3.9-20121203.jar"/>
<classpathentry kind="lib" path="lib/poi-excelant-3.9-20121203.jar"/>
Expand All @@ -18,5 +17,6 @@
<classpathentry kind="lib" path="lib/commons-csv-1.1.jar"/>
<classpathentry kind="lib" path="lib/postgresql-9.4-1201.jdbc4.jar"/>
<classpathentry kind="lib" path="lib/postgresql-9.4-1201.jdbc41.jar"/>
<classpathentry kind="lib" path="lib/mysql-connector-java-5.1.37-bin.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
6 changes: 3 additions & 3 deletions build.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@
<jar destfile="${build.dir}/WhiteRabbit.jar">
<manifest>
<attribute name="Main-Class" value="org.ohdsi.utilities.WhiteRabbitLauncher"/>
<attribute name="Class-Path" value=". WhiteRabbit_lib/ojdbc5.jar WhiteRabbit_lib/ojdbc6.jar WhiteRabbit_lib/sqljdbc4.jar WhiteRabbit_lib/mysql-connector-java-5.1.30-${build.dir}.jar WhiteRabbit_lib/dom4j-1.6.1.jar WhiteRabbit_lib/poi-3.9-20121203.jar WhiteRabbit_lib/poi-excelant-3.9-20121203.jar WhiteRabbit_lib/poi-ooxml-3.9-20121203.jar WhiteRabbit_lib/poi-ooxml-schemas-3.9-20121203.jar WhiteRabbit_lib/stax-api-1.0.1.jar WhiteRabbit_lib/xmlbeans-2.3.0.jar WhiteRabbit_lib/jtds-1.2.7.jar WhiteRabbit_lib/postgresql-9.4-1201.jdbc4.jar WhiteRabbit_lib/postgresql-9.4-1201.jdbc41.jar WhiteRabbit_lib/json-io-3.0.1.jar WhiteRabbit_lib/commons-csv-1.1.jar"/>
<attribute name="Class-Path" value=". WhiteRabbit_lib/ojdbc5.jar WhiteRabbit_lib/ojdbc6.jar WhiteRabbit_lib/sqljdbc4.jar WhiteRabbit_lib/mysql-connector-java-5.1.37-bin.jar WhiteRabbit_lib/dom4j-1.6.1.jar WhiteRabbit_lib/poi-3.9-20121203.jar WhiteRabbit_lib/poi-excelant-3.9-20121203.jar WhiteRabbit_lib/poi-ooxml-3.9-20121203.jar WhiteRabbit_lib/poi-ooxml-schemas-3.9-20121203.jar WhiteRabbit_lib/stax-api-1.0.1.jar WhiteRabbit_lib/xmlbeans-2.3.0.jar WhiteRabbit_lib/jtds-1.2.7.jar WhiteRabbit_lib/postgresql-9.4-1201.jdbc4.jar WhiteRabbit_lib/postgresql-9.4-1201.jdbc41.jar WhiteRabbit_lib/json-io-3.0.1.jar WhiteRabbit_lib/commons-csv-1.1.jar"/>
</manifest>
<fileset dir="${build.dir}"/>
<fileset dir="${src.dir}" includes="**/*.csv,**/*.png" />
</jar>
<jar destfile="${build.dir}/RabbitInAHat.jar">
<manifest>
<attribute name="Main-Class" value="org.ohdsi.utilities.RabbitInAHatLauncher"/>
<attribute name="Class-Path" value=". WhiteRabbit_lib/ojdbc5.jar WhiteRabbit_lib/ojdbc6.jar WhiteRabbit_lib/sqljdbc4.jar WhiteRabbit_lib/mysql-connector-java-5.1.30-${build.dir}.jar WhiteRabbit_lib/dom4j-1.6.1.jar WhiteRabbit_lib/poi-3.9-20121203.jar WhiteRabbit_lib/poi-excelant-3.9-20121203.jar WhiteRabbit_lib/poi-ooxml-3.9-20121203.jar WhiteRabbit_lib/poi-ooxml-schemas-3.9-20121203.jar WhiteRabbit_lib/stax-api-1.0.1.jar WhiteRabbit_lib/xmlbeans-2.3.0.jar WhiteRabbit_lib/jtds-1.2.7.jar WhiteRabbit_lib/postgresql-9.4-1201.jdbc4.jar WhiteRabbit_lib/postgresql-9.4-1201.jdbc41.jar WhiteRabbit_lib/json-io-3.0.1.jar WhiteRabbit_lib/commons-csv-1.1.jar"/>
<attribute name="Class-Path" value=". WhiteRabbit_lib/ojdbc5.jar WhiteRabbit_lib/ojdbc6.jar WhiteRabbit_lib/sqljdbc4.jar WhiteRabbit_lib/mysql-connector-java-5.1.37-bin.jar WhiteRabbit_lib/dom4j-1.6.1.jar WhiteRabbit_lib/poi-3.9-20121203.jar WhiteRabbit_lib/poi-excelant-3.9-20121203.jar WhiteRabbit_lib/poi-ooxml-3.9-20121203.jar WhiteRabbit_lib/poi-ooxml-schemas-3.9-20121203.jar WhiteRabbit_lib/stax-api-1.0.1.jar WhiteRabbit_lib/xmlbeans-2.3.0.jar WhiteRabbit_lib/jtds-1.2.7.jar WhiteRabbit_lib/postgresql-9.4-1201.jdbc4.jar WhiteRabbit_lib/postgresql-9.4-1201.jdbc41.jar WhiteRabbit_lib/json-io-3.0.1.jar WhiteRabbit_lib/commons-csv-1.1.jar"/>
</manifest>
<fileset dir="${build.dir}"/>
<fileset dir="${src.dir}" includes="**/*.csv,**/*.png" />
Expand All @@ -43,7 +43,7 @@
<copy file="lib/ojdbc5.jar" todir="${build.dir}/WhiteRabbit_lib"/>
<copy file="lib/ojdbc6.jar" todir="${build.dir}/WhiteRabbit_lib"/>
<copy file="lib/sqljdbc4.jar" todir="${build.dir}/WhiteRabbit_lib"/>
<copy file="lib/mysql-connector-java-5.1.30-${build.dir}.jar" todir="${build.dir}/WhiteRabbit_lib"/>
<copy file="lib/mysql-connector-java-5.1.37-bin.jar" todir="${build.dir}/WhiteRabbit_lib"/>
<copy file="lib/dom4j-1.6.1.jar" todir="${build.dir}/WhiteRabbit_lib"/>
<copy file="lib/poi-3.9-20121203.jar" todir="${build.dir}/WhiteRabbit_lib"/>
<copy file="lib/poi-excelant-3.9-20121203.jar" todir="${build.dir}/WhiteRabbit_lib"/>
Expand Down
Binary file removed lib/mysql-connector-java-5.1.30-bin.jar
View file
Binary file not shown.
Binary file added lib/mysql-connector-java-5.1.37-bin.jar
View file
Binary file not shown.

0 comments on commit 6838c66

Please sign in to comment.