rom-sql 2.0.0.beta2 → 2.0.0.beta3

data/lib/rom/sql/schema/type_builder.rb

@@ -0,0 +1,94 @@
+module ROM
+  module SQL
+    class Schema
+      # @api private
+      class TypeBuilder
+        extend Dry::Core::ClassAttributes
+
+        defines :registry
+
+        def self.register(db_type, builder)
+          registry[db_type] = builder
+        end
+
+        def self.[](db_type)
+          registry[db_type]
+        end
+
+        registry Hash.new(new.freeze)
+
+        defines :ruby_type_mapping, :numeric_pk_type
+
+        DECIMAL_REGEX = /(?:decimal|numeric)\((\d+)(?:,\s*(\d+))?\)/.freeze
+
+        ruby_type_mapping(
+          integer: Types::Int,
+          string: Types::String,
+          time: Types::Time,
+          date: Types::Date,
+          datetime: Types::Time,
+          boolean: Types::Bool,
+          decimal: Types::Decimal,
+          float: Types::Float,
+          blob: Types::Blob
+        ).freeze
+
+        numeric_pk_type Types::Serial
+
+        def call(primary_key:, db_type:, type:, allow_null:, **rest)
+          if primary_key
+            map_pk_type(type, db_type)
+          else
+            mapped_type = map_type(type, db_type, rest)
+
+            if mapped_type
+              read_type = mapped_type.meta[:read]
+
+              if read_type && allow_null
+                mapped_type.optional.meta(read: read_type.optional)
+              elsif allow_null
+                mapped_type.optional
+              else
+                mapped_type
+              end
+            end
+          end
+        end
+
+        # @api private
+        def map_pk_type(_ruby_type, _db_type)
+          self.class.numeric_pk_type.meta(primary_key: true)
+        end
+
+        # @api private
+        def map_type(ruby_type, db_type, **kw)
+          type = self.class.ruby_type_mapping[ruby_type]
+
+          if db_type.is_a?(String) && db_type.include?('numeric') || db_type.include?('decimal')
+            map_decimal_type(db_type)
+          elsif db_type.is_a?(String) && db_type.include?('char') && kw[:max_length]
+            type.meta(limit: kw[:max_length])
+          else
+            type
+          end
+        end
+
+        # @api private
+        def map_decimal_type(type)
+          precision = DECIMAL_REGEX.match(type)
+
+          if precision
+            prcsn, scale = precision[1..2].map(&:to_i)
+
+            self.class.ruby_type_mapping[:decimal].meta(
+              precision: prcsn,
+              scale: scale
+            )
+          else
+            self.class.ruby_type_mapping[:decimal]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rom/sql/type_dsl.rb

@@ -0,0 +1,30 @@
+module ROM
+  module SQL
+    class TypeDSL
+      attr_reader :definition, :input_constructor, :output_constructor
+
+      def initialize(value_type)
+        if value_type.class < ::Dry::Types::Type
+          @definition = value_type
+        else
+          @definition = ::ROM::SQL::Types.Definition(value_type)
+        end
+      end
+
+      def call(&block)
+        instance_exec(&block)
+
+        definition.constructor(input_constructor)
+          .meta(read: definition.constructor(output_constructor))
+      end
+
+      def input(&block)
+        @input_constructor = block
+      end
+
+      def output(&block)
+        @output_constructor = block
+      end
+    end
+  end
+end

data/lib/rom/sql/type_extensions.rb

@@ -12,9 +12,9 @@ module ROM
         # @return [Hash]
         #
         # @api public
-        def [](type)
-          unwrapped = type.optional? ? type.right : type
-          @types[unwrapped.pristine] || EMPTY_HASH
+        def [](wrapped)
+          type = wrapped.optional? ? wrapped.right : wrapped
+          @types[type.meta[:database]][type.meta[:db_type]] || EMPTY_HASH
         end
 
         # Registers a set of operations supported for a specific type
@@ -30,15 +30,20 @@ module ROM
         #
         # @api public
         def register(type, &block)
-          raise ArgumentError, "Type #{ type } already registered" if @types.key?(type)
+          extensions = @types[type.meta[:database]]
+          db_type = type.meta[:db_type]
+
+          raise ArgumentError, "Type #{ db_type } already registered" if extensions.key?(db_type)
           mod = Module.new(&block)
           ctx = Object.new.extend(mod)
           functions = mod.public_instance_methods.each_with_object({}) { |m, ms| ms[m] = ctx.method(m) }
-          @types[type] = functions
+          extensions[db_type] = functions
         end
       end
 
