Merge pull request #251 from foxycode/drop-enum

Drop ENUM type
Kdyby · Mar 14, 2016 · 0a3f027 · 0a3f027
2 parents 480bd55 + a186550
commit 0a3f027
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 44 deletions.
diff --git a/src/Kdyby/Doctrine/Connection.php b/src/Kdyby/Doctrine/Connection.php
@@ -12,6 +12,7 @@
 
 use Doctrine;
 use Doctrine\Common\EventManager;
+use Doctrine\DBAL\Types\Type;
 use Doctrine\DBAL\Driver;
 use Kdyby;
 use Nette;
@@ -279,11 +280,11 @@ public function connect()
 		}
 
 		foreach ($this->dbalTypes as $name => $className) {
-			if (DbalType::hasType($name)) {
-				DbalType::overrideType($name, $className);
+			if (Type::hasType($name)) {
+				Type::overrideType($name, $className);
 
 			} else {
-				DbalType::addType($name, $className);
+				Type::addType($name, $className);
 			}
 		}
 
@@ -296,7 +297,7 @@ public function connect()
 		}
 
 		foreach ($this->dbalTypes as $type => $className) {
-			$platform->markDoctrineTypeCommented(DbalType::getType($type));
+			$platform->markDoctrineTypeCommented(Type::getType($type));
 		}
 
 		return TRUE;
@@ -351,8 +352,6 @@ public function ping()
 	 * @param array $params
 	 * @param \Doctrine\DBAL\Configuration $config
 	 * @param \Doctrine\Common\EventManager $eventManager
-	 * @param array $dbalTypes
-	 * @param array $schemaTypes
 	 * @return Connection
 	 */
 	public static function create(array $params, Doctrine\DBAL\Configuration $config, EventManager $eventManager)

diff --git a/src/Kdyby/Doctrine/DI/OrmExtension.php b/src/Kdyby/Doctrine/DI/OrmExtension.php
@@ -93,9 +93,7 @@ class OrmExtension extends Nette\DI\CompilerExtension
 		'platformService' => NULL,
 		'defaultTableOptions' => [],
 		'resultCache' => 'default',
-		'types' => [
-			'enum' => 'Kdyby\Doctrine\Types\Enum',
-		],
+		'types' => [],
 		'schemaFilter' => NULL,
 	];
 

diff --git a/src/Kdyby/Doctrine/DbalType.php b/src/Kdyby/Doctrine/DbalType.php
diff --git a/src/Kdyby/Doctrine/Helpers.php b/src/Kdyby/Doctrine/Helpers.php
@@ -12,6 +12,7 @@
 
 use Kdyby;
 use Nette;
+use Doctrine\DBAL\Types\Type;
 
 
 
@@ -44,7 +45,7 @@ public static function separateParameters($query, array $args)
 				$type = NULL;
 
 				if ($value instanceof \DateTime || $value instanceof \DateTimeImmutable) {
-					$type = DbalType::DATETIME;
+					$type = Type::DATETIME;
 
 				} elseif (is_array($value)) {
 					$type = Connection::PARAM_STR_ARRAY;

diff --git a/tests/KdybyTests/Doctrine/Connection.phpt b/tests/KdybyTests/Doctrine/Connection.phpt
@@ -120,13 +120,13 @@ class ConnectionTest extends Tester\TestCase
 			'memory' => TRUE,
 		], new Doctrine\DBAL\Driver\PDOSqlite\Driver());
 		$conn->setSchemaTypes([
-			'enum' => 'enum',
+			'test' => 'test',
 		]);
 		$conn->setDbalTypes([
-			'enum' => 'Kdyby\\Doctrine\\Types\\Enum',
+			'test' => 'KdybyTests\\DoctrineMocks\\TestTypeMock',
 		]);
 		$platform = $conn->getDatabasePlatform();
-		Assert::same('enum', $platform->getDoctrineTypeMapping('enum'));
+		Assert::same('test', $platform->getDoctrineTypeMapping('test'));
 	}
 
 }

diff --git a/src/Kdyby/Doctrine/Types/Enum.php → ...KdybyTests/DoctrineMocks/TestTypeMock.php b/src/Kdyby/Doctrine/Types/Enum.php → ...KdybyTests/DoctrineMocks/TestTypeMock.php
@@ -8,19 +8,18 @@
  * For the full copyright and license information, please view the file license.txt that was distributed with this source code.
  */
 
-namespace Kdyby\Doctrine\Types;
+namespace KdybyTests\DoctrineMocks;
 
 use Doctrine;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Kdyby;
-use Nette;
 
 
 
 /**
  * @author Filip Procházka <filip@prochazka.su>
  */
-class Enum extends Kdyby\Doctrine\DbalType
+class TestTypeMock extends Doctrine\DBAL\Types\Type
 {
 
 	/**
@@ -44,7 +43,7 @@ public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $pla
 	 */
 	public function getName()
 	{
-		return Kdyby\Doctrine\DbalType::ENUM;
+		return 'test';
 	}
 
 }