Merge pull request #230 from nextras/mssql

add AppVeyor & MSSQL support
nextras · Sep 2, 2017 · 62e357c · 62e357c
2 parents 548faa1 + 04fd29f
commit 62e357c
Show file tree

Hide file tree

Showing 32 changed files with 496 additions and 124 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -0,0 +1,43 @@
+build: off
+cache:
+    - c:\php -> appveyor.yml
+    - '%LOCALAPPDATA%\Composer\files -> appveyor.yml'
+
+clone_folder: c:\projects\orm
+
+services:
+    - mssql2016
+
+init:
+    - SET PATH=c:\php;%PATH%
+    - SET PHP=1
+    - SET ANSICON=121x90 (121x90)
+
+install:
+    # Install PHP
+    - IF EXIST c:\php (SET PHP=0) ELSE (mkdir c:\php)
+    - IF %PHP%==1 cd c:\php
+    - IF %PHP%==1 appveyor DownloadFile http://windows.php.net/downloads/releases/archives/php-7.1.0-Win32-VC14-x64.zip
+    - IF %PHP%==1 7z x php-7.1.0-Win32-VC14-x64.zip >nul
+    - IF %PHP%==1 echo extension_dir=ext >> php.ini
+    - IF %PHP%==1 echo extension=php_openssl.dll >> php.ini
+    - IF %PHP%==1 echo extension=php_sqlsrv_ts.dll >> php.ini
+    - IF %PHP%==1 appveyor DownloadFile https://github.com/Microsoft/msphpsql/releases/download/4.1.4-Windows/7.1.zip
+    - IF %PHP%==1 7z x 7.1.zip >nul
+    - IF %PHP%==1 copy 7.1\x64\php_sqlsrv_71_ts.dll ext\php_sqlsrv_ts.dll
+    - IF %PHP%==1 del /Q *.zip
+    - cd c:\projects\orm
+
+    # Install Nette Tester
+    - appveyor DownloadFile https://getcomposer.org/composer.phar
+    - php composer.phar install --prefer-dist --no-interaction --no-progress
+
+    # Create sections.ini, config.mssql.neon & php.ini
+    - copy tests\sections.appveyor.ini tests\sections.ini
+    - copy tests\config.array.sample.neon tests\config.array.neon
+    - copy tests\config.mssql.sample.neon tests\config.mssql.neon
+    - copy tests\php-win.ini tests\php.ini
+
+test_script:
+    - sqlcmd -S ".\SQL2016" -U sa -P Password12! -Q "CREATE DATABASE nextras_orm_test" -d "master"
+    - vendor\bin\tester -p php -c tests\php.ini --setup tests\inc\setup.php tests\cases
diff --git a/src/Mapper/Dbal/DbalCollection.php b/src/Mapper/Dbal/DbalCollection.php
@@ -66,7 +66,7 @@ public function __construct(DbalMapper $mapper, Connection $connection, QueryBui
 
 	public function getBy(array $where)
 	{
-		return $this->findBy($where)->limitBy(1)->fetch();
+		return $this->findBy($where)->fetch();
 	}
 
 
@@ -269,11 +269,11 @@ protected function getIteratorCount(): int
 				foreach ($primary as $column) {
 					$builder->addSelect('%table.%column', $builder->getFromAlias(), $column);
 				}
-				$sql = 'SELECT COUNT(*) FROM (' . $builder->getQuerySql() . ') temp';
+				$sql = 'SELECT COUNT(*) AS count FROM (' . $builder->getQuerySql() . ') temp';
 				$args = $builder->getQueryParameters();
 
 			} else {
-				$builder->select('COUNT(*)');
+				$builder->select('COUNT(*) AS count');
 				$builder->orderBy(null);
 				$sql = $builder->getQuerySql();
 				$args = $builder->getQueryParameters();

diff --git a/src/Mapper/Dbal/DbalMapper.php b/src/Mapper/Dbal/DbalMapper.php
@@ -24,6 +24,7 @@
 use Nextras\Orm\Mapper\BaseMapper;
 use Nextras\Orm\Mapper\IMapper;
 use Nextras\Orm\Mapper\IRelationshipMapper;
+use Nextras\Orm\NotSupportedException;
 use Nextras\Orm\StorageReflection\IStorageReflection;
 
 
@@ -102,7 +103,6 @@ public function toCollection($data): ICollection
 	public function toEntity($data)
 	{
 		if ($data instanceof QueryBuilder) {
-			$data->limitBy(1);
 			$data = $this->connection->queryByQueryBuilder($data);
 		}
 		if ($data instanceof Result) {
@@ -296,11 +296,13 @@ protected function processUpdate(IEntity $entity, $data, $primary)
 
 	protected function processAutoupdate(IEntity $entity, array $args)
 	{
-		$platform = $this->connection->getPlatform();
-		if ($platform instanceof PostgreSqlPlatform) {
+		$platform = $this->connection->getPlatform()->getName();
+		if ($platform === 'pgsql') {
 			$this->processPostgreAutoupdate($entity, $args);
-		} else {
+		} elseif ($platform === 'mysql') {
 			$this->processMySQLAutoupdate($entity, $args);
+		} else {
+			throw new NotSupportedException();
 		}
 	}
 

diff --git a/src/Mapper/Dbal/RelationshipMapperManyHasMany.php b/src/Mapper/Dbal/RelationshipMapperManyHasMany.php
@@ -127,17 +127,8 @@ private function fetchByTwoPassStrategy(QueryBuilder $builder, array $values): M
 		$builder->addSelect('%column', "$targetTable.$this->primaryKeyTo");
 		$builder->addSelect('%column', "$targetTable.$this->primaryKeyFrom");
 
-		if ($builder->hasLimitOffsetClause()) { // todo !== 1
-			$sqls = $args = [];
-			foreach ($values as $value) {
-				$builderPart = clone $builder;
-				$builderPart->andWhere('%column = %any', "$targetTable.$this->primaryKeyFrom", $value);
-				$sqls[] = $builderPart->getQuerySql();
-				$args = array_merge($args, $builderPart->getQueryParameters());
-			}
-
-			$query = '(' . implode(') UNION ALL (', $sqls) . ')';
-			$result = $this->connection->queryArgs($query, $args);
+		if ($builder->hasLimitOffsetClause()) {
+			$result = $this->processMultiResult($builder, $values, $targetTable);
 
 		} else {
 			$builder->andWhere('%column IN %any', "$targetTable.$this->primaryKeyFrom", $values);
@@ -213,25 +204,13 @@ private function fetchCounts(QueryBuilder $builder, array $values)
 			"{$sourceTable}." . $this->targetMapper->getStorageReflection()->getStoragePrimaryKey()[0]
 		);
 		$builder->addSelect('%column', "$targetTable.$this->primaryKeyFrom");
-		$builder->orderBy(null);
 
 		if ($builder->hasLimitOffsetClause()) {
-			$sqls = [];
-			$args = [];
-			foreach ($values as $value) {
-				$build = clone $builder;
-				$build->andWhere("%column = %any", $this->primaryKeyFrom, $value);
-				$sqls[] = "SELECT %any AS %column, COUNT(*) AS [count] FROM (" . $build->getQuerySql() . ') [temp]';
-				$args[] = $value;
-				$args[] = $this->primaryKeyFrom;
-				$args = array_merge($args, $build->getQueryParameters());
-			}
-
-			$sql = '(' . implode(') UNION ALL (', $sqls) . ')';
-			$result = $this->connection->queryArgs($sql, $args);
+			$result = $this->processMultiCountResult($builder, $values);
 
 		} else {
 			$builder->addSelect('COUNT(%column) as count', $this->primaryKeyTo);
+			$builder->orderBy(null);
 			$builder->andWhere('%column IN %any', $this->primaryKeyFrom, $values);
 			$builder->groupBy('%column', $this->primaryKeyFrom);
 			$result = $this->connection->queryArgs($builder->getQuerySql(), $builder->getQueryParameters());
@@ -269,10 +248,9 @@ public function remove(IEntity $parent, array $remove)
 		$this->mapperCoordinator->beginTransaction();
 		$list = $this->buildList($parent, $remove);
 		$this->connection->query(
-			'DELETE FROM %table WHERE (%column[]) IN %any',
+			'DELETE FROM %table WHERE %multiOr',
 			$this->joinTable,
-			array_keys(reset($list)),
-			array_map('array_values', $list)
+			$list
 		);
 	}
 
@@ -296,6 +274,66 @@ protected function buildList(IEntity $parent, array $entries): array
 	}
 
 
+	protected function processMultiResult(QueryBuilder $builder, array $values, string $targetTable)
+	{
+		if ($this->connection->getPlatform()->getName() === 'mssql') {
+			$result = [];
+			foreach ($values as $value) {
+				$builderPart = clone $builder;
+				$builderPart->andWhere('%column = %any', "$targetTable.$this->primaryKeyFrom", $value);
+				$result = array_merge($this->connection->queryByQueryBuilder($builderPart)->fetchAll(), $result);
+			}
+			return $result;
+
+		} else {
+			$sqls = $args = [];
+			foreach ($values as $value) {
+				$builderPart = clone $builder;
+				$builderPart->andWhere('%column = %any', "$targetTable.$this->primaryKeyFrom", $value);
+				$sqls[] = $builderPart->getQuerySql();
+				$args = array_merge($args, $builderPart->getQueryParameters());
+			}
+
+			$query = '(' . implode(') UNION ALL (', $sqls) . ')';
+			return $this->connection->queryArgs($query, $args);
+		}
+	}
+
+
+	protected function processMultiCountResult(QueryBuilder $builder, array $values)
+	{
+		if ($this->connection->getPlatform()->getName() === 'mssql') {
+			$result = [];
+			foreach ($values as $value) {
+				$builderPart = clone $builder;
+				$builderPart->andWhere("%column = %any", $this->primaryKeyFrom, $value);
+				$result = array_merge($this->connection->queryArgs(
+					"SELECT %any AS %column, COUNT(*) AS [count] FROM (" . $builderPart->getQuerySql() . ') [temp]',
+					array_merge([$value, $this->primaryKeyFrom], $builderPart->getQueryParameters())
+				)->fetchAll(), $result);
+			}
+			return $result;
+
+		} else {
+			$sqls = [];
+			$args = [];
+			$builder->orderBy(null);
+			foreach ($values as $value) {
+				$builderPart = clone $builder;
+				$builderPart->andWhere("%column = %any", $this->primaryKeyFrom, $value);
+				$sqls[] = "SELECT %any AS %column, COUNT(*) AS [count] FROM (" . $builderPart->getQuerySql() . ') [temp]';
+				$args[] = $value;
+				$args[] = $this->primaryKeyFrom;
+				$args = array_merge($args, $builderPart->getQueryParameters());
+			}
+
+			$sql = '(' . implode(') UNION ALL (', $sqls) . ')';
+			$result = $this->connection->queryArgs($sql, $args);
+			return $result;
+		}
+	}
+
+
 	protected function calculateCacheKey(QueryBuilder $builder, array $values): string
 	{
 		return md5($builder->getQuerySql() . json_encode($builder->getQueryParameters()) . json_encode($values));

diff --git a/src/Mapper/Dbal/RelationshipMapperOneHasMany.php b/src/Mapper/Dbal/RelationshipMapperOneHasMany.php
@@ -123,24 +123,14 @@ protected function fetchByTwoPassStrategy(QueryBuilder $builder, array $values):
 			$builder->addSelect("[$key]");
 		}
 
-		$sqls = $args = [];
-		foreach ($values as $primaryValue) {
-			$builderPart = clone $builder;
-			$builderPart->andWhere("%column = %any", $this->joinStorageKey, $primaryValue);
-
-			$sqls[] = $builderPart->getQuerySql();
-			$args = array_merge($args, $builderPart->getQueryParameters());
-		}
-
-		$query = '(' . implode(') UNION ALL (', $sqls) . ')';
-		$result = $this->connection->queryArgs($query, $args);
+		$result = $this->processMultiResult($builder, $values);
 
 		$map = $ids = [];
 		if ($isComposite) {
 			foreach ($result as $row) {
 				$id = [];
 				foreach ($targetPrimaryKey as $key) {
-					$id[] = $row->{$key};
+					$id[$key] = $row->{$key};
 				}
 
 				$ids[] = $id;
@@ -161,7 +151,7 @@ protected function fetchByTwoPassStrategy(QueryBuilder $builder, array $values):
 
 		if ($isComposite) {
 			$builder = $this->targetMapper->builder();
-			$builder->andWhere('(%column[]) IN %any', $targetPrimaryKey, $ids);
+			$builder->andWhere('%multiOr', $ids);
 
 			$entitiesResult = [];
 			$collection = $this->targetMapper->toCollection($builder);
@@ -222,24 +212,12 @@ private function fetchCounts(QueryBuilder $builder, array $values)
 
 		$builder = clone $builder;
 		$builder->addSelect('%column', "{$sourceTable}.{$this->joinStorageKey}");
-		$builder->orderBy(null);
 
 		if ($builder->hasLimitOffsetClause()) {
-			$sqls = [];
-			$args = [];
-			foreach ($values as $value) {
-				$build = clone $builder;
-				$build->andWhere('%column = %any', "{$sourceTable}.{$this->joinStorageKey}", $value);
-				$sqls[] = "SELECT %any AS %column, COUNT(*) AS [count] FROM (" . $build->getQuerySql() . ') [temp]';
-				$args[] = $value;
-				$args[] = $this->joinStorageKey;
-				$args = array_merge($args, $build->getQueryParameters());
-			}
-
-			$sql = '(' . implode(') UNION ALL (', $sqls) . ')';
-			$result = $this->connection->queryArgs($sql, $args);
+			$result = $this->processMultiCountResult($builder, $values);
 
 		} else {
+			$builder->orderBy(null);
 			$builder->addSelect('COUNT(%column) AS [count]', "{$sourceTable}.{$targetStoragePrimaryKey}");
 			$builder->andWhere('%column IN %any', "{$sourceTable}.{$this->joinStorageKey}", $values);
 			$builder->groupBy('%column', "{$sourceTable}.{$this->joinStorageKey}");
@@ -254,6 +232,68 @@ private function fetchCounts(QueryBuilder $builder, array $values)
 	}
 
 
+	protected function processMultiResult(QueryBuilder $builder, array $values)
+	{
+		if ($this->connection->getPlatform()->getName() === 'mssql') {
+			$result = [];
+			foreach ($values as $primaryValue) {
+				$builderPart = clone $builder;
+				$builderPart->andWhere("%column = %any", $this->joinStorageKey, $primaryValue);
+				$result = array_merge($this->connection->queryByQueryBuilder($builderPart)->fetchAll(), $result);
+			}
+			return $result;
+
+		} else {
+			$sqls = $args = [];
+			foreach ($values as $primaryValue) {
+				$builderPart = clone $builder;
+				$builderPart->andWhere("%column = %any", $this->joinStorageKey, $primaryValue);
+				$sqls[] = $builderPart->getQuerySql();
+				$args = array_merge($args, $builderPart->getQueryParameters());
+			}
+
+			$query = '(' . implode(') UNION ALL (', $sqls) . ')';
+			return $this->connection->queryArgs($query, $args);
+		}
+	}
+
+
+	protected function processMultiCountResult(QueryBuilder $builder, array $values)
+	{
+		$sourceTable = $builder->getFromAlias();
+
+		if ($this->connection->getPlatform()->getName() === 'mssql') {
+			$result = [];
+			foreach ($values as $value) {
+				$builderPart = clone $builder;
+				$builderPart->andWhere('%column = %any', "{$sourceTable}.{$this->joinStorageKey}", $value);
+				$result = array_merge($this->connection->queryArgs(
+					"SELECT %any AS %column, COUNT(*) AS [count] FROM (" . $builderPart->getQuerySql() . ') [temp]',
+					array_merge([$value, $this->joinStorageKey], $builderPart->getQueryParameters())
+				)->fetchAll(), $result);
+			}
+			return $result;
+
+		} else {
+			$sqls = [];
+			$args = [];
+			$builder->orderBy(null);
+			foreach ($values as $value) {
+				$builderPart = clone $builder;
+				$builderPart->andWhere('%column = %any', "{$sourceTable}.{$this->joinStorageKey}", $value);
+				$sqls[] = "SELECT %any AS %column, COUNT(*) AS [count] FROM (" . $builderPart->getQuerySql() . ') [temp]';
+				$args[] = $value;
+				$args[] = $this->joinStorageKey;
+				$args = array_merge($args, $builderPart->getQueryParameters());
+			}
+
+			$sql = '(' . implode(') UNION ALL (', $sqls) . ')';
+			$result = $this->connection->queryArgs($sql, $args);
+			return $result;
+		}
+	}
+
+
 	protected function calculateCacheKey(QueryBuilder $builder, array $values): string
 	{
 		return md5($builder->getQuerySql() . json_encode($builder->getQueryParameters()) . json_encode($values));

diff --git a/src/Mapper/Dbal/StorageReflection/StorageReflection.php b/src/Mapper/Dbal/StorageReflection/StorageReflection.php
@@ -297,6 +297,10 @@ protected function getDefaultModifiers(): array
 				$types = ['DATETIME' => true];
 				break;
 
+			case 'mssql':
+				$types = ['TIMESTAMP' => true];
+				break;
+
 			default:
 				throw new NotSupportedException();
 		}

diff --git a/src/Repository/Functions/ValueOperatorFunction.php b/src/Repository/Functions/ValueOperatorFunction.php
@@ -98,7 +98,10 @@ private function qbEqualOperator($column, $value)
 		if (is_array($value)) {
 			if ($value) {
 				if (is_array($column)) {
-					return ['(%column[]) IN %any', $column, $value];
+					$value = array_map(function ($value) use ($column) {
+						return array_combine($column, $value);
+					}, $value);
+					return ['%multiOr', $value];
 				} else {
 					return ['%column IN %any', $column, $value];
 				}
@@ -118,7 +121,10 @@ private function qbNotEqualOperator($column, $value)
 		if (is_array($value)) {
 			if ($value) {
 				if (is_array($column)) {
-					return ['(%column[]) NOT IN %any', $column, $value];
+					$value = array_map(function ($value) use ($column) {
+						return array_combine($column, $value);
+					}, $value);
+					return ['NOT (%multiOr)', $value];
 				} else {
 					return ['%column NOT IN %any', $column, $value];
 				}