fix #86 : default DateTime and SysTime to currTime when NULL

Author: SingingBush

README.md

@@ -161,6 +161,7 @@ pull requests are welcome. Please ensure your local branch is up to date and all
 The examples should also run, make sure to change to the _example_ directory and run `dub build` then make sure that the compiled executable will run with each supported database (you'll need to install relevant libs and create databases and users with relevant permissions):
 
 ```
+./ddbctest --connection=sqlite::memory:
 ./ddbctest --connection=mysql:127.0.0.1 --database=testdb --user=travis --password=bbk4k77JKH88g54
 ./ddbctest --connection=postgresql:127.0.0.1 --database=testdb --user=postgres
 ./ddbctest --connection=odbc://localhost --database=ddbctest --user=SA --password=bbk4k77JKH88g54 --driver="ODBC Driver 17 for SQL Server"

example/source/testddbc.d

@@ -286,7 +286,13 @@ int main(string[] args)
             break;
         case "mysql": // MySQL has an underscore in 'AUTO_INCREMENT'
 			stmt.executeUpdate("DROP TABLE IF EXISTS ddbct1");
-            stmt.executeUpdate("CREATE TABLE IF NOT EXISTS ddbct1 (`id` INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT, `name` VARCHAR(250), `comment` MEDIUMTEXT, `ts` TIMESTAMP)");
+            stmt.executeUpdate("CREATE TABLE IF NOT EXISTS ddbct1 (
+				`id` INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT, 
+				`name` VARCHAR(250), 
+				`comment` MEDIUMTEXT, 
+				`ts` TIMESTAMP NULL DEFAULT NULL
+				)");
+
             stmt.executeUpdate("INSERT INTO ddbct1 (`name`, `comment`, `ts`) VALUES ('name1', 'comment for line 1', CURRENT_TIMESTAMP), ('name2','comment for line 2 - can be very long', CURRENT_TIMESTAMP)");
 
 			stmt.executeUpdate("DROP TABLE IF EXISTS employee");
@@ -380,6 +386,29 @@ int main(string[] args)
 	}
 	assert(2 == i, "There should be 2 results but instead there was " ~ to!string(i));
 
+	// make sure that a timestamp can handle being NULL
+	stmt.executeUpdate("UPDATE ddbct1 SET ts=NULL");
+	i = 0;
+	rs = stmt.executeQuery("SELECT id, name, comment, ts FROM ddbct1 WHERE ts IS NULL");
+	while (rs.next()) {
+		SysTime now = Clock.currTime();
+		DateTime dtNow = cast(DateTime) now;
+		// if the column on the table is NULL ddbc will create a DateTime using Clock.currTime()
+		// https://github.com/buggins/ddbc/issues/86
+		assert(rs.getDateTime(4).year == dtNow.year);
+		assert(rs.getDateTime(4).month == dtNow.month);
+		assert(rs.getDateTime(4).day == dtNow.day);
+		assert(rs.getDateTime(4).hour == dtNow.hour);
+		writeln("\tid: " ~ to!string(rs.getLong(1)) ~ "\t" ~ rs.getString(2) ~ "\t" ~ to!string(rs.getDateTime(4)));
+		
+		// ddbc should also allow you to retrive the timestamp as a SysTime (defaulting UTC if no zone info given)
+		assert(rs.getSysTime(4).year == now.year);
+		assert(rs.getSysTime(4).month == now.month);
+		assert(rs.getSysTime(4).day == now.day);
+		//assert(rs.getSysTime(4).hour == now.hour);
+		i++;
+	}
+	assert(2 == i, "There should be 2 results but instead there was " ~ to!string(i));
 
     writeln("\n > Testing prepared SQL statements");
 	PreparedStatement ps2 = conn.prepareStatement("SELECT id, name name_alias, comment, ts FROM ddbct1 WHERE id >= ?");

source/ddbc/drivers/mysqlddbc.d

@@ -1137,9 +1137,8 @@ public:
         scope(exit) unlock();
 
         immutable string s = getString(columnIndex);
-        SysTime st;
         if (s is null)
-            return st;
+            return Clock.currTime();
         try {
             import ddbc.drivers.utils : parseSysTime;
             return parseSysTime(s);
@@ -1154,7 +1153,7 @@ public:
 		scope(exit) unlock();
 		Variant v = getValue(columnIndex);
 		if (lastIsNull)
-			return DateTime();
+			return cast(DateTime) Clock.currTime();
 		if (v.convertsTo!(DateTime)) {
 			return v.get!DateTime();
 		}

source/ddbc/drivers/odbcddbc.d

@@ -1585,14 +1585,13 @@ version (USE_ODBC)
             return stmt.getColumn(columnIndex).value.get!(string);
         }
 
-        override SysTime getSysTime(int columnIndex) {
-            checkClosed();
-            lock();
-            scope (exit) unlock();
-            
+        override SysTime getSysTime(int columnIndex)
+        {
             Variant v = stmt.getColumn(columnIndex).value;
-            if (lastIsNull)
-                return SysTime();
+            if (v.peek!(SysTime) is null) {
+                return Clock.currTime();
+            }
+
             if (v.convertsTo!(SysTime)) {
                 return v.get!(SysTime);
             }
@@ -1601,14 +1600,11 @@ version (USE_ODBC)
 
         override DateTime getDateTime(int columnIndex)
         {
-            checkClosed();
-            lock();
-            scope (exit)
-                unlock();
-
             Variant v = stmt.getColumn(columnIndex).value;
-            if (lastIsNull)
-                return DateTime();
+            if (v.peek!(DateTime) is null) {
+                return cast(DateTime) Clock.currTime();
+            }
+
             if (v.convertsTo!(DateTime)) {
                 return v.get!(DateTime);
             }

source/ddbc/drivers/pgsqlddbc.d

@@ -1329,7 +1329,7 @@ version(USE_PGSQL) {
             scope(exit) unlock();
             Variant v = getValue(columnIndex);
             if (lastIsNull)
-                return SysTime();
+                return Clock.currTime();
             if (v.convertsTo!(SysTime)) {
                 return v.get!SysTime();
             }
@@ -1342,7 +1342,7 @@ version(USE_PGSQL) {
     		scope(exit) unlock();
     		Variant v = getValue(columnIndex);
     		if (lastIsNull)
-    			return DateTime();
+    			return cast(DateTime) Clock.currTime();
     		if (v.convertsTo!(DateTime)) {
     			return v.get!DateTime();
     		}

source/ddbc/drivers/sqliteddbc.d

@@ -1022,9 +1022,8 @@ version(USE_SQLITE) {
 
         override SysTime getSysTime(int columnIndex) {
             immutable string s = getString(columnIndex);
-            SysTime st;
             if (s is null)
-                return st;
+                return Clock.currTime();
             try {
                 return parseSysTime(s);
             } catch (Throwable e) {
@@ -1034,9 +1033,8 @@ version(USE_SQLITE) {
 
         override DateTime getDateTime(int columnIndex) {
             string s = getString(columnIndex);
-            DateTime dt;
             if (s is null)
-                return dt;
+                return cast(DateTime) Clock.currTime();
             try {
                 return fromResultSet(s);
             } catch (Throwable e) {