-      @types = {}
+      @types = ::Hash.new do |hash, database|
+        hash[database] = {}
+      end
     end
   end
 end

data/lib/rom/sql/type_serializer.rb

@@ -0,0 +1,46 @@
+require 'dry/core/class_attributes'
+
+module ROM
+  module SQL
+    # @api private
+    class TypeSerializer
+      extend Dry::Core::ClassAttributes
+
+      defines :registry
+
+      def self.register(db_type, builder)
+        registry[db_type] = builder
+      end
+
+      def self.[](db_type)
+        registry[db_type]
+      end
+
+      registry Hash.new(new.freeze)
+
+      defines :mapping
+
+      mapping(
+        Types::Int => 'integer',
+        Types::String => 'varchar',
+        Types::Time => 'timestamp',
+        Types::Date => 'date',
+        Types::Bool => 'boolean',
+        Types::Decimal => 'numeric',
+        Types::Float => 'float',
+      )
+
+      def call(type)
+        return type.meta[:db_type] if type.meta[:db_type]
+
+        meta = type.meta[:read] ? { read: type.meta[:read] } : EMPTY_HASH
+
+        self.class.mapping.fetch(type.with(meta: meta)) {
+          if block_given?
+            yield(type)
+          end or raise "Cannot serialize #{ type }"
+        }
+      end
+    end
+  end
+end

data/lib/rom/sql/types.rb

@@ -1,4 +1,8 @@
+require 'sequel/core'
+require 'sequel/sql'
+
 require 'rom/types'
+require 'rom/sql/type_dsl'
 
 module ROM
   module SQL
@@ -13,6 +17,14 @@ module ROM
         ROM::Types.Definition(*args, &block)
       end
 
+      def self.ForeignKey(relation, type = Types::Int.meta(index: true))
+        super
+      end
+
+      def self.define(value_type, &block)
+        TypeDSL.new(value_type).call(&block)
+      end
+
       Serial = Int.meta(primary_key: true)
 
       Blob = Constructor(Sequel::SQL::Blob, &Sequel::SQL::Blob.method(:new))

data/lib/rom/sql/version.rb

@@ -1,5 +1,5 @@
 module ROM
   module SQL
-    VERSION = '2.0.0.beta2'.freeze
+    VERSION = '2.0.0.beta3'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rom-sql
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta2
+  version: 2.0.0.beta3
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-04 00:00:00.000000000 Z
+date: 2017-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -45,6 +45,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.11'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.11.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -52,6 +55,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.11'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.11.1
 - !ruby/object:Gem::Dependency
   name: dry-core
   requirement: !ruby/object:Gem::Requirement
@@ -129,21 +135,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".codeclimate.yml"
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
-- ".yardopts"
 - CHANGELOG.md
-- Gemfile
-- Guardfile
-- LICENSE.txt
 - README.md
-- Rakefile
-- circle.yml
 - lib/rom-sql.rb
 - lib/rom/plugins/relation/sql/auto_restrictions.rb
 - lib/rom/plugins/relation/sql/instrumentation.rb
+- lib/rom/plugins/relation/sql/postgres/explain.rb
 - lib/rom/sql.rb
 - lib/rom/sql/associations.rb
 - lib/rom/sql/associations/core.rb
@@ -165,15 +162,21 @@ files:
 - lib/rom/sql/extensions.rb
 - lib/rom/sql/extensions/active_support_notifications.rb
 - lib/rom/sql/extensions/mysql.rb
-- lib/rom/sql/extensions/mysql/attributes_inferrer.rb
+- lib/rom/sql/extensions/mysql/type_builder.rb
 - lib/rom/sql/extensions/postgres.rb
-- lib/rom/sql/extensions/postgres/attributes_inferrer.rb
 - lib/rom/sql/extensions/postgres/commands.rb
+- lib/rom/sql/extensions/postgres/type_builder.rb
+- lib/rom/sql/extensions/postgres/type_serializer.rb
 - lib/rom/sql/extensions/postgres/types.rb
+- lib/rom/sql/extensions/postgres/types/array.rb
+- lib/rom/sql/extensions/postgres/types/geometric.rb
+- lib/rom/sql/extensions/postgres/types/json.rb
+- lib/rom/sql/extensions/postgres/types/network.rb
 - lib/rom/sql/extensions/rails_log_subscriber.rb
 - lib/rom/sql/extensions/sqlite.rb
-- lib/rom/sql/extensions/sqlite/attributes_inferrer.rb
+- lib/rom/sql/extensions/sqlite/type_builder.rb
 - lib/rom/sql/extensions/sqlite/types.rb
