rom-sql 1.0.0.beta2 → 1.0.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 240c81ee43a6d5edfbf9b599d7a031196a686978
-  data.tar.gz: 6abdfcd3fdeef06cbbf0794dbb0ebbde658e043e
+  metadata.gz: 3c94e3593d4f6fbe8a49111c097a6721ae9d5dfc
+  data.tar.gz: 0b12c00984a1b6943465d608fe97e66c78beda47
 SHA512:
-  metadata.gz: cdfd38e021013963c48d176d44f7872dd737728254ad066b03a13ded7c90553fd6017651300bd169a6231841f4386e57ce8eb58275c3218b70938a13e42d56cf
-  data.tar.gz: 81459e9c88292c2c37218074ab7adf37070852455604829d95cf360bb12565aca97b6b782bbd1f88b0466b86b73421d9ce05157f008246bcd7d278092e196535
+  metadata.gz: 3fc3303b1f6c7b5415d44186bc857b7f8a5add043b1b9f990f2b003003bfa8fddd87fc6feb30532759b4548919dbfbffeea2c560a42faff3225b0894933ee2c8
+  data.tar.gz: 449816a9fe18c46ba4b65a64e0397121d57c9593a3fffd1ffdab7da04e29eb33a2a40a49cdf8c1859b3e974c68e71a6971eae3afc47a8316715c9c1d8746958d

data/.travis.yml

@@ -14,7 +14,7 @@ after_success:
 script: "bundle exec rake ci"
 rvm:
   - 2.2.5
-  - 2.3.1
+  - 2.3.3
   - 2.4.0
   - rbx-3
   - jruby

data/CHANGELOG.md

