rom-sql 2.2.1 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a673acd61e77b7b2c2a49c3dd781e06d716cec4e
-  data.tar.gz: e45523ac3f3c46e314fe529eb98d6ac721694e8d
+  metadata.gz: a1b126e654068572dfe518a3f20c6b9765e81034
+  data.tar.gz: 24ca2db041cb3fa88c09a158108bac16eda8b59b
 SHA512:
-  metadata.gz: d810deb9e4bc9d86bd35d8603644a7aa87dd7f2f7b712d681d9260482763c376f367535a22833f1b18ab36ff9d67ef26c175e4339967d52b6a7a18dfead68bf8
-  data.tar.gz: fc32e693d9b079c81108f495df1e42fcb8cdfa971104fead58c635f75a7fcb837933eb743265be7a866282f417a3d937fb7e166ebb319090809ef43ada8e331a
+  metadata.gz: e9a57e3e5cda1c2935d983270e366535f934740ee0a0f20ed849c9be8bb4915c143324449726271e5d7b495a1db79f41ee4a389fbe73dceeb3ff5b02bfc0237f
+  data.tar.gz: '0873247af106241abb709249a3a2bd4fcb8d11708cfbdeb6610cebd2d5175c1d279c136e920db767cc3ecf80882ba8972c252d64c75e9b713393b547edbb47ac'

data/CHANGELOG.md

