Issue #1138622, preliminary pass at adding support for SQL Server.

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 376dfc2..a478e8e 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -28,6 +28,8 @@ a single argument.
 Version 7.x-2.x
 ======================
 
+- Issue #1138622, preliminary pass at adding support for SQL Server.
+- Issue #1136618 by ksenzee, Fix broken hide/show capability for date filter values.
 - Issue #1059078 Add preliminary support for SQLite dates.
 - Issue #1103290 by kevintheday, Use db_driver() to determine database engine.
 - The 'now' values got broken again somewhere along the line. Now we need to switch the ISO format used by our SQL queries back to the datetime format the widgets use.

diff --git a/date.install b/date.install
index ad4def0..cd5daf3 100644 (file)
--- a/date.install
+++ b/date.install
@@ -19,7 +19,8 @@ function date_field_schema($field) {
         'type' => 'datetime',
         'mysql_type' => 'DATETIME',
         'pgsql_type' => 'timestamp without time zone', 
-        'sqlite_type' => 'TEXT', 
+        'sqlite_type' => 'VARCHAR', 
+        'sqlsrv_type' => 'smalldatetime',
         'not null' => FALSE, 
         'sortable' => TRUE, 
         'views' => TRUE,

diff --git a/date_api/date_api_sql.inc b/date_api/date_api_sql.inc
index b2ee279..df3a581 100644 (file)
--- a/date_api/date_api_sql.inc
+++ b/date_api/date_api_sql.inc
@@ -70,7 +70,7 @@ class date_sql_handler {
   var $offset_field = NULL; // Use if the offset is stored in a field.
 
   function construct($date_type = DATE_DATETIME, $local_timezone = NULL) {
-    $this->db_type =  db_driver();
+    $this->db_type = db_driver();
     $this->date_type = $date_type;
     $this->db_timezone = 'UTC';
     $this->local_timezone = isset($local_timezone) ? $local_timezone : date_default_timezone();
@@ -125,11 +125,17 @@ class date_sql_handler {
     static $already_set = FALSE;
     $type =  db_driver();
     if (!$already_set) {
-      if (($type == 'mysqli' || $type == 'mysql')) {
-        db_query("SET @@session.time_zone = '$offset'");
-      }
-      elseif ($type == 'pgsql') {
-        db_query("SET TIME ZONE INTERVAL '$offset' HOUR TO MINUTE");
+      switch ($type) {
+        case 'mysql':
+        case 'mysqli':
+          db_query("SET @@session.time_zone = '$offset'");
+          break;
+        case 'pgsql':
+          db_query("SET TIME ZONE INTERVAL '$offset' HOUR TO MINUTE");
+          break;
+        case 'sqlsvr':
+          db_query('TimeZone.setDefault(TimeZone.getTimeZone("GMT"))');
+          break;
       }
       $already_set = TRUE;
     }
@@ -203,6 +209,17 @@ class date_sql_handler {
             break;
         }
         break;
+      case 'sqlsrv':
+        switch ($this->date_type) {
+          case DATE_UNIX:
+            $field = "DATEDIFF(s, '19700101 00:00:00:000', $field)";
+            break;
+          case DATE_ISO:
+          case DATE_DATETIME:
+            $field = "CAST($field as smalldatetime)";
+            break;
+        }
+        break;
       break;
     }
     // Adjust the resulting value to the right timezone/offset.
@@ -221,7 +238,9 @@ class date_sql_handler {
         case 'pgsql':
           return "($field + INTERVAL '$offset SECONDS')";;
         case 'sqlite':
-          return "datetime($field, '$offset seconds')";;
+          return "datetime($field, '$offset seconds')";
+        case 'sqlsrv':
+          return "DATEADD(second, $offset, $field)";
       }
     }
     return $field;
@@ -402,6 +421,28 @@ class date_sql_handler {
           );
         $format = strtr($format, $replace);
         return "strftime('$format', $field)";
+      case 'sqlsvr':
+        $replace = array(
+          'Y' => 'yyyy', // 4 digit year number
+          'y' => 'yy', // 2 digit year number
+          'M' => 'm', // no format for 3 letter month name
+          'm' => 'mm', // month number with leading zeros
+          'n' => 'm', // month number without leading zeros
+          'F' => 'm', // no format for full month name
+          'D' => 'd', // no format for 3 letter day name
+          'd' => 'dd', // day of month number with leading zeros
+          'l' => 'd', // no format for full day name
+          'j' => 'd', // day of month number without leading zeros
+          'W' => 'wk', // ISO week number
+          'H' => 'hh', // 24 hour hour with leading zeros
+          'h' => 'hh', // no format for 12 hour hour with leading zeros
+          'i' => 'mi', // minutes with leading zeros
+          's' => 'ss', // seconds with leading zeros
+          'A' => '', // no format for  AM/PM
+          '\WW' => '', // Week number
+          );
+        $format = strtr($format, $replace);
+        return "DATEPART($format, $field)";
     }
   }