Released version 3.0.3

SqlsrvDriver: fixed: sql server does not respond on non-string password

appveyor.yml

@@ -6,6 +6,8 @@ cache:
 clone_folder: c:\projects\dibi
 
 services:
+    - mssql2012sp1
+    - mssql2014
     - mysql
 
 init:
@@ -21,6 +23,10 @@ install:
     - IF %PHP%==1 7z x php-5.6.14-Win32-VC11-x86.zip >nul
     - IF %PHP%==1 echo extension_dir=ext >> php.ini
     - IF %PHP%==1 echo extension=php_openssl.dll >> php.ini
+    - IF %PHP%==1 appveyor DownloadFile https://files.nette.org/misc/php-sqlsrv.zip
+    - IF %PHP%==1 7z x php-sqlsrv.zip >nul
+    - IF %PHP%==1 copy SQLSRV\php_sqlsrv_56_ts.dll ext\php_sqlsrv_ts.dll
+    - IF %PHP%==1 copy SQLSRV\php_pdo_sqlsrv_56_ts.dll ext\php_pdo_sqlsrv_ts.dll
     - IF %PHP%==1 del /Q *.zip
     - cd c:\projects\dibi
 

examples/connecting-to-databases.php

@@ -112,6 +112,22 @@ try {
 echo "</p>\n";
 
 
+// connects to MS SQL
+echo '<p>Connecting to MS SQL: ';
+try {
+	dibi::connect([
+		'driver' => 'mssql',
+		'host' => 'localhost',
+		'username' => 'root',
+		'password' => 'xxx',
+	]);
+	echo 'OK';
+} catch (Dibi\Exception $e) {
+	echo get_class($e), ': ', $e->getMessage(), "\n";
+}
+echo "</p>\n";
+
+
 // connects to SQLSRV
 echo '<p>Connecting to Microsoft SQL Server: ';
 try {

src/Dibi/Bridges/Nette/DibiExtension22.php

@@ -7,6 +7,7 @@
 
 namespace Dibi\Bridges\Nette;
 
+use Dibi;
 use Nette;
 
 
@@ -47,7 +48,10 @@ class DibiExtension22 extends Nette\DI\CompilerExtension
 		}
 		if ($useProfiler) {
 			$panel = $container->addDefinition($this->prefix('panel'))
-				->setClass('Dibi\Bridges\Tracy\Panel');
+				->setClass('Dibi\Bridges\Tracy\Panel', [
+					isset($config['explain']) ? $config['explain'] : TRUE,
+					isset($config['filter']) && $config['filter'] === FALSE ? Dibi\Event::ALL : Dibi\Event::QUERY,
+				]);
 			$connection->addSetup([$panel, 'register'], [$connection]);
 		}
 	}

src/Dibi/Drivers/FirebirdDriver.php

@@ -268,7 +268,7 @@ class FirebirdDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 
 	public function escapeIdentifier($value)
 	{
-		return $value;
+		return '"' . str_replace('"', '""', $value). '"';
 	}
 
 

src/Dibi/Drivers/MsSqlDriver.php