+- lib/rom/sql/foreign_key.rb
 - lib/rom/sql/function.rb
 - lib/rom/sql/gateway.rb
 - lib/rom/sql/group_dsl.rb
@@ -181,8 +184,11 @@ files:
 - lib/rom/sql/migration.rb
 - lib/rom/sql/migration/inline_runner.rb
 - lib/rom/sql/migration/migrator.rb
+- lib/rom/sql/migration/recorder.rb
+- lib/rom/sql/migration/runner.rb
 - lib/rom/sql/migration/schema_diff.rb
 - lib/rom/sql/migration/template.rb
+- lib/rom/sql/migration/writer.rb
 - lib/rom/sql/order_dsl.rb
 - lib/rom/sql/plugin/associates.rb
 - lib/rom/sql/plugin/pagination.rb
@@ -192,7 +198,6 @@ files:
 - lib/rom/sql/rake_task.rb
 - lib/rom/sql/relation.rb
 - lib/rom/sql/relation/reading.rb
-- lib/rom/sql/relation/sequel_api.rb
 - lib/rom/sql/relation/writing.rb
 - lib/rom/sql/restriction_dsl.rb
 - lib/rom/sql/schema.rb
@@ -201,127 +206,16 @@ files:
 - lib/rom/sql/schema/dsl.rb
 - lib/rom/sql/schema/index_dsl.rb
 - lib/rom/sql/schema/inferrer.rb
+- lib/rom/sql/schema/type_builder.rb
 - lib/rom/sql/spec/support.rb
 - lib/rom/sql/tasks/migration_tasks.rake
 - lib/rom/sql/transaction.rb
+- lib/rom/sql/type_dsl.rb
 - lib/rom/sql/type_extensions.rb
+- lib/rom/sql/type_serializer.rb
 - lib/rom/sql/types.rb
 - lib/rom/sql/version.rb
 - lib/rom/sql/wrap.rb
