relationizer 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21ee2cd0fd6597dfd1dca5a5dbf1373cb47bf97d
-  data.tar.gz: 0aa7d5f6331dde1fca3c8600b966a5fdcb7896c3
+  metadata.gz: 48cac1b36f04f43929750f209e07f9e2bda3c0ce
+  data.tar.gz: ae607d94583019150e2b0bd5961cb5d90a351143
 SHA512:
-  metadata.gz: 5ffba7e872f1b15455e2e79609945e74de8705757a91b28d6f72ebee9f5d0bb8aec792640114df838b9071f3eed56cffc5303d822424537ce39860a7cbd3cdca
-  data.tar.gz: 041d84c052407fb3fc16abced7eafe832bc73f3c7d64c6168c81b48808bbdb0aeccbebc553f0420de6b424a6bd6c41f26ba1c7da1e1f622d5bd13b70a6045694
+  metadata.gz: f4f8034c808c4dbecad7aa1ec1f13135b5b41090d4129a65b7531fb82d669b8ba226649f9890d97865f4502ba6c0b21cae64f1802e96cde8f5973b593f0382f8
+  data.tar.gz: 2a71e9995be92db05ea108977384484f6565b9b16c4e39ee3262c2dbee340cec0478bde738ed80704911262089e0c1dc559bd8183452e29dd7efc52dcee8ebc6

data/lib/relationizer/big_query/standard.rb

@@ -6,17 +6,23 @@ module Relationizer
     module Standard
       class ReasonlessTypeError < StandardError; end
 
-      DEFAULT_TYPES = {
-        Integer    => :INT64,
-        BigDecimal => :FLOAT64,
-        Float      => :FLOAT64,
-        String     => :STRING,
-        TrueClass  => :BOOL,
-        FalseClass => :BOOL,
-        Date       => :DATE,
-        Time       => :TIMESTAMP,
-        DateTime   => :TIMESTAMP,
-        Array      => :ARRAY
+      KNOWN_TYPES = [:INT64, :FLOAT64, :STRING, :BOOL, :TIMESTAMP, :DATE]
+
+      DEFAULT_TYPES = -> (obj) {
+        case obj
+        when Integer    then :INT64
+        when BigDecimal then :FLOAT64
+        when Float      then :FLOAT64
+        when String     then :STRING
+        when TrueClass  then :BOOL
+        when FalseClass then :BOOL
+        when Time       then :TIMESTAMP
+        when DateTime   then :TIMESTAMP
+        when Date       then :DATE
+        when Array      then :ARRAY
+        else
+          nil
+        end
       }
 
       def create_relation_literal(schema, tuples)
@@ -49,7 +55,7 @@ module Relationizer
           raise ReasonlessTypeError.new("Ambiguous type of element in array: #{classes}")
         end
 
-        DEFAULT_TYPES[classes.first] || :STRING
+        DEFAULT_TYPES[array.first] || :STRING
       end
 
       def types_exp(names, types)
@@ -76,16 +82,16 @@ module Relationizer
           if values.map { |o| o.is_a?(Array) }.all?
             types = values.
                       map(&method(:array_type)).uniq.
-                      tap(&method(:many_candidate_check)).
-                      tap(&method(:empty_candidate_check))
+                      tap(&method(:empty_candidate_check)).
+                      tap(&method(:many_candidate_check))
 
             next "ARRAY<#{types.first}>".to_sym
           end
 
-          values.map(&:class).uniq.
+          values.
             map(&DEFAULT_TYPES).compact.uniq.
-            tap(&method(:many_candidate_check)).
             tap(&method(:empty_candidate_check)).
+            tap(&method(:many_candidate_check)).
             first || :STRING
         }
       end
@@ -99,7 +105,7 @@ module Relationizer
           obj.map { |e| to_literal(e, t) }.join(', ').tap { |s| break "[#{s}]"}
         when /^ARRAY\<.+\>$/
           t = /^ARRAY\<(.+)\>$/.match(type).to_a&.dig(1).to_sym
-          raise "Unknown type: #{t}" unless DEFAULT_TYPES.values.include?(t)
+          raise "Unknown type: #{t}" unless KNOWN_TYPES.include?(t)
           obj.map { |e| to_literal(e, t) }.join(', ').tap { |s| break "[#{s}]"}
         when :TIMESTAMP
           %Q{'#{obj.strftime('%Y-%m-%d %H:%M:%S')}'}

data/lib/relationizer/postgresql.rb

@@ -5,16 +5,29 @@ module Relationizer
   module Postgresql
     class ReasonlessTypeError < StandardError; end
 
-    DEFAULT_TYPES = {
-      Integer    => :INT8,
-      BigDecimal => :DECIMAL,
-      Float      => :FLOAT8,
-      String     => :TEXT,
-      TrueClass  => :BOOLEAN,
-      FalseClass => :BOOLEAN,
-      Date       => :DATE,
-      Time       => :TIMESTAMPTZ,
-      DateTime   => :TIMESTAMPTZ
+    DEFAULT_TYPES =  -> (obj) {
+      case obj
+      when Integer
+        :INT8
+      when BigDecimal
+        :DECIMAL
+      when Float
+        :FLOAT8
+      when String
+        :TEXT
+      when TrueClass
+        :BOOLEAN
+      when FalseClass
+        :BOOLEAN
+      when Time
+        :TIMESTAMPTZ
+      when DateTime
+        :TIMESTAMPTZ
+      when Date
+        :DATE
+      else
+        nil
+      end
     }
 
     def create_relation_literal(schema, tuples)
@@ -39,10 +52,9 @@ module Relationizer
         next "#{name}::#{type.to_s.upcase}" if type
 
         values.
-          map(&:class).uniq.
           map(&DEFAULT_TYPES).compact.uniq.
-          tap(&method(:many_candidate_check)).
           tap(&method(:empty_candidate_check)).
+          tap(&method(:many_candidate_check)).
           first.
           to_s.upcase.
           tap { |fixed_type| break "#{name}::#{fixed_type}" }

data/lib/relationizer/version.rb

@@ -1,3 +1,3 @@
 module Relationizer
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: relationizer
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - yancya