@@ -0,0 +1,386 @@
+<?php
+
+/**
+ * This file is part of the "dibi" - smart database abstraction layer.
+ * Copyright (c) 2005 David Grudl (https://davidgrudl.com)
+ */
+
+namespace Dibi\Drivers;
+
+use Dibi;
+
+
+/**
+ * The dibi driver for MS SQL database.
+ *
+ * Driver options:
+ *   - host => the MS SQL server host name. It can also include a port number (hostname:port)
+ *   - username (or user)
+ *   - password (or pass)
+ *   - database => the database name to select
+ *   - persistent (bool) => try to find a persistent link?
+ *   - resource (resource) => existing connection resource
+ *   - lazy, profiler, result, substitutes, ... => see Dibi\Connection options
+ */
+class MsSqlDriver implements Dibi\Driver, Dibi\ResultDriver
+{
+	use Dibi\Strict;
+
+	/** @var resource  Connection resource */
+	private $connection;
+
+	/** @var resource  Resultset resource */
+	private $resultSet;
+
+	/** @var bool */
+	private $autoFree = TRUE;
+
+
+	/**
+	 * @throws Dibi\NotSupportedException
+	 */
+	public function __construct()
+	{
+		if (!extension_loaded('mssql')) {
+			throw new Dibi\NotSupportedException("PHP extension 'mssql' is not loaded.");
+		}
+	}
+
+
+	/**
+	 * Connects to a database.
+	 * @return void
+	 * @throws Dibi\Exception
+	 */
+	public function connect(array & $config)
+	{
+		if (isset($config['resource'])) {
+			$this->connection = $config['resource'];
+		} elseif (empty($config['persistent'])) {
+			$this->connection = @mssql_connect($config['host'], $config['username'], $config['password'], TRUE); // intentionally @
+		} else {
+			$this->connection = @mssql_pconnect($config['host'], $config['username'], $config['password']); // intentionally @
+		}
+
+		if (!is_resource($this->connection)) {
+			throw new Dibi\DriverException("Can't connect to DB.");
+		}
+
+		if (isset($config['database']) && !@mssql_select_db($this->escapeIdentifier($config['database']), $this->connection)) { // intentionally @
+			throw new Dibi\DriverException("Can't select DB '$config[database]'.");
+		}
+	}
+
+
+	/**
+	 * Disconnects from a database.
+	 * @return void
+	 */
+	public function disconnect()
+	{
+		mssql_close($this->connection);
+	}
+
+
+	/**
+	 * Executes the SQL query.
+	 * @param  string      SQL statement.
+	 * @return Dibi\ResultDriver|NULL
+	 * @throws Dibi\DriverException
+	 */
+	public function query($sql)
+	{
+		$res = @mssql_query($sql, $this->connection); // intentionally @
+
+		if ($res === FALSE) {
+			throw new Dibi\DriverException(mssql_get_last_message(), 0, $sql);
+
+		} elseif (is_resource($res)) {
+			return $this->createResultDriver($res);
+		}
+	}
+
+
+	/**
+	 * Gets the number of affected rows by the last INSERT, UPDATE or DELETE query.
+	 * @return int|FALSE  number of rows or FALSE on error
+	 */
+	public function getAffectedRows()
+	{
+		return mssql_rows_affected($this->connection);
+	}
+
+
+	/**
+	 * Retrieves the ID generated for an AUTO_INCREMENT column by the previous INSERT query.
+	 * @return int|FALSE  int on success or FALSE on failure
+	 */
+	public function getInsertId($sequence)
+	{
+		$res = mssql_query('SELECT @@IDENTITY', $this->connection);
+		if (is_resource($res)) {
+			$row = mssql_fetch_row($res);
+			return $row[0];
+		}
+		return FALSE;
+	}
+
+
+	/**
+	 * Begins a transaction (if supported).
+	 * @param  string  optional savepoint name
+	 * @return void
+	 * @throws Dibi\DriverException
+	 */
+	public function begin($savepoint = NULL)
+	{
+		$this->query('BEGIN TRANSACTION');
+	}
+
+
+	/**
+	 * Commits statements in a transaction.
+	 * @param  string  optional savepoint name
+	 * @return void
+	 * @throws Dibi\DriverException
+	 */
+	public function commit($savepoint = NULL)
+	{
+		$this->query('COMMIT');
+	}
+
+
+	/**
+	 * Rollback changes in a transaction.
+	 * @param  string  optional savepoint name
+	 * @return void
+	 * @throws Dibi\DriverException
+	 */
+	public function rollback($savepoint = NULL)
+	{
+		$this->query('ROLLBACK');
+	}
+
+
+	/**
+	 * Returns the connection resource.
+	 * @return mixed
+	 */
+	public function getResource()
+	{
+		return is_resource($this->connection) ? $this->connection : NULL;
+	}
+
+
+	/**
+	 * Returns the connection reflector.
+	 * @return Dibi\Reflector
+	 */
+	public function getReflector()
+	{
+		return new MsSqlReflector($this);
+	}
+
+
+	/**
+	 * Result set driver factory.
+	 * @param  resource
+	 * @return Dibi\ResultDriver
+	 */
+	public function createResultDriver($resource)
+	{
+		$res = clone $this;
+		$res->resultSet = $resource;
+		return $res;
+	}
+
+
+	/********************* SQL ****************d*g**/
+
+
+	/**
+	 * Encodes data for use in a SQL statement.
+	 * @param  mixed     value
+	 * @return string    encoded value
+	 */
+	public function escapeText($value)
+	{
+		return "'" . str_replace("'", "''", $value) . "'";
+	}
+
+
+	public function escapeBinary($value)
+	{
+		return "'" . str_replace("'", "''", $value) . "'";
+	}
+
+
+	public function escapeIdentifier($value)
+	{
+		// @see https://msdn.microsoft.com/en-us/library/ms176027.aspx
+		return '[' . str_replace(['[', ']'], ['[[', ']]'], $value) . ']';
+	}
+
+
+	public function escapeBool($value)
+	{
+		return $value ? 1 : 0;
+	}
+
+
+	public function escapeDate($value)
+	{
+		if (!$value instanceof \DateTime && !$value instanceof \DateTimeInterface) {
+			$value = new Dibi\DateTime($value);
+		}
+		return $value->format("'Y-m-d'");
+	}
+
+
+	public function escapeDateTime($value)
+	{
+		if (!$value instanceof \DateTime && !$value instanceof \DateTimeInterface) {
+			$value = new Dibi\DateTime($value);
+		}
+		return $value->format("'Y-m-d H:i:s'");
+	}
+
+
+	/**
+	 * Encodes string for use in a LIKE statement.
+	 * @param  string
+	 * @param  int
+	 * @return string
+	 */
+	public function escapeLike($value, $pos)
+	{
+		$value = strtr($value, ["'" => "''", '%' => '[%]', '_' => '[_]', '[' => '[[]']);
+		return ($pos <= 0 ? "'%" : "'") . $value . ($pos >= 0 ? "%'" : "'");
+	}
+
+
+	/**
+	 * Decodes data from result set.
+	 * @param  string
+	 * @return string
+	 */
+	public function unescapeBinary($value)
+	{
+		return $value;
+	}
+
+
+	/** @deprecated */
+	public function escape($value, $type)
+	{
+		trigger_error(__METHOD__ . '() is deprecated.', E_USER_DEPRECATED);
+		return Dibi\Helpers::escape($this, $value, $type);
+	}
+
+
+	/**
+	 * Injects LIMIT/OFFSET to the SQL query.
+	 * @return void
+	 */
+	public function applyLimit(& $sql, $limit, $offset)
+	{
+		if ($offset) {
+			throw new Dibi\NotSupportedException('Offset is not supported by this database.');
+
+		} elseif ($limit < 0) {
+			throw new Dibi\NotSupportedException('Negative offset or limit.');
+
+		} elseif ($limit !== NULL) {
+			$sql = 'SELECT TOP ' . (int) $limit . ' * FROM (' . $sql . ') t';
+		}
+	}
+
+
+	/********************* result set ****************d*g**/
+
+
+	/**
+	 * Automatically frees the resources allocated for this result set.
+	 * @return void
+	 */
+	public function __destruct()
+	{
+		$this->autoFree && $this->getResultResource() && $this->free();
+	}
+
+
+	/**
+	 * Returns the number of rows in a result set.
+	 * @return int
+	 */
+	public function getRowCount()
+	{
+		return mssql_num_rows($this->resultSet);
+	}
+
+
+	/**
+	 * Fetches the row at current position and moves the internal cursor to the next position.
+	 * @param  bool     TRUE for associative array, FALSE for numeric
+	 * @return array    array on success, nonarray if no next record
+	 */
+	public function fetch($assoc)
+	{
+		return mssql_fetch_array($this->resultSet, $assoc ? MSSQL_ASSOC : MSSQL_NUM);
+	}
+
+
+	/**
+	 * Moves cursor position without fetching row.
+	 * @param  int      the 0-based cursor pos to seek to
+	 * @return boolean  TRUE on success, FALSE if unable to seek to specified record
+	 */
+	public function seek($row)
+	{
+		return mssql_data_seek($this->resultSet, $row);
+	}
+
+
+	/**
+	 * Frees the resources allocated for this result set.
+	 * @return void
+	 */
+	public function free()
+	{
+		mssql_free_result($this->resultSet);
+		$this->resultSet = NULL;
+	}
+
+
+	/**
+	 * Returns metadata for all columns in a result set.
+	 * @return array
+	 */
+	public function getResultColumns()
+	{
+		$count = mssql_num_fields($this->resultSet);
+		$columns = [];
+		for ($i = 0; $i < $count; $i++) {
+			$row = (array) mssql_fetch_field($this->resultSet, $i);
+			$columns[] = [
+				'name' => $row['name'],
+				'fullname' => $row['column_source'] ? $row['column_source'] . '.' . $row['name'] : $row['name'],
+				'table' => $row['column_source'],
+				'nativetype' => $row['type'],
+			];
+		}
+		return $columns;
+	}
+
+
+	/**
+	 * Returns the result set resource.
+	 * @return mixed
+	 */
+	public function getResultResource()
+	{
+		$this->autoFree = FALSE;
+		return is_resource($this->resultSet) ? $this->resultSet : NULL;
+	}
+
+}

