Merge pull request #180 from keboola/PST-2403-ondra

change BigQuery backend basetypes

Author: zajca

src/Definition/Bigquery.php

@@ -192,7 +192,7 @@ public function getSQLDefinition(): string
         $definition = $this->getTypeOnlySQLDefinition();
 
         if (strtoupper($this->getType()) === self::TYPE_ARRAY
-        || strtoupper($this->getType()) === self::TYPE_STRUCT
+            || strtoupper($this->getType()) === self::TYPE_STRUCT
         ) {
             return $definition;
         }
@@ -287,12 +287,12 @@ public static function getTypeByBasetype(string $basetype): string
     public function getBackendBasetype(): string
     {
         return match (strtoupper($this->type)) {
-            self::TYPE_INT => self::TYPE_INT64,
-            self::TYPE_SMALLINT => self::TYPE_INT64,
-            self::TYPE_INTEGER => self::TYPE_INT64,
-            self::TYPE_BIGINT => self::TYPE_INT64,
-            self::TYPE_TINYINT => self::TYPE_INT64,
-            self::TYPE_BYTEINT => self::TYPE_INT64,
+            self::TYPE_INT64 => self::TYPE_INTEGER,
+            self::TYPE_INT => self::TYPE_INTEGER,
+            self::TYPE_SMALLINT => self::TYPE_INTEGER,
+            self::TYPE_BIGINT => self::TYPE_INTEGER,
+            self::TYPE_TINYINT => self::TYPE_INTEGER,
+            self::TYPE_BYTEINT => self::TYPE_INTEGER,
             self::TYPE_DECIMAL => self::TYPE_NUMERIC,
             self::TYPE_BIGDECIMAL => self::TYPE_BIGNUMERIC,
             default => $this->type

tests/BigqueryDatatypeTest.php

@@ -489,25 +489,17 @@ public static function provideTestGetDefinitionForBasetype(): Generator
     public function provideTestGetTypeFromAlias(): Generator
     {
         foreach (Bigquery::TYPES as $type) {
-            switch ($type) {
-                case Bigquery::TYPE_INT:
-                case Bigquery::TYPE_SMALLINT:
-                case Bigquery::TYPE_INTEGER:
-                case Bigquery::TYPE_BIGINT:
-                case Bigquery::TYPE_TINYINT:
-                case Bigquery::TYPE_BYTEINT:
-                    $expectedType = Bigquery::TYPE_INT64;
-                    break;
-                case Bigquery::TYPE_DECIMAL:
-                    $expectedType = Bigquery::TYPE_NUMERIC;
-                    break;
-                case Bigquery::TYPE_BIGDECIMAL:
-                    $expectedType = Bigquery::TYPE_BIGNUMERIC;
-                    break;
-                default:
-                    $expectedType = $type;
-                    break;
-            }
+            $expectedType = match ($type) {
+                Bigquery::TYPE_INT64,
+                Bigquery::TYPE_INT,
+                Bigquery::TYPE_SMALLINT,
+                Bigquery::TYPE_BIGINT,
+                Bigquery::TYPE_TINYINT,
+                Bigquery::TYPE_BYTEINT => Bigquery::TYPE_INTEGER,
+                Bigquery::TYPE_DECIMAL => Bigquery::TYPE_NUMERIC,
+                Bigquery::TYPE_BIGDECIMAL => Bigquery::TYPE_BIGNUMERIC,
+                default => $type,
+            };
 
             yield $type => [
                 'type' => $type,