-- log/.gitkeep
-- rom-sql.gemspec
-- spec/extensions/postgres/attribute_spec.rb
-- spec/extensions/postgres/integration_spec.rb
-- spec/extensions/postgres/types_spec.rb
-- spec/extensions/sqlite/types_spec.rb
-- spec/fixtures/migrations/20150403090603_create_carrots.rb
-- spec/integration/associations/many_to_many/custom_fks_spec.rb
-- spec/integration/associations/many_to_many/from_view_spec.rb
-- spec/integration/associations/many_to_many_spec.rb
-- spec/integration/associations/many_to_one/custom_fks_spec.rb
-- spec/integration/associations/many_to_one/from_view_spec.rb
-- spec/integration/associations/many_to_one/self_ref_spec.rb
-- spec/integration/associations/many_to_one_spec.rb
-- spec/integration/associations/one_to_many/custom_fks_spec.rb
-- spec/integration/associations/one_to_many/from_view_spec.rb
-- spec/integration/associations/one_to_many/self_ref_spec.rb
-- spec/integration/associations/one_to_many_spec.rb
-- spec/integration/associations/one_to_one_spec.rb
-- spec/integration/associations/one_to_one_through_spec.rb
-- spec/integration/auto_migrations/errors_spec.rb
-- spec/integration/auto_migrations/indexes_spec.rb
-- spec/integration/auto_migrations/managing_columns_spec.rb
-- spec/integration/auto_migrations/postgres/column_types_spec.rb
-- spec/integration/combine_with_spec.rb
-- spec/integration/commands/create_spec.rb
-- spec/integration/commands/delete_spec.rb
-- spec/integration/commands/update_spec.rb
-- spec/integration/commands/upsert_spec.rb
-- spec/integration/gateway_spec.rb
-- spec/integration/migration_spec.rb
-- spec/integration/plugins/associates/many_to_many_spec.rb
-- spec/integration/plugins/associates_spec.rb
-- spec/integration/plugins/auto_restrictions_spec.rb
-- spec/integration/relation_schema_spec.rb
-- spec/integration/schema/call_spec.rb
-- spec/integration/schema/inferrer/mysql_spec.rb
-- spec/integration/schema/inferrer/postgres_spec.rb
-- spec/integration/schema/inferrer/sqlite_spec.rb
-- spec/integration/schema/inferrer_spec.rb
-- spec/integration/schema/prefix_spec.rb
-- spec/integration/schema/qualified_spec.rb
-- spec/integration/schema/rename_spec.rb
-- spec/integration/schema/view_spec.rb
-- spec/integration/sequel_api_spec.rb
-- spec/integration/setup_spec.rb
-- spec/integration/support/active_support_notifications_spec.rb
-- spec/integration/support/rails_log_subscriber_spec.rb
-- spec/integration/wrap_spec.rb
-- spec/shared/accounts.rb
-- spec/shared/database_setup.rb
-- spec/shared/notes.rb
-- spec/shared/posts.rb
-- spec/shared/puppies.rb
-- spec/shared/relations.rb
-- spec/shared/users.rb
-- spec/shared/users_and_tasks.rb
-- spec/spec_helper.rb
-- spec/support/env_helper.rb
-- spec/support/helpers.rb
-- spec/support/oracle/create_users.sql
-- spec/support/oracle/set_sys_passwords.sql
-- spec/support/test_configuration.rb
-- spec/unit/attribute_spec.rb
-- spec/unit/function_spec.rb
-- spec/unit/gateway_spec.rb
-- spec/unit/logger_spec.rb
-- spec/unit/migration_tasks_spec.rb
-- spec/unit/migrator_spec.rb
-- spec/unit/order_dsl_spec.rb
-- spec/unit/plugin/associates_spec.rb
-- spec/unit/plugin/pagination_spec.rb
-- spec/unit/plugin/timestamp_spec.rb
-- spec/unit/projection_dsl_spec.rb
-- spec/unit/relation/assoc_spec.rb
-- spec/unit/relation/associations_spec.rb
-- spec/unit/relation/avg_spec.rb
-- spec/unit/relation/by_pk_spec.rb
-- spec/unit/relation/dataset_spec.rb
-- spec/unit/relation/distinct_spec.rb
-- spec/unit/relation/exclude_spec.rb
-- spec/unit/relation/exist_predicate_spec.rb
-- spec/unit/relation/exists_spec.rb
-- spec/unit/relation/fetch_spec.rb
-- spec/unit/relation/group_spec.rb
-- spec/unit/relation/having_spec.rb
-- spec/unit/relation/inner_join_spec.rb
-- spec/unit/relation/inspect_spec.rb
-- spec/unit/relation/instrument_spec.rb
-- spec/unit/relation/invert_spec.rb
-- spec/unit/relation/left_join_spec.rb
-- spec/unit/relation/lock_spec.rb
-- spec/unit/relation/map_spec.rb
-- spec/unit/relation/max_spec.rb
-- spec/unit/relation/min_spec.rb
-- spec/unit/relation/order_spec.rb
-- spec/unit/relation/pluck_spec.rb
-- spec/unit/relation/prefix_spec.rb
-- spec/unit/relation/primary_key_spec.rb
-- spec/unit/relation/project_spec.rb
-- spec/unit/relation/qualified_columns_spec.rb
-- spec/unit/relation/qualified_spec.rb
-- spec/unit/relation/read_spec.rb
-- spec/unit/relation/rename_spec.rb
-- spec/unit/relation/right_join_spec.rb
-- spec/unit/relation/select_append_spec.rb
-- spec/unit/relation/select_spec.rb
-- spec/unit/relation/sum_spec.rb
-- spec/unit/relation/union_spec.rb
-- spec/unit/relation/unique_predicate_spec.rb
-- spec/unit/relation/where_spec.rb
-- spec/unit/restriction_dsl_spec.rb
-- spec/unit/schema_spec.rb
-- spec/unit/types_spec.rb
 homepage: http://rom-rb.org
 licenses:
 - MIT