@@ -1,3 +1,22 @@
+## v2.3.0 2017-11-17
+
+### Added
+
+* Command's `:timestamp` plugin now supports passing options (GustavoCaso)
+* Configuration supports hash with connection options (Kjarrigan + solnic)
+
+### Fixed
+
+* Aliased attributes are handled correctly in PG's commands (cflipse)
+* Command extensions are properly applied in multi-adapter setups (solnic)
+
+### Internal
+
+* Custom SQL-specific mapper compiler was added, which is used starting from rom-core 4.1.0 (solnic)
+* Command's `:timestamp` plugin was removed, as it was moved to rom-core (GustavoCaso)
+
+[Compare v2.2.1...v2.3.0](https://github.com/rom-rb/rom-sql/compare/v2.2.1...v2.3.0)
+
 ## v2.2.1 2017-11-10
 
 ### Fixed

data/lib/rom/sql.rb

@@ -9,6 +9,7 @@ require 'rom/configuration_dsl'
 
 require 'rom/sql/plugins'
 require 'rom/sql/relation'
+require 'rom/sql/mapper_compiler'
 require 'rom/sql/associations'
 require 'rom/sql/gateway'
 require 'rom/sql/migration'

data/lib/rom/sql/dsl.rb

@@ -1,3 +1,4 @@
+require 'rom/support/inflector'
 require 'rom/constants'
 
 module ROM
@@ -49,7 +50,7 @@ module ROM
 
       # @api private
       def type(identifier)
-        type_name = ::Dry::Core::Inflector.classify(identifier)
+        type_name = Inflector.classify(identifier)
         types.const_get(type_name) if types.const_defined?(type_name)
       end
 

data/lib/rom/sql/extensions/postgres/commands.rb

@@ -15,7 +15,7 @@ module ROM
           #
           # @api private
           def returning_dataset
-            relation.dataset.returning(*relation.columns)
+            relation.dataset.returning(*relation.qualified_columns)
           end
         end
 
@@ -133,18 +133,23 @@ module ROM
 
     Gateway.subscribe('configuration.commands.class.before_build') do |event|
       klass = event[:command]
-      dataset = event[:dataset]
-      type = dataset.db.database_type
-
-      if type == :postgres
-        ext =
-          if klass < Commands::Create
-            Postgres::Commands::Create
-          elsif klass < Commands::Update
-            Postgres::Commands::Update
-          end
 
-        klass.include(ext) if ext
+      # TODO: remove this conditional in favor of `adapter: :sql` in subscribe
+      #       this is here for backward compatibilty with rom-core 4.x
+      if klass.adapter == :sql
+        dataset = event[:dataset]
+        type = dataset.db.database_type
+
+        if type == :postgres
+          ext =
+            if klass < Commands::Create
+              Postgres::Commands::Create
+            elsif klass < Commands::Update
+              Postgres::Commands::Update
+            end
+
+          klass.include(ext) if ext
+        end
       end
     end
   end

data/lib/rom/sql/gateway.rb

@@ -213,6 +213,8 @@ module ROM
         case uri
         when ::Sequel::Database
           uri
+        when Hash
+          ::Sequel.connect(uri, *args)
         else
           ::Sequel.connect(uri.to_s, *args)
         end

data/lib/rom/sql/mapper_compiler.rb

@@ -0,0 +1,17 @@
+require 'rom/mapper_compiler'
+
+module ROM
+  module SQL
+    class MapperCompiler < ROM::MapperCompiler
+      def visit_attribute(node)
+        name, _, meta = node
+
+        if meta[:wrapped]
+          [name, from: meta[:alias]]
+        else
+          [name]
+        end
+      end
+    end
+  end
+end

data/lib/rom/sql/plugins.rb

@@ -3,13 +3,10 @@ require 'rom/plugins/relation/sql/auto_restrictions'
 
 require 'rom/sql/plugin/associates'
 require 'rom/sql/plugin/pagination'
-require 'rom/sql/plugin/timestamps'
 
 ROM.plugins do
   adapter :sql do
     register :pagination, ROM::SQL::Plugin::Pagination, type: :relation
     register :associates, ROM::SQL::Plugin::Associates, type: :command
-
-    register :timestamps, ROM::SQL::Plugin::Timestamps, type: :command
   end
 end

data/lib/rom/sql/relation/reading.rb

@@ -1,4 +1,4 @@
-require 'dry/core/inflector'
+require 'rom/support/inflector'
 
 module ROM
   module SQL
@@ -90,7 +90,7 @@ module ROM
         # @return [Relation]
         #
         # @api public
-        def prefix(name = Dry::Core::Inflector.singularize(schema.name.dataset))
+        def prefix(name = Inflector.singularize(schema.name.dataset))
           schema.prefix(name).(self)
         end
 

data/lib/rom/sql/relation/writing.rb

@@ -9,7 +9,7 @@ module ROM
         #
         # @example
         #   users.upsert({ name: 'Jane', email: 'jane@foo.com' },
-        #                { target: :email, update: { name: :excluded__name } }
+        #                { target: :email, update: { name: :excluded__name } })
         #
         # @return [Integer] Number of affected rows
         #

data/lib/rom/sql/version.rb

@@ -1,5 +1,5 @@
 module ROM
   module SQL
-    VERSION = '2.2.1'.freeze
+    VERSION = '2.3.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rom-sql
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.3.0
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-10 00:00:00.000000000 Z
+date: 2017-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -78,20 +78,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.0.2
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.0.2
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -190,6 +184,7 @@ files:
 - lib/rom/sql/gateway.rb
 - lib/rom/sql/group_dsl.rb
 - lib/rom/sql/index.rb
+- lib/rom/sql/mapper_compiler.rb
 - lib/rom/sql/migration.rb
 - lib/rom/sql/migration/inline_runner.rb
 - lib/rom/sql/migration/migrator.rb
@@ -201,7 +196,6 @@ files:
 - lib/rom/sql/order_dsl.rb
 - lib/rom/sql/plugin/associates.rb
 - lib/rom/sql/plugin/pagination.rb
-- lib/rom/sql/plugin/timestamps.rb
 - lib/rom/sql/plugins.rb
 - lib/rom/sql/projection_dsl.rb
 - lib/rom/sql/rake_task.rb
@@ -210,7 +204,6 @@ files:
 - lib/rom/sql/relation/writing.rb
 - lib/rom/sql/restriction_dsl.rb
 - lib/rom/sql/schema.rb
-- lib/rom/sql/schema/associations_dsl.rb
 - lib/rom/sql/schema/attributes_inferrer.rb
 - lib/rom/sql/schema/dsl.rb
 - lib/rom/sql/schema/index_dsl.rb

data/lib/rom/sql/plugin/timestamps.rb

@@ -1,131 +0,0 @@
-require 'set'
-
-module ROM
-  module SQL
-    module Plugin
-      # Make a command that automatically fills in timestamp attributes on
-      # input tuples
-      #
-      # @api private
-      module Timestamps
-        # @api private
-        def self.included(klass)
-          klass.extend(ClassInterface)
-          super
-        end
-
-        module ClassInterface
-          # @api private
-          def self.extended(klass)
-            klass.defines :timestamp_columns, :datestamp_columns
-            klass.timestamp_columns Set.new
-            klass.datestamp_columns Set.new
-
-            super
-          end
-
-          # Set up attributes to timestamp when the command is called
-          #
-          # @example
-          #   class CreateTask < ROM::Commands::Create[:sql]
-          #     result :one
-          #     use :timestamps
-          #     timestamps :created_at, :updated_at
-          #   end
-          #
-          #   create_user = rom.command(:user).create.curry(name: 'Jane')
-          #
-          #   result = create_user.call
-          #   result[:created_at]  #=> Time.now.utc
-          #
-          # @param [Array<Symbol>] names A list of attribute names
-          #
-          # @api public
-          def timestamps(*names)
-            timestamp_columns timestamp_columns.merge(names)
-
-            include InstanceMethods
-          end
-          alias timestamp timestamps
-
-          # Set up attributes to datestamp when the command is called
-          #
-          # @example
-          #   class CreateTask < ROM::Commands::Create[:sql]
-          #     result :one
-          #     use :timestamps
-          #     datestamps :created_on, :updated_on
-          #   end
-          #
-          #   create_user = rom.command(:user).create.curry(name: 'Jane')
-          #
-          #   result = create_user.call
-          #   result[:created_at]  #=> Date.today
-          #
-          # @param [Array<Symbol>] names A list of attribute names
-          #
-          # @api public
-          def datestamps(*names)
-            datestamp_columns datestamp_columns.merge(names)
-
-            include InstanceMethods
-          end
-          alias datestamp datestamps
-        end
-
-        module InstanceMethods
-          # @api private
-          def self.included(base)
-            base.before :set_timestamps
-          end
-
-          # @api private
-          def timestamp_columns
-            self.class.timestamp_columns
-          end
-
-          # @api private
-          def datestamp_columns
-            self.class.datestamp_columns
-          end
-
-          # Set the timestamp attributes on the given tuples
-          #
-          # @param [Array<Hash>, Hash] tuples the input tuple(s)
-          #
-          # @return [Array<Hash>, Hash]
-          #
-          # @api private
-          def set_timestamps(tuples, *)
-            timestamps = build_timestamps
-
-            case tuples
-            when Hash
-              timestamps.merge(tuples)
-            when Array
-              tuples.map { |t| timestamps.merge(t) }
-            end
-          end
-
-          private
-
-          # @api private
-          def build_timestamps
-            time        = Time.now.utc
-            date        = Date.today
-            timestamps  = {}
-            timestamp_columns.each do |column|
-              timestamps[column.to_sym] = time
-            end
-
-            datestamp_columns.each do |column|
-              timestamps[column.to_sym] = date
-            end
-
-            timestamps
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,188 +0,0 @@
-require 'dry/core/inflector'
-
-require 'rom/associations/definitions'
-
-module ROM
-  module SQL
-    class Schema < ROM::Schema
-      # Additional schema DSL for definition SQL associations
-      #
-      # This DSL is exposed in `associations do .. end` blocks in schema defintions.
-      #
-      # @api public
-      class AssociationsDSL < BasicObject
-        # @!attribute [r] source
-        #   @return [Relation::Name] The source relation
-        attr_reader :source
-
-        # @!attribute [r] registry
-        #   @return [RelationRegistry] Relations registry from a rom container
-        attr_reader :registry
-
-        # @api private
-        def initialize(source, &block)
-          @source = source
-          @registry = {}
-          instance_exec(&block)
-        end
-
-        # Establish a one-to-many association
-        #
-        # @example using relation identifier
-        #   has_many :tasks
-        #
-        # @example with a :through option
-        #   # this establishes many-to-many association
-        #   has_many :tasks, through: :users_tasks
-        #
-        # @example using aliased association with a custom view
-        #   has_many :posts, as: :published_posts, view: :published
-        #
-        # @example using custom target relation
-        #   has_many :user_posts, relation: :posts
-        #
-        # @param [Symbol] target The target relation identifier
-        # @param [Hash] options A hash with additional options
-        #
-        # @return [Associations::OneToMany]
-        #
-        # @see #many_to_many
-        #
-        # @api public
-        def one_to_many(target, options = {})
-          if options[:through]
-            many_to_many(target, options)
-          else
-            add(::ROM::Associations::Definitions::OneToMany.new(source, target, options))
-          end
-        end
-        alias_method :has_many, :one_to_many
-
-        # Establish a one-to-one association
-        #
-        # @example using relation identifier
-        #   one_to_one :addresses, as: :address
-        #
-        # @example with an intermediate join relation
-        #   one_to_one :tasks, as: :priority_task, through: :assignments
-        #
-        # @param [Symbol] target The target relation identifier
-        # @param [Hash] options A hash with additional options
-        #
-        # @return [Associations::OneToOne]
-        #
-        # @see #belongs_to
-        #
-        # @api public
-        def one_to_one(target, options = {})
-          if options[:through]
-            one_to_one_through(target, options)
-          else
-            add(::ROM::Associations::Definitions::OneToOne.new(source, target, options))
-          end
-        end
-
-        # Establish a one-to-one association with a :through option
-        #
-        # @example
-        #   one_to_one_through :users, as: :author, through: :users_posts
-        #
-        # @return [Associations::OneToOneThrough]
-        #
-        # @api public
-        def one_to_one_through(target, options = {})
-          add(::ROM::Associations::Definitions::OneToOneThrough.new(source, target, options))
-        end
-
-        # Establish a many-to-many association
-        #
-        # @example using relation identifier
-        #   many_to_many :tasks, through: :users_tasks
-        #
-        # @param [Symbol] target The target relation identifier
-        # @param [Hash] options A hash with additional options
-        #
-        # @return [Associations::OneToOne]
-        #
-        # @see #one_to_many
-        #
-        # @api public
-        def many_to_many(target, options = {})
-          add(::ROM::Associations::Definitions::ManyToMany.new(source, target, options))
-        end
-
-        # Establish a many-to-one association
-        #
-        # @example using relation identifier
-        #   many_to_one :users, as: :author
-        #
-        # @param [Symbol] target The target relation identifier
-        # @param [Hash] options A hash with additional options
-        #
-        # @return [Associations::OneToOne]
-        #
-        # @see #one_to_many
-        #
-        # @api public
-        def many_to_one(target, options = {})
-          add(::ROM::Associations::Definitions::ManyToOne.new(source, target, options))
-        end
-
-        # Shortcut for many_to_one which sets alias automatically
-        #
-        # @example with an alias (relation identifier is inferred via pluralization)
-        #   belongs_to :user
-        #
-        # @example with an explicit alias
-        #   belongs_to :users, as: :author
-        #
-        # @see #many_to_one
-        #
-        # @return [Associations::ManyToOne]
-        #
-        # @api public
-        def belongs_to(name, options = {})
-          many_to_one(dataset_name(name), {as: name}.merge(options))
-        end
-
-        # Shortcut for one_to_one which sets alias automatically
-        #
-        # @example with an alias (relation identifier is inferred via pluralization)
-        #   one_to_one :address
-        #
-        # @example with an explicit alias and a custom view
-        #   one_to_one :posts, as: :priority_post, view: :prioritized
-        #
-        # @see #one_to_one
-        #
-        # @return [Associations::ManyToOne]
-        #
-        # @api public
-        def has_one(name, options = {})
-          one_to_one(dataset_name(name), {as: name}.merge(options))
-        end
-
-        # Return an association set for a schema
-        #
-        # @return [AssociationSet]
-        #
-        # @api private
-        def call
-          AssociationSet.new(registry)
-        end
-
-        private
-
-        # @api private
-        def add(association)
-          registry[association.name] = association
-        end
-
-        # @api private
-        def dataset_name(name)
-          ::Dry::Core::Inflector.pluralize(name).to_sym
-        end
-      end
-    end
-  end
-end