@@ -12,10 +12,14 @@ Please refer to [the upgrading guide](https://github.com/rom-rb/rom-sql/wiki/Upg
 * Extended query API with support for schema attributes (solnic)
 * Schemas can project relations automatically (solnic)
 * New `Schema#qualified` (solnic)
+* New `Relation#assoc` method which is a shortcut for accessing relation created by the given association (solnic)
 * Schema attribute types are now SQL-specific and compatible with query DSL (ie you can pass relation attributes to `select` and they will be automatically converted to valid SQL expressions) (solnic)
 * Associations support setting custom `view` that will be used to extend association relation (solnic)
 * Associations support setting custom `foreign_key` names (solnic)
 * Support for self-referencing associations (ie categories have_many child categories) (solnic)
+* Inferrers for mysql and sqlite were added (flash-gordon)
+* PG's auto-inferrer can handle `inet`/`cidr` data types in a two-way manner, i.e. converting them back and forth on reading and writing. Same for `point` datatype (flash-gordon)
+* `ROM::SQL::Relation::SequelAPI` extension for backward-compatible query API (this will be deprecated in 1.1.0 and removed in 2.0.0) (solnic)
 
 ### Changed
 

data/circle.yml

@@ -1,6 +1,6 @@
 machine:
   ruby:
-    version: 2.3.1
+    version: 2.3.3
 dependencies:
   bundler:
     without: [yard guard benchmarks tools]

data/lib/rom/plugins/relation/sql/auto_combine.rb

@@ -32,7 +32,7 @@ module ROM
               source_key, target_key, target =
                 case spec
                 when ROM::SQL::Association
-                  [*spec.join_keys(__registry__).flatten, spec.call(__registry__)]
+                  [*spec.join_keys(__registry__).flatten, spec.call(__registry__, self)]
                 else
                   [*spec.flatten, self]
                 end

data/lib/rom/sql/association.rb

@@ -73,7 +73,11 @@ module ROM
         QualifiedAttribute[name.to_sym, attribute]
       end
 
-      protected
+      # @api protected
+      def apply_view(schema, relation)
+        view_rel = relation.public_send(view)
+        schema.merge(view_rel.schema.qualified).uniq(&:to_sym).(view_rel)
+      end
 
       # @api private
       def join_key_map(relations)

data/lib/rom/sql/association/many_to_many.rb

@@ -17,18 +17,22 @@ module ROM
         end
 
         # @api public
-        def call(relations)
+        def call(relations, target_rel = nil)
           join_rel = join_relation(relations)
           assocs = join_rel.associations
 
-          left = assocs[target].call(relations)
+          left = target_rel ? assocs[target].(relations, target_rel) : assocs[target].(relations)
           right = relations[target.relation]
 
           left_fk = foreign_key || join_rel.foreign_key(source.relation)
 
           schema =
             if left.schema.key?(left_fk)
-              left.schema.project(*(right.schema.map(&:name) + [left_fk]))
+              if target_rel
+                target_rel.schema.merge(left.schema.project(left_fk))
+              else
+                left.schema.project(*(right.schema.map(&:name) + [left_fk]))
+              end
             else
               right.schema.merge(join_rel.schema.project(left_fk))
             end.qualified
@@ -38,7 +42,7 @@ module ROM
             .order(*right.schema.project_pk.qualified)
 
           if view
-            schema.(relation.public_send(view))
+            apply_view(schema, relation)
           else
             schema.(relation)
           end

data/lib/rom/sql/association/many_to_one.rb

@@ -5,8 +5,7 @@ module ROM
         result :one
 
         # @api public
-        def call(relations)
-          left = relations[target.relation]
+        def call(relations, left = relations[target.relation])
           right = relations[source.relation]
 
           left_pk = left.primary_key
@@ -27,7 +26,7 @@ module ROM
             .order(*right_schema.qualified)
 
           if view
-            schema.(relation.public_send(view))
+            apply_view(schema, relation)
           else
             schema.(relation)
           end

data/lib/rom/sql/association/one_to_many.rb

@@ -5,8 +5,7 @@ module ROM
         result :many
 
         # @api public
-        def call(relations)
-          right = relations[target.relation]
+        def call(relations, right = relations[target.relation])
           schema = right.schema.qualified
 
           relation = right
@@ -14,7 +13,7 @@ module ROM
                        .order(*right.schema.project_pk.qualified)
 
           if view
-            schema.(relation.public_send(view))
+            apply_view(schema, relation)
           else
             schema.(relation)
           end

data/lib/rom/sql/commands/create.rb

@@ -16,6 +16,8 @@ module ROM
         use :associates
         use :schema
 
+        after :finalize
+
         # Inserts provided tuples into the database table
         #
         # @api public
@@ -34,6 +36,11 @@ module ROM
 
         private
 
+        # @api private
+        def finalize(tuples, *)
+          tuples.map { |t| relation.output_schema[t] }
+        end
+
         # Executes insert statement and returns inserted tuples
         #
         # @api private
@@ -54,7 +61,7 @@ module ROM
         #
         # @api private
         def with_input_tuples(tuples)
-          input_tuples = Array([tuples]).flatten.map
+          input_tuples = Array([tuples]).flatten(1).map
           return input_tuples unless block_given?
           input_tuples.each { |tuple| yield(tuple) }
         end

data/lib/rom/sql/commands/update.rb

@@ -15,6 +15,8 @@ module ROM
 
         use :schema
 
+        after :finalize
+
         # Updates existing tuple in a relation
         #
         # @return [Array<Hash>, Hash]
@@ -26,6 +28,11 @@ module ROM
 
         private
 
+        # @api private
+        def finalize(tuples, *)
+          tuples.map { |t| relation.output_schema[t] }
+        end
+
         # Executes update statement for a given tuple
         #
         # @api private

data/lib/rom/sql/extensions.rb

@@ -8,6 +8,14 @@ module ROM
       require 'rom/sql/extensions/postgres'
     end
 
+    register_extension(:mysql) do
+      require 'rom/sql/extensions/mysql'
+    end
+
+    register_extension(:sqlite) do
+      require 'rom/sql/extensions/sqlite'
+    end
+
     register_extension(:active_support_notifications) do
       require 'rom/sql/extensions/active_support_notifications'
     end

data/lib/rom/sql/extensions/active_support_notifications.rb

@@ -4,24 +4,13 @@ require 'active_support/notifications'
 module ROM
   module SQL
     module ActiveSupportInstrumentation
-      if Sequel::MAJOR == 4 && Sequel::MINOR < 35
-        def log_yield(sql, args = nil)
-          ActiveSupport::Notifications.instrument(
-            'sql.rom',
-            sql: sql,
-            name: instrumentation_name,
-            binds: args
-          ) { super }
-        end
-      else
-        def log_connection_yield(sql, _conn, args = nil)
-          ActiveSupport::Notifications.instrument(
-            'sql.rom',
-            sql: sql,
-            name: instrumentation_name,
-            binds: args
-          ) { super }
-        end
+      def log_connection_yield(sql, _conn, args = nil)
+        ActiveSupport::Notifications.instrument(
+          'sql.rom',
+          sql: sql,
+          name: instrumentation_name,
+          binds: args
+        ) { super }
       end
 
       private

data/lib/rom/sql/extensions/mysql.rb

@@ -0,0 +1 @@
+require 'rom/sql/extensions/mysql/inferrer'

data/lib/rom/sql/extensions/mysql/inferrer.rb

@@ -0,0 +1,10 @@
+require 'rom/sql/schema/inferrer'
+
+module ROM
+  module SQL
+    class Schema
+      class MysqlInferrer < Inferrer[:mysql]
+      end
+    end
+  end
+end

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

@@ -12,7 +12,7 @@ module ROM
           def insert(tuples)
             tuples.map do |tuple|
               relation.dataset.returning(*relation.columns).insert(tuple)
-            end.flatten
+            end.flatten(1)
           end
 
           # Executes multi_insert statement and returns inserted tuples

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

@@ -20,6 +20,10 @@ module ROM
           'bytea' => Types::Blob,
           'json'  => Types::PG::JSON,
           'jsonb' => Types::PG::JSONB,
+          'inet' => Types::PG::IPAddress,
+          'cidr' => Types::PG::IPAddress,
+          'macaddr' => Types::String,
+          'point' => Types::PG::PointT
         ).freeze
 
         db_array_type_matcher Sequel::Postgres::PGArray::EMPTY_BRACKET

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

