← Back to branch summary

~massimo-siani/mariadb-java-client/getTimestamp

« back to all changes in this revision

Viewing changes to src/test/java/org/mariadb/jdbc/DatatypeTest.java

  • Committer: Massimo Siani
  • Date: 2014-03-26 16:19:30 UTC
  • mfrom: (502.1.1 timestamp-null)
  • Revision ID: massimo.siani@skysql.com-20140326161930-ijbxikqnbflihu0b
Merge from Massimo Siani: Return null for 'zero' timestamps

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/test/java/org/mariadb/jdbc/DatatypeTest.java
39
39
                      "date0 DATE default '2001-01-01'," +
40
40
                      "datetime0 DATETIME default '2001-01-01 00:00:00',"+
41
41
                      "timestamp0 TIMESTAMP default  '2001-01-01 00:00:00'," +
 
42
                      "timestamp_zero TIMESTAMP default '0000-00-00 00:00:00'," +
42
43
                      "time0 TIME default '22:11:00'," +
43
44
                      "year2 YEAR(2) default 99," +
44
45
                      "year4 YEAR(4) default 2011," +
107
108
        checkClass("date0", java.sql.Date.class, "DATE", Types.DATE);
108
109
        checkClass("time0", java.sql.Time.class, "TIME", Types.TIME);
109
110
        checkClass("timestamp0", java.sql.Timestamp.class, "TIMESTAMP", Types.TIMESTAMP);
 
111
        checkClass("timestamp_zero", java.sql.Timestamp.class, "TIMESTAMP", Types.TIMESTAMP);
110
112
        checkClass("year2",
111
113
                yearIsDateType? java.sql.Date.class: Short.class, "YEAR",
112
114
                yearIsDateType? Types.DATE: Types.SMALLINT );