Merge pull request #18 from owncloud/fixing-sqlserver-master

Fixing sqlserver master
owncloud-archive · Mar 12, 2013 · 63cb284 · 63cb284
2 parents 737b785 + 2c5a4c9
commit 63cb284
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/MDB2/Driver/Manager/sqlsrv.php b/MDB2/Driver/Manager/sqlsrv.php
@@ -713,7 +713,7 @@ function listTables($database = null)
             return $db;
         }
 
-        $query = 'EXEC sp_tables @table_type = "\'TABLE\'"';
+        $query = 'EXEC sp_tables @table_type = "\'TABLE\'", @table_owner = "dbo"';
         $table_names = $db->queryCol($query, null, 2);
         if (PEAR::isError($table_names)) {
             return $table_names;

diff --git a/MDB2/Driver/sqlsrv.php b/MDB2/Driver/sqlsrv.php
@@ -336,7 +336,11 @@ function _doConnect($username, $password, $database=null, $persistent = false)
             $host .= ','.$this->dsn['port'];
         }
 
-        $connection = @sqlsrv_connect($host, $params);
+        if (!empty($this->dsn['charset'])) {
+			$params['CharacterSet'] = $this->dsn['charset'];
+        }
+
+		$connection = @sqlsrv_connect($host, $params);
         if (!$connection) {
             return $this->raiseError(MDB2_ERROR_CONNECT_FAILED, null, null,
                 'unable to establish a connection', __FUNCTION__, __FUNCTION__);
@@ -345,12 +349,12 @@ function _doConnect($username, $password, $database=null, $persistent = false)
             $this->connected_database_name = $database;
         }
 
-        if (!empty($this->dsn['charset'])) {
-            $result = $this->setCharset($this->dsn['charset'], $connection);
-            if (PEAR::isError($result)) {
-                return $result;
-            }
-        }
+//        if (!empty($this->dsn['charset'])) {
+//            $result = $this->setCharset($this->dsn['charset'], $connection);
+//            if (PEAR::isError($result)) {
+//                return $result;
+//            }
+//        }
 
        if (empty($this->dsn['disable_iso_date'])) {
            @sqlsrv_query($connection,'SET DATEFORMAT ymd');