@@ -1,5 +1,6 @@
 require 'dry-types'
 require 'sequel'
+require 'ipaddr'
 
 Sequel.extension(*%i(pg_array pg_array_ops pg_json pg_json_ops))
 
@@ -22,43 +23,40 @@ module ROM
 
         # JSON
 
-        JSONArray = Dry::Types::Definition
-                    .new(Sequel::Postgres::JSONArray)
-                    .constructor(Sequel.method(:pg_json))
+        JSONArray = Types.Constructor(Sequel::Postgres::JSONArray, &Sequel.method(:pg_json))
 
-        JSONHash = Dry::Types::Definition
-                   .new(Sequel::Postgres::JSONHash)
-                   .constructor(Sequel.method(:pg_json))
+        JSONHash = Types.Constructor(Sequel::Postgres::JSONArray, &Sequel.method(:pg_json))
 
-        JSONOp = Dry::Types::Definition
-                 .new(Sequel::Postgres::JSONOp)
-                 .constructor(Sequel.method(:pg_json))
+        JSONOp = Types.Constructor(Sequel::Postgres::JSONOp, &Sequel.method(:pg_json))
 
         JSON = JSONArray | JSONHash | JSONOp
 
         # JSONB
 
-        JSONBArray = Dry::Types::Definition
-                     .new(Sequel::Postgres::JSONBArray)
-                     .constructor(Sequel.method(:pg_jsonb))
+        JSONBArray = Types.Constructor(Sequel::Postgres::JSONBArray, &Sequel.method(:pg_jsonb))
 
-        JSONBHash = Dry::Types::Definition
-                    .new(Sequel::Postgres::JSONBHash)
-                    .constructor(Sequel.method(:pg_jsonb))
+        JSONBHash = Types.Constructor(Sequel::Postgres::JSONBHash, &Sequel.method(:pg_jsonb))
 
-        JSONBOp = Dry::Types::Definition
-                  .new(Sequel::Postgres::JSONBOp)
-                  .constructor(Sequel.method(:pg_jsonb))
+        JSONBOp = Types.Constructor(Sequel::Postgres::JSONBOp, &Sequel.method(:pg_jsonb))
 
         JSONB = JSONBArray | JSONBHash | JSONBOp
 
-        Bytea = Dry::Types::Definition
-                .new(Sequel::SQL::Blob)
-                .constructor(Sequel::SQL::Blob.method(:new))
+        Bytea = Types.Constructor(Sequel::SQL::Blob, &Sequel::SQL::Blob.method(:new))
 