@@ -342,120 +236,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: SQL databases support for ROM
-test_files:
-- spec/extensions/postgres/attribute_spec.rb
-- spec/extensions/postgres/integration_spec.rb
-- spec/extensions/postgres/types_spec.rb
-- spec/extensions/sqlite/types_spec.rb
-- spec/fixtures/migrations/20150403090603_create_carrots.rb
-- spec/integration/associations/many_to_many/custom_fks_spec.rb
-- spec/integration/associations/many_to_many/from_view_spec.rb
-- spec/integration/associations/many_to_many_spec.rb
-- spec/integration/associations/many_to_one/custom_fks_spec.rb
-- spec/integration/associations/many_to_one/from_view_spec.rb
-- spec/integration/associations/many_to_one/self_ref_spec.rb
-- spec/integration/associations/many_to_one_spec.rb
-- spec/integration/associations/one_to_many/custom_fks_spec.rb
-- spec/integration/associations/one_to_many/from_view_spec.rb
-- spec/integration/associations/one_to_many/self_ref_spec.rb
-- spec/integration/associations/one_to_many_spec.rb
-- spec/integration/associations/one_to_one_spec.rb
-- spec/integration/associations/one_to_one_through_spec.rb
-- spec/integration/auto_migrations/errors_spec.rb
-- spec/integration/auto_migrations/indexes_spec.rb
-- spec/integration/auto_migrations/managing_columns_spec.rb
-- spec/integration/auto_migrations/postgres/column_types_spec.rb
-- spec/integration/combine_with_spec.rb
-- spec/integration/commands/create_spec.rb
-- spec/integration/commands/delete_spec.rb
-- spec/integration/commands/update_spec.rb
-- spec/integration/commands/upsert_spec.rb
-- spec/integration/gateway_spec.rb
-- spec/integration/migration_spec.rb
-- spec/integration/plugins/associates/many_to_many_spec.rb
-- spec/integration/plugins/associates_spec.rb
-- spec/integration/plugins/auto_restrictions_spec.rb
-- spec/integration/relation_schema_spec.rb
-- spec/integration/schema/call_spec.rb
-- spec/integration/schema/inferrer/mysql_spec.rb
-- spec/integration/schema/inferrer/postgres_spec.rb
-- spec/integration/schema/inferrer/sqlite_spec.rb
-- spec/integration/schema/inferrer_spec.rb
-- spec/integration/schema/prefix_spec.rb
-- spec/integration/schema/qualified_spec.rb
-- spec/integration/schema/rename_spec.rb
-- spec/integration/schema/view_spec.rb
-- spec/integration/sequel_api_spec.rb
-- spec/integration/setup_spec.rb
-- spec/integration/support/active_support_notifications_spec.rb
-- spec/integration/support/rails_log_subscriber_spec.rb
-- spec/integration/wrap_spec.rb
-- spec/shared/accounts.rb
-- spec/shared/database_setup.rb
-- spec/shared/notes.rb
-- spec/shared/posts.rb
-- spec/shared/puppies.rb
-- spec/shared/relations.rb
-- spec/shared/users.rb
-- spec/shared/users_and_tasks.rb
-- spec/spec_helper.rb
-- spec/support/env_helper.rb
-- spec/support/helpers.rb
-- spec/support/oracle/create_users.sql
-- spec/support/oracle/set_sys_passwords.sql
-- spec/support/test_configuration.rb
-- spec/unit/attribute_spec.rb
-- spec/unit/function_spec.rb
-- spec/unit/gateway_spec.rb
-- spec/unit/logger_spec.rb
-- spec/unit/migration_tasks_spec.rb
-- spec/unit/migrator_spec.rb
-- spec/unit/order_dsl_spec.rb
-- spec/unit/plugin/associates_spec.rb
-- spec/unit/plugin/pagination_spec.rb
-- spec/unit/plugin/timestamp_spec.rb
-- spec/unit/projection_dsl_spec.rb
-- spec/unit/relation/assoc_spec.rb
-- spec/unit/relation/associations_spec.rb
-- spec/unit/relation/avg_spec.rb
-- spec/unit/relation/by_pk_spec.rb
-- spec/unit/relation/dataset_spec.rb
-- spec/unit/relation/distinct_spec.rb
-- spec/unit/relation/exclude_spec.rb
-- spec/unit/relation/exist_predicate_spec.rb
-- spec/unit/relation/exists_spec.rb
-- spec/unit/relation/fetch_spec.rb
-- spec/unit/relation/group_spec.rb
-- spec/unit/relation/having_spec.rb
-- spec/unit/relation/inner_join_spec.rb
-- spec/unit/relation/inspect_spec.rb
-- spec/unit/relation/instrument_spec.rb
-- spec/unit/relation/invert_spec.rb
-- spec/unit/relation/left_join_spec.rb
-- spec/unit/relation/lock_spec.rb
-- spec/unit/relation/map_spec.rb
-- spec/unit/relation/max_spec.rb
-- spec/unit/relation/min_spec.rb
-- spec/unit/relation/order_spec.rb
-- spec/unit/relation/pluck_spec.rb
-- spec/unit/relation/prefix_spec.rb
-- spec/unit/relation/primary_key_spec.rb
-- spec/unit/relation/project_spec.rb
-- spec/unit/relation/qualified_columns_spec.rb
-- spec/unit/relation/qualified_spec.rb
-- spec/unit/relation/read_spec.rb
-- spec/unit/relation/rename_spec.rb
-- spec/unit/relation/right_join_spec.rb
-- spec/unit/relation/select_append_spec.rb
-- spec/unit/relation/select_spec.rb
-- spec/unit/relation/sum_spec.rb
-- spec/unit/relation/union_spec.rb
-- spec/unit/relation/unique_predicate_spec.rb
-- spec/unit/relation/where_spec.rb
-- spec/unit/restriction_dsl_spec.rb
-- spec/unit/schema_spec.rb
-- spec/unit/types_spec.rb
+test_files: []