From e6aa8fe2873b59db0172d0011052d3a44f584b64 Mon Sep 17 00:00:00 2001
From: Aleksander <alex+github@gralak.org>
Date: Tue, 7 Feb 2017 17:47:23 +0100
Subject: [PATCH 1/2] Fix for Windows date parsing, dates before 1970

---
 src/odbc.cpp | 29 +++++++++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/src/odbc.cpp b/src/odbc.cpp
index 6f36e79e..1ec9bd01 100644
--- a/src/odbc.cpp
+++ b/src/odbc.cpp
@@ -438,18 +438,43 @@ Handle<Value> ODBC::GetColumnValue( SQLHSTMT hStmt, Column column,
         //return Null();
       }
       else {
+		  
+		  char dateStr[64] = "new Date('";
+		  char *endStr = "')";
+		  strcat(dateStr, (char *)buffer);
+		  strcat(dateStr, endStr);
+		  Handle<String> source = String::NewFromUtf8(Isolate::GetCurrent(), dateStr);
+		  Handle<Script> script = Script::Compile(source);
+		  Handle<Value> result = script->Run();	
+          return scope.Escape(result);
+
+		/*
         if (strptime((char *) buffer, "%Y-%m-%d %H:%M:%S", &timeInfo)) {
           //a negative value means that mktime() should use timezone information
           //and system databases to attempt to determine whether DST is in effect
           //at the specified time.
-          timeInfo.tm_isdst = -1;
+		  
+		  SYSTEMTIME systemTime = {
+			timeInfo.tm_year, timeInfo.tm_mon, 0, timeInfo.tm_mday,
+			timeInfo.tm_hour, timeInfo.tm_min, timeInfo.tm_sec,
+			0 // wMilliseconds
+		  };
+		  
+		  FILETIME fileTime;
+		  if(!SystemTimeToFileTime(&systemTime, &fileTime))
+			  return 0;
+		  
+		  LARGE_INTEGER ll;
+		  ll.LowPart = fileTime.dwLowDateTime;
+		  ll.HighPart = fileTime.dwHighDateTime;		  
           
           //return scope.Escape(Date::New(Isolate::GetCurrent(), (double(mktime(&timeInfo)) * 1000));
-          return scope.Escape(Nan::New<Date>(double(mktime(&timeInfo)) * 1000).ToLocalChecked());
+          return scope.Escape(Nan::New<Date>(double(ll.QuadPart - 116444736000000000I64) / 10000).ToLocalChecked());
         }
         else {
           return scope.Escape(Nan::New((char *)buffer).ToLocalChecked());
         }
+		*/
       }
 #else
       struct tm timeInfo = { 

From 60d1bd504011586f43a76d08c2a1de5548e106d6 Mon Sep 17 00:00:00 2001
From: Aleksander <alex+github@gralak.org>
Date: Tue, 7 Feb 2017 17:54:11 +0100
Subject: [PATCH 2/2] Removed commented code

---
 src/odbc.cpp | 45 ++++++++-------------------------------------
 1 file changed, 8 insertions(+), 37 deletions(-)

diff --git a/src/odbc.cpp b/src/odbc.cpp
index 1ec9bd01..8d6f6abc 100644
--- a/src/odbc.cpp
+++ b/src/odbc.cpp
@@ -438,43 +438,14 @@ Handle<Value> ODBC::GetColumnValue( SQLHSTMT hStmt, Column column,
         //return Null();
       }
       else {
-		  
-		  char dateStr[64] = "new Date('";
-		  char *endStr = "')";
-		  strcat(dateStr, (char *)buffer);
-		  strcat(dateStr, endStr);
-		  Handle<String> source = String::NewFromUtf8(Isolate::GetCurrent(), dateStr);
-		  Handle<Script> script = Script::Compile(source);
-		  Handle<Value> result = script->Run();	
-          return scope.Escape(result);
-
-		/*
-        if (strptime((char *) buffer, "%Y-%m-%d %H:%M:%S", &timeInfo)) {
-          //a negative value means that mktime() should use timezone information
-          //and system databases to attempt to determine whether DST is in effect
-          //at the specified time.
-		  
-		  SYSTEMTIME systemTime = {
-			timeInfo.tm_year, timeInfo.tm_mon, 0, timeInfo.tm_mday,
-			timeInfo.tm_hour, timeInfo.tm_min, timeInfo.tm_sec,
-			0 // wMilliseconds
-		  };
-		  
-		  FILETIME fileTime;
-		  if(!SystemTimeToFileTime(&systemTime, &fileTime))
-			  return 0;
-		  
-		  LARGE_INTEGER ll;
-		  ll.LowPart = fileTime.dwLowDateTime;
-		  ll.HighPart = fileTime.dwHighDateTime;		  
-          
-          //return scope.Escape(Date::New(Isolate::GetCurrent(), (double(mktime(&timeInfo)) * 1000));
-          return scope.Escape(Nan::New<Date>(double(ll.QuadPart - 116444736000000000I64) / 10000).ToLocalChecked());
-        }
-        else {
-          return scope.Escape(Nan::New((char *)buffer).ToLocalChecked());
-        }
-		*/
+        char dateStr[64] = "new Date('";
+        char *endStr = "')";
+        strcat(dateStr, (char *)buffer);
+		    strcat(dateStr, endStr);
+		    Handle<String> source = String::NewFromUtf8(Isolate::GetCurrent(), dateStr);
+		    Handle<Script> script = Script::Compile(source);
+		    Handle<Value> result = script->Run();	
+        return scope.Escape(result);
       }
 #else
       struct tm timeInfo = {