MSSQL datetime4 handling is the same as Sybase, only datetime8 differs

(cherry picked from commit bf20b64)
xp-framework · Dec 21, 2018 · 935ae27 · 935ae27
1 parent 44b8438
commit 935ae27
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 11 deletions.
diff --git a/src/main/php/rdbms/tds/TdsProtocol.class.php b/src/main/php/rdbms/tds/TdsProtocol.class.php
@@ -214,6 +214,11 @@ public function unmarshal($stream, $field, $records) {
         return $this->toDate($stream->getLong(), 0);
       }
     }');
+    self::$recordsFor[0][self::T_DATETIME4]= newinstance('rdbms.tds.TdsRecord', [], '{
+      public function unmarshal($stream, $field, $records) {
+        return $this->toDate($stream->getShort(), $stream->getShort() * 60);
+      }
+    }');
     self::$recordsFor[0][self::T_DATETIME]= newinstance('rdbms.tds.TdsRecord', [], '{
       public function unmarshal($stream, $field, $records) {
         return $this->toDate($stream->getLong(), $stream->getLong() / 300);

diff --git a/src/main/php/rdbms/tds/TdsV5Protocol.class.php b/src/main/php/rdbms/tds/TdsV5Protocol.class.php
@@ -91,11 +91,6 @@ public function unmarshal($stream, $field, $records) {
         } 
       }
     }');
-    self::$recordsFor[0][self::T_DATETIME4]= newinstance('rdbms.tds.TdsRecord', [], '{
-      public function unmarshal($stream, $field, $records) {
-        return $this->toDate($stream->getShort(), $stream->getShort() * 60);
-      }
-    }');
     self::$recordsFor[0][self::T_DATETIMN]= newinstance('rdbms.tds.TdsRecord', [], '{
       public function unmarshal($stream, $field, $records) {
         $len= isset($field["len"]) ? $field["len"] : $stream->getByte();

diff --git a/src/main/php/rdbms/tds/TdsV7Protocol.class.php b/src/main/php/rdbms/tds/TdsV7Protocol.class.php
@@ -114,16 +114,11 @@ public function unmarshal($stream, $field, $records) {
         return 0xFFFF === $len ? null : iconv("ucs-2le", \xp::ENCODING, $stream->read($len));
       }
     }');
-    self::$recordsFor[0][self::T_DATETIME4]= newinstance('rdbms.tds.TdsRecord', [], '{
-      public function unmarshal($stream, $field, $records) {
-        return $this->toDate($stream->getShort(), $stream->getShort() * 60 / 300);
-      }
-    }');
     self::$recordsFor[0][self::T_DATETIMN]= newinstance('rdbms.tds.TdsRecord', [], '{
       public function unmarshal($stream, $field, $records) {
         $len= isset($field["len"]) ? $field["len"] : $stream->getByte();
         switch ($len) {
-          case 4: return $this->toDate($stream->getShort(), $stream->getShort() * 60 / 300); break;
+          case 4: return $this->toDate($stream->getShort(), $stream->getShort() * 60; break;
           case 8: return $this->toDate($stream->getLong(), $stream->getLong() / 300); break;
           default: return null;
         }