Sql sessions for mssql (#1212)

* SQL: changed init session table so it will work on MSSQL Databases * SQL: changed rowCount by count of fetchAll rowCount does not always returns number of rows on SELECT queries, i.e. MSSQL returns -1
simplesamlphp · Oct 2, 2019 · 90268a7 · 90268a7
1 parent 30b2b03
commit 90268a7
Showing 1 changed file with 25 additions and 16 deletions.
diff --git a/lib/SimpleSAML/Store/SQL.php b/lib/SimpleSAML/Store/SQL.php
@@ -110,23 +110,29 @@ private function initKVTable()
         $current_version = $this->getTableVersion('kvstore');
 
         $text_t = 'TEXT';
+        $time_field = 'TIMESTAMP';
         if ($this->driver === 'mysql') {
             // TEXT data type has size constraints that can be hit at some point, so we use LONGTEXT instead
             $text_t = 'LONGTEXT';
         }
+        if ($this->driver === 'sqlsrv') {
+            // TIMESTAMP will not work for MSSQL. TIMESTAMP is automatically generated and cannot be inserted
+            //    so we use DATETIME instead
+            $time_field = 'DATETIME';
+        }
 
         /**
          * Queries for updates, grouped by version.
          * New updates can be added as a new array in this array
          */
         $table_updates = [
             [
-                'CREATE TABLE '.$this->prefix.
-                '_kvstore (_type VARCHAR(30) NOT NULL, _key VARCHAR(50) NOT NULL, _value '.$text_t.
-                ' NOT NULL, _expire TIMESTAMP, PRIMARY KEY (_key, _type))',
-                $this->driver === 'sqlite' ?
-                'CREATE INDEX '.$this->prefix.'_kvstore_expire ON '.$this->prefix.'_kvstore (_expire)' :
-                'ALTER TABLE '.$this->prefix.'_kvstore ADD INDEX '.$this->prefix.'_kvstore_expire (_expire)'                 
+                'CREATE TABLE ' . $this->prefix .
+                '_kvstore (_type VARCHAR(30) NOT NULL, _key VARCHAR(50) NOT NULL, _value ' . $text_t .
+                ' NOT NULL, _expire ' . $time_field . ', PRIMARY KEY (_key, _type))',
+                $this->driver === 'sqlite' || $this->driver === 'sqlsrv' ?
+                'CREATE INDEX ' . $this->prefix . '_kvstore_expire ON ' . $this->prefix . '_kvstore (_expire)' :
+                'ALTER TABLE ' . $this->prefix . '_kvstore ADD INDEX ' . $this->prefix . '_kvstore_expire (_expire)'
             ],
             /**
              * This upgrade removes the default NOT NULL constraint on the _expire field in MySQL.
@@ -138,15 +144,18 @@ private function initKVTable()
              *     Read the index
              */
             [
-                'CREATE TABLE '.$this->prefix.
-                '_kvstore_new (_type VARCHAR(30) NOT NULL, _key VARCHAR(50) NOT NULL, _value '.$text_t.
-                ' NOT NULL, _expire TIMESTAMP NULL, PRIMARY KEY (_key, _type))',
-                'INSERT INTO '.$this->prefix.'_kvstore_new SELECT * FROM '.$this->prefix.'_kvstore',
-                'DROP TABLE '.$this->prefix.'_kvstore',
-                'ALTER TABLE '.$this->prefix.'_kvstore_new RENAME TO '.$this->prefix.'_kvstore',
-                $this->driver === 'sqlite' ?
-                'CREATE INDEX '.$this->prefix.'_kvstore_expire ON '.$this->prefix.'_kvstore (_expire)' :
-                'ALTER TABLE '.$this->prefix.'_kvstore ADD INDEX '.$this->prefix.'_kvstore_expire (_expire)'                
+                'CREATE TABLE ' . $this->prefix .
+                '_kvstore_new (_type VARCHAR(30) NOT NULL, _key VARCHAR(50) NOT NULL, _value ' . $text_t .
+                ' NOT NULL, _expire ' . $time_field . ' NULL, PRIMARY KEY (_key, _type))',
+                'INSERT INTO ' . $this->prefix . '_kvstore_new SELECT * FROM ' . $this->prefix . '_kvstore',
+                'DROP TABLE ' . $this->prefix . '_kvstore',
+                // FOR MSSQL use EXEC sp_rename to rename a table (RENAME won't work)
+                $this->driver === 'sqlsrv' ?
+                'EXEC sp_rename ' . $this->prefix . '_kvstore_new, ' . $this->prefix . '_kvstore' :
+                'ALTER TABLE '. $this->prefix . '_kvstore_new RENAME TO ' . $this->prefix . '_kvstore',
+                $this->driver === 'sqlite' || $this->driver === 'sqlsrv' ?
+                'CREATE INDEX ' . $this->prefix . '_kvstore_expire ON ' . $this->prefix . '_kvstore (_expire)' :
+                'ALTER TABLE ' . $this->prefix . '_kvstore ADD INDEX ' . $this->prefix . '_kvstore_expire (_expire)'
             ]
         ];
 
@@ -257,7 +266,7 @@ public function insertOrUpdate($table, array $keys, array $data)
                 $selectQuery = $this->pdo->prepare($selectQuery);
                 $selectQuery->execute($condData);
 
-                if ($selectQuery->rowCount() > 0) {
+                if (count($selectQuery->fetchAll()) > 0) {
                     // Update
                     $insertOrUpdateQuery = 'UPDATE '.$table.' SET '.implode(',', $updateCols).' WHERE '.implode(' AND ', $condCols);
                     $insertOrUpdateQuery = $this->pdo->prepare($insertOrUpdateQuery);