db_schema 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8d57c1174558070a12ed7b3f5469b1bdaeb019d
-  data.tar.gz: d389fbca9c57a1a5cbf7356b8cc71c7c4db5423a
+  metadata.gz: 3d1180d9c60f0843b544812dfea4fb494697cc69
+  data.tar.gz: 4e4581809741785cc52199c7fa5c8ffb03307af3
 SHA512:
-  metadata.gz: d7ddcffe01abc26f6ee010e7ed161c53ce60d13e29e2e03be015750d8ba37329e1cbe683d446452f585621d31d55d89ddd9506d44d1ba9bd487d644b2fff6130
-  data.tar.gz: cea37fc0fe70f6e70d4118169677137e4b4c4bda5faed03b26f54484972444cf48113238c3551cb680a7aa23f0e824046ae9b79e7e26305e0090f54810509e34
+  metadata.gz: ec90f1a30f2bb6bd662e47344fcc593290ff458bd937e005a1ee16e75e8d6f362115649560d7316f192beaf1dda67926a66105b6fa536edaaefbf00a04734d82
+  data.tar.gz: 09cb9a9558dace6bbb1aaee8343e32430c885c5a14ee87c6f2900db172e0f728ff8c76de0a9c3d7ea2bfa58ec80139c0280cddab47febfe2e441dd8573ec8c7b

data/README.md

@@ -53,7 +53,7 @@ But you would lose it even with manual migrations.
 Add this line to your application's Gemfile:
 
 ``` ruby
-gem 'db_schema', '~> 0.2.2'
+gem 'db_schema', '~> 0.2.3'
 ```
 
 And then execute:

data/lib/db_schema/awesome_print.rb

@@ -137,7 +137,7 @@ if defined?(AwesomePrint)
           ''
         end
 
-        "#<#{object.class} (#{object.type.ai}) #{object.name.ai}#{options}#{primary_key}>"
+        "#<DbSchema::Definitions::Field::Custom (#{object.type.ai}) #{object.name.ai}#{options}#{primary_key}>"
       end
 
       def awesome_dbschema_index(object)

data/lib/db_schema/definitions/field.rb

@@ -3,16 +3,12 @@ module DbSchema
     module Field
       class << self
         def build(name, type, **options)
-          if registry.key?(type)
-            type_class_for(type).new(name, **options)
-          else
-            Custom.new(name, type_name: type, **options)
-          end
+          type_class_for(type).new(name, **options)
         end
 
         def type_class_for(type)
           registry.fetch(type) do |type|
-            raise ArgumentError, "#{type.inspect} type is not supported."
+            Custom.class_for(type)
           end
         end
 

data/lib/db_schema/definitions/field/base.rb

@@ -44,10 +44,6 @@ module DbSchema
           end
         end
 
-        def custom_type?
-          false
-        end
-
         def type
           self.class.type
         end

data/lib/db_schema/definitions/field/custom.rb

@@ -2,19 +2,20 @@ module DbSchema
   module Definitions
     module Field
       class Custom < Base
-        attr_reader :type_name
+        class << self
+          def class_for(type_name)
+            raise ArgumentError if type_name.nil?
 
-        def initialize(name, type_name:, **options)
-          super(name, **options)
-          @type_name = type_name
-        end
-
-        def custom_type?
-          true
-        end
+            Class.new(self) do
+              define_method :type do
+                type_name
+              end
 
-        def type
-          type_name
+              define_singleton_method :type do
+                type_name
+              end
+            end
+          end
         end
       end
     end

data/lib/db_schema/reader.rb

@@ -45,7 +45,8 @@ module DbSchema
           c.numeric_scale AS num_scale,
           c.datetime_precision AS dt_precision,
           c.interval_type,
-          e.data_type AS element_type
+          e.data_type AS element_type,
+          e.udt_name AS element_custom_type_name
      FROM information_schema.columns AS c
 LEFT JOIN information_schema.element_types AS e
        ON e.object_catalog = c.table_catalog
@@ -294,8 +295,14 @@ SELECT extname
               end
             end
           when :array
-            Utils.rename_keys(Utils.filter_by_keys(data, :element_type)) do |attributes|
-              attributes[:of] = attributes[:element_type].to_sym
+            Utils.rename_keys(
+              Utils.filter_by_keys(data, :element_type, :element_custom_type_name)
+            ) do |attributes|
+              attributes[:of] = if attributes[:element_type] == 'USER-DEFINED'
+                attributes[:element_custom_type_name]
+              else
+                attributes[:element_type]
+              end.to_sym
             end
           else
             {}

data/lib/db_schema/validator.rb

@@ -11,8 +11,8 @@ module DbSchema
 
           table.fields.each do |field|
             if field.is_a?(Definitions::Field::Custom)
-              unless schema.enums.map(&:name).include?(field.type_name)
-                error_message = %(Field "#{table.name}.#{field.name}" has unknown type "#{field.type_name}")
+              unless schema.enums.map(&:name).include?(field.type)
+                error_message = %(Field "#{table.name}.#{field.name}" has unknown type "#{field.type}")
                 errors << error_message
               end
             end

data/lib/db_schema/version.rb

@@ -1,3 +1,3 @@
 module DbSchema
-  VERSION = '0.2.2'
+  VERSION = '0.2.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: db_schema
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Vsevolod Romashov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-06 00:00:00.000000000 Z
+date: 2016-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel