FriendsOfDoctrine · bllem · Dec 29, 2018 · Dec 29, 2018 · Dec 29, 2018 · Dec 29, 2018
diff --git a/README.md b/README.md
@@ -195,19 +195,29 @@ doctrine:
  array(date): FOD\DBALClickHouse\Types\ArrayDateType
 ```
 
-Additional type `BigIntType` helps you to store bigint values as [Int64/UInt64](https://clickhouse.yandex/reference_en.html#UInt8,%20UInt16,%20UInt32,%20UInt64,%20Int8,%20Int16,%20Int32,%20Int64) value type in ClickHouse.
-You can override DBAL type in your code:
-```php
-Type::overrideType(Type::BIGINT, 'FOD\DBALClickHouse\Types\BigIntType');
-```
-or use custom mapping types in Symfony configuration:
+If you want to use [numeric types](https://clickhouse.yandex/docs/en/single/#uint8-uint16-uint32-uint64-int8-int16-int32-int64), register additional DBAL types in your Symfony configuration file:
+
 ```yml
 # app/config/config.yml
 doctrine:
  dbal:
+ connections:
+ ...
  types:
- bigint: FOD\DBALClickHouse\Types\BigIntType
- ...
+ int8: FOD\DBALClickHouse\Types\Int8Type
+ int16: FOD\DBALClickHouse\Types\Int16Type
+ int32: FOD\DBALClickHouse\Types\Int32Type
+ int64: FOD\DBALClickHouse\Types\Int64Type
+ float32: FOD\DBALClickHouse\Types\Float32Type
+ float64: FOD\DBALClickHouse\Types\Float64Type
+ decimal: FOD\DBALClickHouse\Types\DecimalType
+```
+
+or you can override DBAL type in your code:
+```php
+Type::overrideType(Type::BIGINT, 'FOD\DBALClickHouse\Types\Int64Type');
+
+Type::overrideType(Type::DECIMAL, 'FOD\DBALClickHouse\Types\DecimalType');
 ```
 
 ### More information in Doctrine DBAL documentation:

diff --git a/composer.json b/composer.json
@@ -1,5 +1,5 @@
 {
- "name": "friendsofdoctrine/dbal-clickhouse",
+ "name": "bllem/dbal-clickhouse",
  "type": "library",
  "description": "Doctrine DBAL driver for ClickHouse",
  "keywords": [

diff --git a/src/ClickHouseConnection.php b/src/ClickHouseConnection.php
@@ -8,7 +8,7 @@
  *
  * (c) FriendsOfDoctrine <https://github.com/FriendsOfDoctrine/>.
  *
- * For the full copyright and license inflormation, please view the LICENSE
+ * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
@@ -51,10 +51,9 @@ public function __construct(
  'port' => $params['port'] ?? 8123,
  'username' => $username,
  'password' => $password,
- 'settings' => array_merge([
- 'database' => $params['dbname'] ?? 'default',
- ], $params['driverOptions'] ?? []),
- ]);
+ ], array_merge([
+ 'database' => $params['dbname'] ?? 'default',
+ ], $params['driverOptions'] ?? []));
 
  $this->platform = $platform;
  }

diff --git a/src/ClickHouseException.php b/src/ClickHouseException.php
@@ -8,7 +8,7 @@
  *
  * (c) FriendsOfDoctrine <https://github.com/FriendsOfDoctrine/>.
  *
- * For the full copyright and license inflormation, please view the LICENSE
+ * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 

diff --git a/src/ClickHouseKeywords.php b/src/ClickHouseKeywords.php
@@ -8,7 +8,7 @@
  *
  * (c) FriendsOfDoctrine <https://github.com/FriendsOfDoctrine/>.
  *
- * For the full copyright and license inflormation, please view the LICENSE
+ * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 

diff --git a/src/ClickHousePlatform.php b/src/ClickHousePlatform.php
@@ -8,7 +8,7 @@
  *
  * (c) FriendsOfDoctrine <https://github.com/FriendsOfDoctrine/>.
  *
- * For the full copyright and license inflormation, please view the LICENSE
+ * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
@@ -135,6 +135,7 @@ protected function initializeDoctrineTypeMappings() : void
  'uint64' => 'bigint',
  'float32' => 'decimal',
  'float64' => 'float',
+ 'decimal' => 'decimal',
 
  'string' => 'string',
  'fixedstring' => 'string',
@@ -667,7 +668,13 @@ protected function _getCreateTableSQL($tableName, array $columns, array $options
  */
  $dateColumnParams = [
  'type' => Type::getType('date'),
- 'default' => 'today()',
+ 'default' =>
+ isset($options['eventDateColumn']) &&
+ isset($columns[$options['eventDateColumn']]) &&
+ isset($columns[$options['eventDateColumn']]['default']) &&
+ $columns[$options['eventDateColumn']]['default'] ?
+ $columns[$options['eventDateColumn']]['default'] :
+ 'today()'
  ];
  if (! empty($options['eventDateProviderColumn'])) {
  $options['eventDateProviderColumn'] = trim($options['eventDateProviderColumn']);

diff --git a/src/ClickHouseSchemaManager.php b/src/ClickHouseSchemaManager.php
@@ -8,7 +8,7 @@
  *
  * (c) FriendsOfDoctrine <https://github.com/FriendsOfDoctrine/>.
  *
- * For the full copyright and license inflormation, please view the LICENSE
+ * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
@@ -118,8 +118,29 @@ protected function _getPortableTableColumnDefinition($tableColumn) : Column
  }
 
  $unsigned = false;
+
  if (stripos($columnType, 'uint') === 0) {
+
  $unsigned = true;
+
+ $dbType = substr($columnType, 1);
+ }
+
+ $precision = 10;
+
+ $scale = 0;
+
+ if (stripos($columnType, 'decimal') === 0) {
+
+ $unsigned = false;
+
+ $dbType = 'decimal';
+
+ preg_match('/([0-9]{1,2})(, )?([0-9]{1,2})?/', $columnType, $matches);
+
+ $precision = isset($matches[1]) ? $matches[1] : 10;
+
+ $scale = isset($matches[3]) ? $matches[3] : 0;
  }
 
  if (! isset($tableColumn['name'])) {
@@ -141,6 +162,8 @@ protected function _getPortableTableColumnDefinition($tableColumn) : Column
  'unsigned' => $unsigned,
  'autoincrement' => false,
  'comment' => null,
+ 'precision' => $precision,
+ 'scale' => $scale,
  ];
 
  return new Column(

diff --git a/src/ClickHouseStatement.php b/src/ClickHouseStatement.php
@@ -8,7 +8,7 @@
  *
  * (c) FriendsOfDoctrine <https://github.com/FriendsOfDoctrine/>.
  *
- * For the full copyright and license inflormation, please view the LICENSE
+ * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 

diff --git a/src/Connection.php b/src/Connection.php
@@ -8,7 +8,7 @@
  *
  * (c) FriendsOfDoctrine <https://github.com/FriendsOfDoctrine/>.
  *
- * For the full copyright and license inflormation, please view the LICENSE
+ * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 

diff --git a/src/Driver.php b/src/Driver.php
@@ -8,7 +8,7 @@
  *
  * (c) FriendsOfDoctrine <https://github.com/FriendsOfDoctrine/>.
  *
- * For the full copyright and license inflormation, please view the LICENSE
+ * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 

diff --git a/src/Types/ArrayDateTimeType.php b/src/Types/ArrayDateTimeType.php
@@ -8,7 +8,7 @@
  *
  * (c) FriendsOfDoctrine <https://github.com/FriendsOfDoctrine/>.
  *
- * For the full copyright and license inflormation, please view the LICENSE
+ * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 

diff --git a/src/Types/ArrayDateType.php b/src/Types/ArrayDateType.php
@@ -8,7 +8,7 @@
  *
  * (c) FriendsOfDoctrine <https://github.com/FriendsOfDoctrine/>.
  *
- * For the full copyright and license inflormation, please view the LICENSE
+ * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 

diff --git a/src/Types/ArrayFloat32Type.php b/src/Types/ArrayFloat32Type.php
@@ -8,7 +8,7 @@
  *
  * (c) FriendsOfDoctrine <https://github.com/FriendsOfDoctrine/>.
  *
- * For the full copyright and license inflormation, please view the LICENSE
+ * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 

diff --git a/src/Types/ArrayFloat64Type.php b/src/Types/ArrayFloat64Type.php
@@ -8,7 +8,7 @@
  *
  * (c) FriendsOfDoctrine <https://github.com/FriendsOfDoctrine/>.
  *
- * For the full copyright and license inflormation, please view the LICENSE
+ * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 

diff --git a/src/Types/ArrayInt16Type.php b/src/Types/ArrayInt16Type.php
@@ -8,7 +8,7 @@
  *
  * (c) FriendsOfDoctrine <https://github.com/FriendsOfDoctrine/>.
  *
- * For the full copyright and license inflormation, please view the LICENSE
+ * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 

diff --git a/src/Types/ArrayInt32Type.php b/src/Types/ArrayInt32Type.php
@@ -8,7 +8,7 @@
  *
  * (c) FriendsOfDoctrine <https://github.com/FriendsOfDoctrine/>.
  *
- * For the full copyright and license inflormation, please view the LICENSE
+ * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 

diff --git a/src/Types/ArrayInt64Type.php b/src/Types/ArrayInt64Type.php
@@ -8,7 +8,7 @@
  *
  * (c) FriendsOfDoctrine <https://github.com/FriendsOfDoctrine/>.
  *
- * For the full copyright and license inflormation, please view the LICENSE
+ * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 

diff --git a/src/Types/ArrayInt8Type.php b/src/Types/ArrayInt8Type.php
@@ -8,7 +8,7 @@
  *
  * (c) FriendsOfDoctrine <https://github.com/FriendsOfDoctrine/>.
  *
- * For the full copyright and license inflormation, please view the LICENSE
+ * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 

diff --git a/src/Types/ArrayStringType.php b/src/Types/ArrayStringType.php
@@ -8,7 +8,7 @@
  *
  * (c) FriendsOfDoctrine <https://github.com/FriendsOfDoctrine/>.
  *
- * For the full copyright and license inflormation, please view the LICENSE
+ * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 

diff --git a/src/Types/ArrayType.php b/src/Types/ArrayType.php
@@ -8,7 +8,7 @@
  *
  * (c) FriendsOfDoctrine <https://github.com/FriendsOfDoctrine/>.
  *
- * For the full copyright and license inflormation, please view the LICENSE
+ * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 

diff --git a/src/Types/ArrayUInt16Type.php b/src/Types/ArrayUInt16Type.php
@@ -8,7 +8,7 @@
  *
  * (c) FriendsOfDoctrine <https://github.com/FriendsOfDoctrine/>.
  *
- * For the full copyright and license inflormation, please view the LICENSE
+ * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 

diff --git a/src/Types/ArrayUInt32Type.php b/src/Types/ArrayUInt32Type.php
@@ -8,7 +8,7 @@
  *
  * (c) FriendsOfDoctrine <https://github.com/FriendsOfDoctrine/>.
  *
- * For the full copyright and license inflormation, please view the LICENSE
+ * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 

diff --git a/src/Types/ArrayUInt64Type.php b/src/Types/ArrayUInt64Type.php
@@ -8,7 +8,7 @@
  *
  * (c) FriendsOfDoctrine <https://github.com/FriendsOfDoctrine/>.
  *
- * For the full copyright and license inflormation, please view the LICENSE
+ * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 

diff --git a/src/Types/ArrayUInt8Type.php b/src/Types/ArrayUInt8Type.php
@@ -8,7 +8,7 @@
  *
  * (c) FriendsOfDoctrine <https://github.com/FriendsOfDoctrine/>.
  *
- * For the full copyright and license inflormation, please view the LICENSE
+ * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 

diff --git a/src/Types/BigIntType.php b/src/Types/BigIntType.php
@@ -8,7 +8,7 @@
  *
  * (c) FriendsOfDoctrine <https://github.com/FriendsOfDoctrine/>.
  *
- * For the full copyright and license inflormation, please view the LICENSE
+ * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 

diff --git a/src/Types/BitNumericalClickHouseType.php b/src/Types/BitNumericalClickHouseType.php
@@ -8,7 +8,7 @@
  *
  * (c) FriendsOfDoctrine <https://github.com/FriendsOfDoctrine/>.
  *
- * For the full copyright and license inflormation, please view the LICENSE
+ * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 

diff --git a/src/Types/ClickHouseType.php b/src/Types/ClickHouseType.php
@@ -8,7 +8,7 @@
  *
  * (c) FriendsOfDoctrine <https://github.com/FriendsOfDoctrine/>.
  *
- * For the full copyright and license inflormation, please view the LICENSE
+ * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 

diff --git a/src/Types/DatableClickHouseType.php b/src/Types/DatableClickHouseType.php
@@ -8,7 +8,7 @@
  *
  * (c) FriendsOfDoctrine <https://github.com/FriendsOfDoctrine/>.
  *
- * For the full copyright and license inflormation, please view the LICENSE
+ * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 

diff --git a/src/Types/DecimalType.php b/src/Types/DecimalType.php
@@ -0,0 +1,44 @@
+<?php declare(strict_types=1);
+
+/*
+ * This file is part of the FODDBALClickHouse package -- Doctrine DBAL library
+ * for ClickHouse (a column-oriented DBMS for OLAP <https://clickhouse.yandex/>)
+ *
+ * (c) FriendsOfDoctrine <https://github.com/FriendsOfDoctrine/>.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace FOD\DBALClickHouse\Types;
+
+/**
+ * Decimal Type
+ */
+class DecimalType extends Type
+{
+
+ public function getBaseClickHouseType() : string
+ {
+ return NumericalClickHouseType::TYPE_DECIMAL;
+ }
+
+ public function getName(): string
+ {
+ return Type::DECIMAL;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function getDeclaration(array $fieldDeclaration = []) : string
+ {
+
+ $fieldDeclaration['precision'] = ! isset($fieldDeclaration['precision']) || empty($fieldDeclaration['precision'])
+ ? 10 : $fieldDeclaration['precision'];
+ $fieldDeclaration['scale'] = ! isset($fieldDeclaration['scale']) || empty($fieldDeclaration['scale'])
+ ? 0 : $fieldDeclaration['scale'];
+
+ return $this->getBaseClickHouseType(). "({$fieldDeclaration['precision']}, {$fieldDeclaration['scale']})";
+ }
+}