-        # MONEY
+        IPAddressR = Types.Constructor(IPAddr) { |ip| IPAddr.new(ip.to_s) }
+
+        IPAddress = Types.Constructor(IPAddr, &:to_s).meta(read: IPAddressR)
 
         Money = Types::Decimal
+
+        Point = ::Struct.new(:x, :y)
+
+        PointTR = Types.Constructor(Point) do |p|
+          x, y = p.to_s[1...-1].split(',', 2)
+          Point.new(Float(x), Float(y))
+        end
+
+        PointT = Types.Constructor(Point) { |p| "(#{ p.x },#{ p.y })" }.meta(read: PointTR)
       end
     end
   end

data/lib/rom/sql/extensions/sqlite.rb

@@ -0,0 +1 @@
+require 'rom/sql/extensions/sqlite/inferrer'

data/lib/rom/sql/extensions/sqlite/inferrer.rb

@@ -0,0 +1,10 @@
+require 'rom/sql/schema/inferrer'
+
+module ROM
+  module SQL
+    class Schema
+      class SqliteInferrer < Inferrer[:sqlite]
+      end
+    end
+  end
+end

data/lib/rom/sql/function.rb

@@ -20,8 +20,12 @@ module ROM
       end
 
       def method_missing(meth, *args)
-        if func && func.respond_to?(meth)
-          meta(func: func.__send__(meth, *args))
+        if func
+          if func.respond_to?(meth)
+            meta(func: func.__send__(meth, *args))
+          else
+            super
+          end
         else
           meta(func: Sequel::SQL::Function.new(meth.to_s.upcase, *args))
         end

data/lib/rom/sql/order_dsl.rb

@@ -10,7 +10,7 @@ module ROM
         if schema.key?(meth)
           schema[meth]
         else
-          ::Sequel::VIRTUAL_ROW.__send__(meth, *args, &block)
+          ::Sequel::VIRTUAL_ROW.__send__(meth.to_s.upcase, *args, &block)
         end
       end
     end

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

@@ -12,9 +12,10 @@ module ROM
             include InstanceMethods
             defines :associations
 
-            associations []
+            associations Hash.new
 
             option :associations, reader: true, optional: true, default: -> cmd { cmd.class.associations }
+            option :configured_associations, reader: true, optional: true, default: proc { [] }
           end
           super
         end
@@ -58,7 +59,17 @@ module ROM
 
           # @api public
           def with_association(name, opts = EMPTY_HASH)
-            self.class.build(relation, options.merge(associations: [[name, opts]]))
+            self.class.build(
+              relation, options.merge(associations: associations.merge(name => opts))
+            )
+          end
+
+          def associations_configured?
+            if configured_associations.empty?
+              false
+            else
+              configured_associations.all? { |name| associations.key?(name) }
+            end
           end
 
           # @api private
@@ -73,7 +84,13 @@ module ROM
           # @api public
           def build(relation, options = EMPTY_HASH)
             command = super
+
+            if command.associations_configured?
+              return command
+            end
+
             associations = command.associations
+            assoc_names = []
 
             before_hooks = associations.each_with_object([]) do |(name, opts), acc|
               relation.associations.try(name) do |assoc|
@@ -83,6 +100,8 @@ module ROM
                   true
                 end
               end or acc << { associate: { assoc: name, keys: opts[:key] } }
+
+              assoc_names << name
             end
 
             after_hooks = associations.each_with_object([]) do |(name, opts), acc|
@@ -92,10 +111,14 @@ module ROM
 
               if assoc.is_a?(Association::ManyToMany)
                 acc << { associate: { assoc: assoc, keys: assoc.join_keys(relation.__registry__) } }
+                assoc_names << name
               end
             end
 
-            command.before(*before_hooks).after(*after_hooks)
+            command.
+              with_opts(configured_associations: assoc_names).
+              before(*before_hooks).
+              after(*after_hooks)
           end
 
           # Set command to associate tuples with a parent tuple using provided keys
@@ -120,12 +143,12 @@ module ROM
           #
           # @api public
           def associates(name, options = EMPTY_HASH)
-            if associations.map(&:first).include?(name)
+            if associations.key?(name)
               raise ArgumentError,
                     "#{name} association is already defined for #{self.class}"
             end
 
-            associations(associations.dup << [name, options])
+            associations(associations.merge(name => options))
           end
         end
       end