src/Dibi/Drivers/MsSqlReflector.php

@@ -0,0 +1,216 @@
+<?php
+
+/**
+ * This file is part of the "dibi" - smart database abstraction layer.
+ * Copyright (c) 2005 David Grudl (https://davidgrudl.com)
+ */
+
+namespace Dibi\Drivers;
+
+use Dibi;
+
+
+/**
+ * The dibi reflector for MS SQL databases.
+ * @internal
+ */
+class MsSqlReflector implements Dibi\Reflector
+{
+	use Dibi\Strict;
+
+	/** @var Dibi\Driver */
+	private $driver;
+
+
+	public function __construct(Dibi\Driver $driver)
+	{
+		$this->driver = $driver;
+	}
+
+
+	/**
+	 * Returns list of tables.
+	 * @return array
+	 */
+	public function getTables()
+	{
+		$res = $this->driver->query('
+			SELECT TABLE_NAME, TABLE_TYPE
+			FROM INFORMATION_SCHEMA.TABLES
+		');
+		$tables = [];
+		while ($row = $res->fetch(FALSE)) {
+			$tables[] = [
+				'name' => $row[0],
+				'view' => isset($row[1]) && $row[1] === 'VIEW',
+			];
+		}
+		return $tables;
+	}
+
+
+	/**
+	 * Returns count of rows in a table
+	 * @param  string
+	 * @return int
+	 */
+	public function getTableCount($table, $fallback = TRUE)
+	{
+		if (empty($table)) {
+			return FALSE;
+		}
+		$result = $this->driver->query("
+			SELECT MAX(rowcnt)
+			FROM sys.sysindexes
+			WHERE id=OBJECT_ID({$this->driver->escapeIdentifier($table)})
+		");
+		$row = $result->fetch(FALSE);
+
+		if (!is_array($row) || count($row) < 1) {
+			if ($fallback) {
+				$row = $this->driver->query("SELECT COUNT(*) FROM {$this->driver->escapeIdentifier($table)}")->fetch(FALSE);
+				$count = intval($row[0]);
+			} else {
+				$count = FALSE;
+			}
+		} else {
+			$count = intval($row[0]);
+		}
+
+		return $count;
+	}
+
+
+	/**
+	 * Returns metadata for all columns in a table.
+	 * @param  string
+	 * @return array
+	 */
+	public function getColumns($table)
+	{
+		$res = $this->driver->query("
+			SELECT * FROM
+			INFORMATION_SCHEMA.COLUMNS
+			WHERE TABLE_NAME = {$this->driver->escapeText($table)}
+			ORDER BY TABLE_NAME, ORDINAL_POSITION
+		");
+		$columns = [];
+		while ($row = $res->fetch(TRUE)) {
+			$size = FALSE;
+			$type = strtoupper($row['DATA_TYPE']);
+
+			$size_cols = [
+				'DATETIME' => 'DATETIME_PRECISION',
+				'DECIMAL' => 'NUMERIC_PRECISION',
+				'CHAR' => 'CHARACTER_MAXIMUM_LENGTH',
+				'NCHAR' => 'CHARACTER_OCTET_LENGTH',
+				'NVARCHAR' => 'CHARACTER_OCTET_LENGTH',
+				'VARCHAR' => 'CHARACTER_OCTET_LENGTH',
+			];
+
+			if (isset($size_cols[$type])) {
+				if ($size_cols[$type]) {
+					$size = $row[$size_cols[$type]];
+				}
+			}
+
+			$columns[] = [
+				'name' => $row['COLUMN_NAME'],
+				'table' => $table,
+				'nativetype' => $type,
+				'size' => $size,
+				'unsigned' => NULL,
+				'nullable' => $row['IS_NULLABLE'] === 'YES',
+				'default' => $row['COLUMN_DEFAULT'],
+				'autoincrement' => FALSE,
+				'vendor' => $row,
+			];
+		}
+
+		return $columns;
+	}
+
+
+	/**
+	 * Returns metadata for all indexes in a table.
+	 * @param  string
+	 * @return array
+	 */
+	public function getIndexes($table)
+	{
+		$res = $this->driver->query(
+			"SELECT ind.name index_name, ind.index_id, ic.index_column_id,
+					col.name column_name, ind.is_unique, ind.is_primary_key
+			FROM sys.indexes ind
+			INNER JOIN sys.index_columns ic ON
+				(ind.object_id = ic.object_id AND ind.index_id = ic.index_id)
+			INNER JOIN sys.columns col ON
+				(ic.object_id = col.object_id and ic.column_id = col.column_id)
+			INNER JOIN sys.tables t ON
+				(ind.object_id = t.object_id)
+			WHERE t.name = {$this->driver->escapeText($table)}
+				AND t.is_ms_shipped = 0
+			ORDER BY
+				t.name, ind.name, ind.index_id, ic.index_column_id
+		");
+
+		$indexes = [];
+		while ($row = $res->fetch(TRUE)) {
+			$index_name = $row['index_name'];
+
+			if (!isset($indexes[$index_name])) {
+				$indexes[$index_name] = [];
+				$indexes[$index_name]['name'] = $index_name;
+				$indexes[$index_name]['unique'] = (bool) $row['is_unique'];
+				$indexes[$index_name]['primary'] = (bool) $row['is_primary_key'];
+				$indexes[$index_name]['columns'] = [];
+			}
+			$indexes[$index_name]['columns'][] = $row['column_name'];
+		}
+
+		return array_values($indexes);
+	}
+
+
+	/**
+	 * Returns metadata for all foreign keys in a table.
+	 * @param  string
+	 * @return array
+	 */
+	public function getForeignKeys($table)
+	{
+		$res = $this->driver->query("
+			SELECT f.name AS foreign_key,
+			OBJECT_NAME(f.parent_object_id) AS table_name,
+			COL_NAME(fc.parent_object_id,
+			fc.parent_column_id) AS column_name,
+			OBJECT_NAME (f.referenced_object_id) AS reference_table_name,
+			COL_NAME(fc.referenced_object_id,
+			fc.referenced_column_id) AS reference_column_name,
+			fc.*
+			FROM sys.foreign_keys AS f
+			INNER JOIN sys.foreign_key_columns AS fc
+			ON f.OBJECT_ID = fc.constraint_object_id
+			WHERE OBJECT_NAME(f.parent_object_id) = {$this->driver->escapeText($table)}
+		");
+
+		$keys = [];
+		while ($row = $res->fetch(TRUE)) {
+			$key_name = $row['foreign_key'];
+
+			if (!isset($keys[$key_name])) {
+				$keys[$key_name]['name'] = $row['foreign_key']; // foreign key name
+				$keys[$key_name]['local'] = [$row['column_name']]; // local columns
+				$keys[$key_name]['table'] = $row['reference_table_name']; // referenced table
+				$keys[$key_name]['foreign'] = [$row['reference_column_name']]; // referenced columns
+				$keys[$key_name]['onDelete'] = FALSE;
+				$keys[$key_name]['onUpdate'] = FALSE;
+			} else {
+				$keys[$key_name]['local'][] = $row['column_name']; // local columns
+				$keys[$key_name]['foreign'][] = $row['reference_column_name']; // referenced columns
+			}
+		}
+		return array_values($keys);
+	}
+
+}

src/Dibi/Drivers/PdoDriver.php

@@ -291,6 +291,7 @@ class PdoDriver implements Dibi\Driver, Dibi\ResultDriver
 				return '[' . strtr($value, '[]', '  ') . ']';
 
 			case 'odbc':
+			case 'mssql':
 				return '[' . str_replace(['[', ']'], ['[[', ']]'], $value) . ']';
 
 			case 'dblib':
@@ -360,6 +361,7 @@ class PdoDriver implements Dibi\Driver, Dibi\ResultDriver
 				return ($pos <= 0 ? "'%" : "'") . $value . ($pos >= 0 ? "%'" : "'") . " ESCAPE '\\'";
 
 			case 'odbc':
+			case 'mssql':
 			case 'dblib':
 			case 'sqlsrv':
 				$value = strtr($value, ["'" => "''", '%' => '[%]', '_' => '[_]', '[' => '[[]']);
@@ -437,13 +439,15 @@ class PdoDriver implements Dibi\Driver, Dibi\ResultDriver
 				}
 				break;
 
+			case 'mssql':
 			case 'sqlsrv':
 			case 'dblib':
 				if (version_compare($this->serverVersion, '11.0') >= 0) { // 11 == SQL Server 2012
-					if ($limit !== NULL || $offset) {
-						// requires ORDER BY, see https://technet.microsoft.com/en-us/library/gg699618(v=sql.110).aspx
-						$sql .= ' OFFSET ' . (int) $offset . ' ROWS '
-							. 'FETCH NEXT ' . (int) $limit . ' ROWS ONLY';
+					// requires ORDER BY, see https://technet.microsoft.com/en-us/library/gg699618(v=sql.110).aspx
+					if ($limit !== NULL) {
+						$sql = sprintf('%s OFFSET %d ROWS FETCH NEXT %d ROWS ONLY', rtrim($sql), $offset, $limit);
+					} elseif ($offset) {
+						$sql = sprintf('%s OFFSET %d ROWS', rtrim($sql), $offset);
 					}
 					break;
 				}

src/Dibi/Drivers/SqlsrvDriver.php

@@ -72,12 +72,17 @@ class SqlsrvDriver implements Dibi\Driver, Dibi\ResultDriver
 			$this->connection = $config['resource'];
 
 		} else {
-			// Default values
-			if (!isset($config['options']['CharacterSet'])) {
-				$config['options']['CharacterSet'] = 'UTF-8';
-			}
+			$options = & $config['options'];
 
-			$this->connection = sqlsrv_connect($config['host'], (array) $config['options']);
+			// Default values
+			if (!isset($options['CharacterSet'])) {
+				$options['CharacterSet'] = 'UTF-8';
+			}
+			$options['PWD'] = (string) $options['PWD'];
+			$options['UID'] = (string) $options['UID'];
+			$options['Database'] = (string) $options['Database'];
+
+			$this->connection = sqlsrv_connect($config['host'], $options);
 		}
 
 		if (!is_resource($this->connection)) {
@@ -311,13 +316,15 @@ class SqlsrvDriver implements Dibi\Driver, Dibi\ResultDriver
 				throw new Dibi\NotSupportedException('Offset is not supported by this database.');
 
 			} elseif ($limit !== NULL) {
-				$sql = 'SELECT TOP ' . (int) $limit . ' * FROM (' . $sql . ') t';
+				$sql = sprintf('SELECT TOP (%d) * FROM (%s) t', $limit, $sql);
 			}
 
-		} elseif ($limit !== NULL || $offset) {
+		} elseif ($limit !== NULL) {
 			// requires ORDER BY, see https://technet.microsoft.com/en-us/library/gg699618(v=sql.110).aspx
-			$sql .= ' OFFSET ' . (int) $offset . ' ROWS '
-				. 'FETCH NEXT ' . (int) $limit . ' ROWS ONLY';
+			$sql = sprintf('%s OFFSET %d ROWS FETCH NEXT %d ROWS ONLY', rtrim($sql), $offset, $limit);
+		} elseif ($offset) {
+			// requires ORDER BY, see https://technet.microsoft.com/en-us/library/gg699618(v=sql.110).aspx
+			$sql = sprintf('%s OFFSET %d ROWS', rtrim($sql), $offset);
 		}
 	}
 

src/Dibi/Drivers/SqlsrvReflector.php

@@ -34,7 +34,7 @@ class SqlsrvReflector implements Dibi\Reflector
 	 */
 	public function getTables()
 	{
-		$res = $this->driver->query('SELECT TABLE_NAME, TABLE_TYPE FROM INFORMATION_SCHEMA.TABLES');
+		$res = $this->driver->query("SELECT TABLE_NAME, TABLE_TYPE FROM INFORMATION_SCHEMA.TABLES WHERE [TABLE_SCHEMA] = 'dbo'");
 		$tables = [];
 		while ($row = $res->fetch(FALSE)) {
 			$tables[] = [
@@ -105,19 +105,19 @@ class SqlsrvReflector implements Dibi\Reflector
 	 */
 	public function getIndexes($table)
 	{
-		$keyUsagesRes = $this->driver->query("SELECT * FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE WHERE TABLE_NAME = {$this->driver->escapeText($table)}");
+		$keyUsagesRes = $this->driver->query(sprintf("EXEC [sys].[sp_helpindex] @objname = N%s", $this->driver->escapeText($table)));
 		$keyUsages = [];
 		while ($row = $keyUsagesRes->fetch(TRUE)) {
-			$keyUsages[$row['CONSTRAINT_NAME']][(int) $row['ORDINAL_POSITION'] - 1] = $row['COLUMN_NAME'];
+			$keyUsages[$row['index_name']] = explode(',', $row['index_keys']);
 		}
 
-		$res = $this->driver->query("SELECT * FROM INFORMATION_SCHEMA.TABLE_CONSTRAINTS WHERE TABLE_NAME = {$this->driver->escapeText($table)}");
+		$res = $this->driver->query("SELECT [i].* FROM [sys].[indexes] [i] INNER JOIN [sys].[tables] [t] ON [i].[object_id] = [t].[object_id] WHERE [t].[name] = {$this->driver->escapeText($table)}");
 		$indexes = [];
 		while ($row = $res->fetch(TRUE)) {
-			$indexes[$row['CONSTRAINT_NAME']]['name'] = $row['CONSTRAINT_NAME'];
-			$indexes[$row['CONSTRAINT_NAME']]['unique'] = $row['CONSTRAINT_TYPE'] === 'UNIQUE';
-			$indexes[$row['CONSTRAINT_NAME']]['primary'] = $row['CONSTRAINT_TYPE'] === 'PRIMARY KEY';
-			$indexes[$row['CONSTRAINT_NAME']]['columns'] = isset($keyUsages[$row['CONSTRAINT_NAME']]) ? $keyUsages[$row['CONSTRAINT_NAME']] : [];
+			$indexes[$row['name']]['name'] = $row['name'];
+			$indexes[$row['name']]['unique'] = $row['is_unique'] === 1;
+			$indexes[$row['name']]['primary'] = $row['is_primary_key'] === 1;
+			$indexes[$row['name']]['columns'] = isset($keyUsages[$row['name']]) ? $keyUsages[$row['name']] : [];
 		}
 		return array_values($indexes);
 	}

src/Dibi/Helpers.php

@@ -183,7 +183,7 @@ class Helpers
 		static $patterns = [
 			'^_' => Type::TEXT, // PostgreSQL arrays
 			'BYTEA|BLOB|BIN' => Type::BINARY,
-			'TEXT|CHAR|POINT|INTERVAL' => Type::TEXT,
+			'TEXT|CHAR|POINT|INTERVAL|STRING' => Type::TEXT,
 			'YEAR|BYTE|COUNTER|SERIAL|INT|LONG|SHORT|^TINY$' => Type::INTEGER,
 			'CURRENCY|REAL|MONEY|FLOAT|DOUBLE|DECIMAL|NUMERIC|NUMBER' => Type::FLOAT,
 			'^TIME$' => Type::TIME,

src/Dibi/dibi.php

@@ -22,8 +22,8 @@ class dibi
 
 	/** version */
 	const
-		VERSION = '3.0.1',
-		REVISION = 'released on 2015-12-16';
+		VERSION = '3.0.3',
+		REVISION = 'released on 2016-02-21';
 
 	/** sorting order */
 	const

src/loader.php

@@ -26,6 +26,8 @@ spl_autoload_register(function ($class) {
 		'Dibi\Drivers\FirebirdDriver' => 'Drivers/FirebirdDriver.php',
 		'Dibi\Drivers\SqlsrvDriver' => 'Drivers/SqlsrvDriver.php',
 		'Dibi\Drivers\SqlsrvReflector' => 'Drivers/SqlsrvReflector.php',
+		'Dibi\Drivers\MsSqlDriver' => 'Drivers/MsSqlDriver.php',
+		'Dibi\Drivers\MsSqlReflector' => 'Drivers/MsSqlReflector.php',
 		'Dibi\Drivers\MySqlDriver' => 'Drivers/MySqlDriver.php',
 		'Dibi\Drivers\MySqliDriver' => 'Drivers/MySqliDriver.php',
 		'Dibi\Drivers\MySqlReflector' => 'Drivers/MySqlReflector.php',
@@ -84,6 +86,8 @@ spl_autoload_register(function ($class) {
 		'DibiLiteral' => 'Dibi\Literal',
 		'DibiMsSql2005Driver' => 'Dibi\Drivers\SqlsrvDriver',
 		'DibiMsSql2005Reflector' => 'Dibi\Drivers\SqlsrvReflector',
+		'DibiMsSqlDriver' => 'Dibi\Drivers\MsSqlDriver',
+		'DibiMsSqlReflector' => 'Dibi\Drivers\MsSqlReflector',
 		'DibiMySqlDriver' => 'Dibi\Drivers\MySqlDriver',
 		'DibiMySqliDriver' => 'Dibi\Drivers\MySqliDriver',
 		'DibiMySqlReflector' => 'Dibi\Drivers\MySqlReflector',

tests/databases.appveyor.ini

@@ -42,3 +42,48 @@ dsn = "odbc:Driver={Microsoft Access Driver (*.mdb)};Dbq=data/odbc.mdb"
 username =
 password =
 system = odbc
+
+;[sqlsrv 2008]
+;driver = sqlsrv
+;host = "(local)\SQL2008R2SP2"
+;database = master
+;username = sa
+;password = "Password12!"
+;system = sqlsrv
+
+;[sqlsrv 2008-pdo]
+;driver = pdo
+;dsn = "sqlsrv:Server=(local)\SQL2008R2SP2;Database=master"
+;username = sa
+;password = "Password12!"
+;system = sqlsrv
+
+[sqlsrv 2012]
+driver = sqlsrv
+host = "(local)\SQL2012SP1"
+database = master
+username = sa
+password = "Password12!"
+system = sqlsrv
+
+;[sqlsrv 2012-pdo]
+;driver = pdo
+;dsn = "sqlsrv:Server=(local)\SQL2012SP1;Database=master"
+;username = sa
+;password = "Password12!"
+;system = sqlsrv
+
+[sqlsrv 2014]
+driver = sqlsrv
+host = "(local)\SQL2014"
+database = master
+username = sa
+password = "Password12!"
+system = sqlsrv
+
+;[sqlsrv 2014-pdo]
+;driver = pdo
+;dsn = "sqlsrv:Server=(local)\SQL2014;Database=master"
+;username = sa
+;password = "Password12!"
+;system = sqlsrv

tests/databases.sample.ini

@@ -57,6 +57,20 @@ username =
 password =
 system = odbc
 
+[mssql]
+driver = mssql
+host = 127.0.0.1
+username = dibi
+password =
+system = mssql
+
+[mssql pdo]
+driver = pdo
+host = mssql:host=127.0.0.1;dbname=dibi_test
+username = dibi
+password =
+system = mssql
+
 [sqlsrv]
 driver = sqlsrv
 host = (local)

tests/dibi/Connection.fetch.phpt

@@ -14,7 +14,7 @@ $conn->loadFile(__DIR__ . "/data/$config[system].sql");
 
 
 // fetch a single value
-$res = $conn->query('SELECT [title] FROM [products]');
+$res = $conn->query('SELECT [title] FROM [products] ORDER BY [product_id]');
 Assert::same('Chair', $res->fetchSingle());
 
 
@@ -63,7 +63,7 @@ Assert::equal([
 // more complex association array
 function query($conn) {
 
-	return $conn->query($conn->getConfig('system') === 'odbc' ? '
+	return $conn->query(in_array($conn->getConfig('system'), ['odbc', 'sqlsrv']) ? '
 		SELECT products.title, customers.name, orders.amount
 		FROM ([products]
 		INNER JOIN [orders] ON [products.product_id] = [orders.product_id])

tests/dibi/Fluent.fetch.limit.mssql.phpt

@@ -40,28 +40,28 @@ $fluent = $conn->select('*')
 	->orderBy('customer_id');
 
 Assert::same(
-	reformat('SELECT TOP 1 * FROM (  SELECT * FROM [customers] ORDER BY [customer_id]) t'),
+	reformat('SELECT TOP (1) * FROM (  SELECT * FROM [customers] ORDER BY [customer_id]) t'),
 	(string) $fluent
 );
 
 
 $fluent->fetch();
 Assert::same(
-	'SELECT TOP 1 * FROM (  SELECT * FROM [customers] ORDER BY [customer_id]) t',
+	'SELECT TOP (1) * FROM (  SELECT * FROM [customers] ORDER BY [customer_id]) t',
 	dibi::$sql
 );
 $fluent->fetchSingle();
 Assert::same(
-	reformat('SELECT TOP 1 * FROM (  SELECT * FROM [customers] ORDER BY [customer_id]) t'),
+	reformat('SELECT TOP (1) * FROM (  SELECT * FROM [customers] ORDER BY [customer_id]) t'),
 	dibi::$sql
 );
 $fluent->fetchAll(0, 3);
 Assert::same(
-	reformat('SELECT TOP 3 * FROM (    SELECT * FROM [customers] ORDER BY [customer_id]) t'),
+	reformat('SELECT TOP (3) * FROM (    SELECT * FROM [customers] ORDER BY [customer_id]) t'),
 	dibi::$sql
 );
 Assert::same(
-	reformat('SELECT TOP 1 * FROM (  SELECT * FROM [customers] ORDER BY [customer_id]) t'),
+	reformat('SELECT TOP (1) * FROM (  SELECT * FROM [customers] ORDER BY [customer_id]) t'),
 	(string) $fluent
 );
 
@@ -69,16 +69,16 @@ Assert::same(
 $fluent->limit(0);
 $fluent->fetch();
 Assert::same(
-	reformat('SELECT TOP 0 * FROM (  SELECT * FROM [customers] ORDER BY [customer_id]) t'),
+	reformat('SELECT TOP (0) * FROM (  SELECT * FROM [customers] ORDER BY [customer_id]) t'),
 	dibi::$sql
 );
 $fluent->fetchSingle();
 Assert::same(
-	reformat('SELECT TOP 0 * FROM (  SELECT * FROM [customers] ORDER BY [customer_id]) t'),
+	reformat('SELECT TOP (0) * FROM (  SELECT * FROM [customers] ORDER BY [customer_id]) t'),
 	dibi::$sql
 );
 Assert::same(
-	reformat('SELECT TOP 0 * FROM (  SELECT * FROM [customers] ORDER BY [customer_id]) t'),
+	reformat('SELECT TOP (0) * FROM (  SELECT * FROM [customers] ORDER BY [customer_id]) t'),
 	(string) $fluent
 );
 
@@ -87,12 +87,12 @@ $fluent->removeClause('limit');
 $fluent->removeClause('offset');
 $fluent->fetch();
 Assert::same(
-	reformat('SELECT TOP 1 * FROM ( SELECT * FROM [customers] ORDER BY [customer_id]) t'),
+	reformat('SELECT TOP (1) * FROM ( SELECT * FROM [customers] ORDER BY [customer_id]) t'),
 	dibi::$sql
 );
 $fluent->fetchSingle();
 Assert::same(
-	reformat('SELECT TOP 1 * FROM ( SELECT * FROM [customers] ORDER BY [customer_id]) t'),
+	reformat('SELECT TOP (1) * FROM ( SELECT * FROM [customers] ORDER BY [customer_id]) t'),
 	dibi::$sql
 );
 Assert::same(

tests/dibi/Fluent.fetch.phpt

@@ -28,7 +28,7 @@ Assert::equal([
 
 
 // more complex association array
-if ($config['system'] !== 'odbc') {
+if (!in_array($config['system'], ['odbc', 'sqlsrv'])) {
 	$res = $conn->select(['products.title' => 'title', 'customers.name' => 'name'])->select('orders.amount')->as('amount')
 		->from('products')
 		->innerJoin('orders')->using('(product_id)')

tests/dibi/Fluent.select.phpt

@@ -94,6 +94,7 @@ $fluent = $conn->select('*')
 Assert::same(
 	reformat([
 		'odbc' => 'SELECT TOP 1 * FROM (  SELECT * , (SELECT count(*) FROM [precteni] AS [P] WHERE P.id_clanku = C.id_clanku) FROM [clanky] AS [C] WHERE id_clanku=123) t',
+		'sqlsrv' => '  SELECT * , (SELECT count(*) FROM [precteni] AS [P] WHERE P.id_clanku = C.id_clanku) FROM [clanky] AS [C] WHERE id_clanku=123 OFFSET 0 ROWS FETCH NEXT 1 ROWS ONLY',
 		'  SELECT * , (SELECT count(*) FROM [precteni] AS [P] WHERE P.id_clanku = C.id_clanku) FROM [clanky] AS [C] WHERE id_clanku=123 LIMIT 1',
 	]),
 	(string) $fluent

tests/dibi/Result.meta.phpt

@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @dataProvider ../databases.ini !=odbc
+ * @dataProvider ../databases.ini !=odbc, !=sqlsrv
  */
 
 use Tester\Assert;
@@ -13,9 +13,9 @@ $conn->loadFile(__DIR__ . "/data/$config[system].sql");
 
 $info = $conn->query('
 	SELECT products.product_id, orders.order_id, customers.name, products.product_id + 1 AS [xXx]
-	FROM products
-	INNER JOIN orders USING (product_id)
-	INNER JOIN customers USING (customer_id)
+	FROM ([products]
+	INNER JOIN [orders] ON [products.product_id] = [orders.product_id])
+	INNER JOIN [customers] ON [orders.customer_id] = [customers.customer_id]
 ')->getInfo();
 
 
@@ -25,7 +25,7 @@ Assert::same(
 );
 
 
-if ($config['driver'] !== 'sqlite3' && $config['driver'] !== 'pdo') {
+if (!in_array($config['driver'], ['sqlite3', 'pdo', 'sqlsrv'])) {
 	Assert::same(
 		['products.product_id', 'orders.order_id', 'customers.name', 'xXx'],
 		$info->getColumnNames(TRUE)
@@ -36,18 +36,18 @@ if ($config['driver'] !== 'sqlite3' && $config['driver'] !== 'pdo') {
 $columns = $info->getColumns();
 
 Assert::same('product_id', $columns[0]->getName());
-if ($config['driver'] !== 'sqlite3' && $config['driver'] !== 'pdo') {
+if (!in_array($config['driver'], ['sqlite3', 'pdo', 'sqlsrv'])) {
 	Assert::same('products', $columns[0]->getTableName());
 }
 Assert::null($columns[0]->getVendorInfo('xxx'));
-if ($config['system'] !== 'sqlite') {
+if (!in_array($config['system'], ['sqlite', 'sqlsrv'])) {
 	Assert::same('i', $columns[0]->getType());
 }
 Assert::null($columns[0]->isNullable());
 
 Assert::same('xXx', $columns[3]->getName());
 Assert::null($columns[3]->getTableName());
-if ($config['system'] !== 'sqlite') {
+if (!in_array($config['system'], ['sqlite', 'sqlsrv'])) {
 	Assert::same('i', $columns[0]->getType());
 }
 Assert::null($columns[3]->isNullable());

tests/dibi/Sqlsrv.limits.phpt

@@ -9,7 +9,10 @@ use Tester\Assert;
 require __DIR__ . '/bootstrap.php';
 
 $tests = function ($conn) {
-	$version = $conn->getDriver()->getResource()->getAttribute(PDO::ATTR_SERVER_VERSION);
+	$resource = $conn->getDriver()->getResource();
+	$version = is_resource($resource)
+		? sqlsrv_server_info($resource)['SQLServerVersion']
+		: $resource->getAttribute(PDO::ATTR_SERVER_VERSION);
 
 	// MsSQL2012+
 	if (version_compare($version, '11.0') >= 0) {
@@ -32,31 +35,43 @@ $tests = function ($conn) {
 		);
 
 		// Offset invalid
-		Assert::same(
-			'SELECT 1',
-			$conn->translate('SELECT 1 %ofs', -10)
+		Assert::error(
+			function () use ($conn) {
+				$conn->translate('SELECT 1 %ofs', -10);
+			},
+			'Dibi\NotSupportedException',
+			'Negative offset or limit.'
 		);
 
 		// Limit invalid
-		Assert::same(
-			'SELECT 1',
-			$conn->translate('SELECT 1 %lmt', -10)
+		Assert::error(
+			function () use ($conn) {
+				$conn->translate('SELECT 1 %lmt', -10);
+			},
+			'Dibi\NotSupportedException',
+			'Negative offset or limit.'
 		);
 
 		// Limit invalid, offset valid
-		Assert::same(
-			'SELECT 1',
-			$conn->translate('SELECT 1 %ofs %lmt', 10, -10)
+		Assert::error(
+			function () use ($conn) {
+				$conn->translate('SELECT 1 %ofs %lmt', 10, -10);
+			},
+			'Dibi\NotSupportedException',
+			'Negative offset or limit.'
 		);
 
 		// Limit valid, offset invalid
-		Assert::same(
-			'SELECT 1',
-			$conn->translate('SELECT 1 %ofs %lmt', -10, 10)
+		Assert::error(
+			function () use ($conn) {
+				$conn->translate('SELECT 1 %ofs %lmt', -10, 10);
+			},
+			'Dibi\NotSupportedException',
+			'Negative offset or limit.'
 		);
 	} else {
 		Assert::same(
-			'SELECT TOP 1 * FROM (SELECT 1) t',
+			'SELECT TOP (1) * FROM (SELECT 1) t',
 			$conn->translate('SELECT 1 %lmt', 1)
 		);
 

tests/dibi/Translator.phpt

@@ -141,6 +141,7 @@ Assert::same(
 Assert::same(
 	reformat([
 		'odbc' => 'SELECT TOP 2 * FROM (SELECT * FROM [products] ) t',
+		'sqlsrv' => 'SELECT * FROM [products] OFFSET 0 ROWS FETCH NEXT 2 ROWS ONLY',
 		'SELECT * FROM [products]  LIMIT 2',
 	]),
 	$conn->translate('SELECT * FROM [products] %lmt', 2)
@@ -153,7 +154,10 @@ if ($config['system'] === 'odbc') {
 } else {
 	// with limit = 2, offset = 1
 	Assert::same(
-		reformat('SELECT * FROM [products]   LIMIT 2 OFFSET 1'),
+		reformat([
+			'sqlsrv' => 'SELECT * FROM [products] OFFSET 1 ROWS FETCH NEXT 2 ROWS ONLY',
+			'SELECT * FROM [products]   LIMIT 2 OFFSET 1'
+		]),
 		$conn->translate('SELECT * FROM [products] %lmt %ofs', 2, 1)
 	);
 
@@ -162,6 +166,7 @@ if ($config['system'] === 'odbc') {
 		reformat([
 			'mysql' => 'SELECT * FROM `products`  LIMIT 18446744073709551615 OFFSET 50',
 			'postgre' => 'SELECT * FROM "products"  OFFSET 50',
+			'sqlsrv' => 'SELECT * FROM [products] OFFSET 50 ROWS',
 			'SELECT * FROM [products]  LIMIT -1 OFFSET 50',
 		]),
 		$conn->translate('SELECT * FROM [products] %ofs', 50)
@@ -224,6 +229,7 @@ if ($config['system'] === 'postgre') {
 		reformat([
 			'sqlite' => "SELECT * FROM products WHERE (title LIKE 'C%' ESCAPE '\\' AND title LIKE '%r' ESCAPE '\\') OR title LIKE '%a\n\\%\\_\\\\''\"%' ESCAPE '\\'",
 			'odbc' => "SELECT * FROM products WHERE (title LIKE 'C%' AND title LIKE '%r') OR title LIKE '%a\n[%][_]\\''\"%'",
+			'sqlsrv' => "SELECT * FROM products WHERE (title LIKE 'C%' AND title LIKE '%r') OR title LIKE '%a\n[%][_]\\''\"%'",
 			"SELECT * FROM products WHERE (title LIKE 'C%' AND title LIKE '%r') OR title LIKE '%a\\n\\%\\_\\\\\\\\\'\"%'",
 		]),
 		$conn->translate($args[0], $args[1], $args[2], $args[3])
@@ -425,6 +431,7 @@ Assert::same(
 Assert::same(
 	reformat([
 		'odbc' => 'SELECT TOP 10 * FROM (SELECT * FROM [test] WHERE [id] LIKE \'%d%t\' ) t',
+		'sqlsrv' => 'SELECT * FROM [test] WHERE [id] LIKE \'%d%t\' OFFSET 0 ROWS FETCH NEXT 10 ROWS ONLY',
 		'SELECT * FROM [test] WHERE [id] LIKE \'%d%t\'  LIMIT 10',
 	]),
 	$conn->translate("SELECT * FROM [test] WHERE %n LIKE '%d%t' %lmt", 'id', 10)

tests/dibi/data/sqlsrv.sql

@@ -8,6 +8,7 @@ CREATE TABLE products (
 	title varchar(50) NOT NULL,
 	PRIMARY KEY(product_id)
 );
+CREATE INDEX [title] ON [dbo].[products] ([title]);
 
 SET IDENTITY_INSERT products ON;
 INSERT INTO products (product_id, title) VALUES (1, 'Chair');

tests/dibi/meta.phpt

@@ -17,11 +17,12 @@ try {
 	Tester\Environment::skip($e->getMessage());
 }
 
-Assert::same(3, count($meta->getTables()));
-
-$names = $meta->getTableNames();
-sort($names);
-Assert::equal(['customers', 'orders', 'products'], $names);
+if ($config['system'] !== 'sqlsrv') {
+	Assert::same(3, count($meta->getTables()));
+	$names = $meta->getTableNames();
+	sort($names);
+	Assert::equal(['customers', 'orders', 'products'], $names);
+}
 
 Assert::false($meta->hasTable('xxxx'));
 
@@ -48,7 +49,7 @@ Assert::same('title', $column->getName());
 Assert::same('products', $column->getTable()->getName());
 Assert::same('s', $column->getType());
 Assert::type('string', $column->getNativeType());
-Assert::same(100, $column->getSize());
+Assert::same($config['system'] === 'sqlsrv' ? 50 : 100, $column->getSize());
 Assert::false($column->isNullable());
 Assert::false($column->isAutoIncrement());
 //Assert::null($column->getDefault());

tests/php-win.ini

@@ -1,10 +1,12 @@
 [PHP]
 extension_dir = "./ext"
+;extension=php_mssql.dll
 extension=php_mysql.dll
 extension=php_mysqli.dll
 ;extension=php_oci8.dll
 ;extension=php_oci8_11g.dll
 ;extension=php_pdo_firebird.dll
+;extension=php_pdo_mssql.dll
 extension=php_pdo_mysql.dll
 ;extension=php_pdo_oci.dll
 extension=php_pdo_odbc.dll
@@ -12,4 +14,5 @@ extension=php_pdo_pgsql.dll
 extension=php_pdo_sqlite.dll
 extension=php_pgsql.dll
 extension=php_sqlite3.dll
-;extension=php_sqlsrv_ts.dll
+extension=php_sqlsrv_ts.dll
+extension=php_pdo_sqlsrv_ts.dll