rom-sql 1.0.0.rc1 → 1.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a382cb7f94949a99c91fd0a25edec94612b15da
-  data.tar.gz: b87bb54a9ae16bbcd2ac87bf416a80582a4df16e
+  metadata.gz: 93ca7d5248744905dadd655401fb8e9534b466d2
+  data.tar.gz: 0712f79b9575ff7da7017d5bbf7329daae35dc3b
 SHA512:
-  metadata.gz: 45f97617413eac1f6c5bb3cf88cd313b74769b9c3e01f5a43939f90e0b48a2f72925b7043b74deeb7c83c9b5cdcf546aa3e347c81b970e521564c13f64c4067b
-  data.tar.gz: bfeab37bc67d5ed98e3bb75340ab8df8711653146d9f641d1092aef4c42433c974b32aa7af9bc8198a2df16b034523e6e50ac360df7d2890ecf7a15dbee3acd4
+  metadata.gz: 2c8c09bf8ec81e1f6c5452c79047ef46529e5fbb9aa8b2c017797120d6c6ef74d2e8ce279fb490d9844a640bc4a117aa0a75d2ef428d0aeba20b79244288c358
+  data.tar.gz: fac22ae5b662fbc8bc4bf7529a84efcb9bb0328a62ebd5ab91ca8e0662aaf4697cdfc6b40936211e26d7806bab8e9d717d83beb7a5d19ac5e044300ec7072f26

data/Gemfile

@@ -25,3 +25,7 @@ group :test do
   gem 'sqlite3', platforms: [:mri, :rbx]
   gem 'jdbc-sqlite3', platforms: :jruby
 end
+
+group :tools do
+  gem 'rom-repository', git: 'https://github.com/rom-rb/rom-repository.git', branch: 'master'
+end

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

@@ -46,7 +46,10 @@ module ROM
 
             # @api private
             def preload(source_key, target_key, source)
-              where(target_key => source.pluck(source_key.to_sym))
+              target_pks = source.pluck(source_key.to_sym).uniq
+              target_pks.uniq!
+
+              where(target_key => target_pks)
             end
           end
         end

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

@@ -64,9 +64,14 @@ module ROM
         def associate(relations, children, parent)
           ((spk, sfk), (tfk, tpk)) = join_key_map(relations)
 
-          children.map { |tuple|
-            { sfk => tuple.fetch(spk), tfk => parent.fetch(tpk) }
-          }
+          case parent
+          when Array
+            parent.map { |p| associate(relations, children, p) }.flatten(1)
+          else
+            children.map { |tuple|
+              { sfk => tuple.fetch(spk), tfk => parent.fetch(tpk) }
+            }
+          end
         end
 
         # @api private

data/lib/rom/sql/attribute.rb

@@ -6,24 +6,26 @@ module ROM
     #
     # @api public
     class Attribute < ROM::Schema::Attribute
+      # Error raised when an attribute cannot be qualified
       QualifyError = Class.new(StandardError)
 
-      # Return a new type marked as a FK
+      # Return a new attribute with an alias
+      #
+      # @example
+      #   users[:id].aliased(:user_id)
       #
       # @return [SQL::Attribute]
       #
-      # @api public
-      def foreign_key
-        meta(foreign_key: true)
-      end
-
       # @api public
       def aliased(name)
         super.meta(sql_expr: sql_expr.as(name))
       end
       alias_method :as, :aliased
 
-      # Return a new type marked as qualified
+      # Return a new attribute marked as qualified
+      #
+      # @example
+      #   users[:id].aliased(:user_id)
       #
       # @return [SQL::Attribute]
       #
@@ -40,7 +42,10 @@ module ROM
         end
       end
 
-      # Return a new type marked as joined
+      # Return a new attribute marked as joined
+      #
+      # Whenever you join two schemas, the right schema's attribute
+      # will be marked as joined using this method
       #
       # @return [SQL::Attribute]
       #
@@ -51,6 +56,12 @@ module ROM
 
       # Return if an attribute was used in a join
       #
+      # @example
+      #   schema = users.schema.join(tasks.schema)
+      #
+      #   schema[:id, :tasks].joined?
+      #   # => true
+      #
       # @return [Boolean]
       #
       # @api public
@@ -60,6 +71,12 @@ module ROM
 
       # Return if an attribute type is qualified
       #
+      # @example
+      #   id = users[:id].qualify
+      #
+      #   id.qualified?
+      #   # => true
+      #
       # @return [Boolean]
       #
       # @api public
@@ -67,6 +84,32 @@ module ROM
         meta[:qualified].equal?(true)
       end
 
+      # Return a new attribute marked as a FK
+      #
+      # @return [SQL::Attribute]
+      #
+      # @api public
+      def foreign_key
+        meta(foreign_key: true)
+      end
+
+      # Return symbol representation of an attribute
+      #
+      # This uses convention from sequel where double underscore in the name
+      # is used for qualifying, and triple underscore means aliasing
+      #
+      # @example
+      #   users[:id].qualified.to_sym
+      #   # => :users__id
+      #
+      #   users[:id].as(:user_id).to_sym
+      #   # => :id___user_id
+      #
+      #   users[:id].qualified.as(:user_id).to_sym
+      #   # => :users__id___user_id
+      #
+      # @return [Symbol]
+      #
       # @api public
       def to_sym
         @_to_sym ||=
@@ -81,6 +124,10 @@ module ROM
           end
       end
 
+      # Sequel calls this method to coerce an attribute into SQL string
+      #
+      # @param [Sequel::Dataset]
+      #
       # @api private
       def sql_literal(ds)
         if sql_expr
@@ -92,11 +139,15 @@ module ROM
 
       private
 
+      # Return Sequel Expression object for an attribute
+      #
       # @api private
       def sql_expr
         @sql_expr ||= (meta[:sql_expr] || Sequel[to_sym])
       end
 
+      # Delegate to sql expression if it responds to a given method
+      #
       # @api private
       def method_missing(meth, *args, &block)
         if sql_expr.respond_to?(meth)

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

@@ -95,7 +95,7 @@ module ROM
               upsert(input[tuple], upsert_options)
             end
 
-            inserted_tuples.flatten
+            inserted_tuples.flatten(1)
           end
 
           # @api private

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

@@ -45,7 +45,9 @@ module ROM
           #
           # @api public
           def associate(tuples, parent, assoc:, keys:)
-            input_tuples =
+            result_type = result
+
+            output_tuples =
               case assoc
               when Symbol
                 fk, pk = keys
@@ -54,6 +56,8 @@ module ROM
                   tuple.merge(fk => parent.fetch(pk))
                 }
               when Association::ManyToMany
+                result_type = tuples.is_a?(Array) ? :many : :one
+
                 join_tuples = assoc.associate(__registry__, tuples, parent)
                 join_relation = assoc.join_relation(__registry__)
                 join_relation.multi_insert(join_tuples)
@@ -62,16 +66,21 @@ module ROM
                   .associations[assoc.source]
                   .combine_keys(__registry__).to_a.flatten
 
-                pk_extend = { fk => parent[pk] }
-
-                tuples.map { |tuple| tuple.update(pk_extend) }
+                case parent
+                when Array
+                  parent.map do |p|
+                    tuples.map { |tuple| tuple.merge(fk => p[pk]) }
+                  end.flatten(1)
+                else
+                  tuples.map { |tuple| Hash(tuple).update(fk => parent[pk]) }
+                end
               when Association
                 with_input_tuples(tuples).map { |tuple|
                   assoc.associate(relation.__registry__, tuple, parent)
                 }
               end
 
-            one? ? input_tuples[0] : input_tuples
+            result_type == :one ? output_tuples[0] : output_tuples
           end
 
           # @api public

data/lib/rom/sql/relation.rb

@@ -40,6 +40,7 @@ module ROM
             begin
               inferrer_for_db.new.call(name, gateway)
             rescue Sequel::Error => e
+              inferrer_for_db.on_error(klass, e)
               ROM::Schema::DEFAULT_INFERRER.()
             end
           end

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

@@ -42,6 +42,14 @@ module ROM
           db_registry[type]
         end
 
+        def self.on_error(relation, e)
+          warn "[#{relation}] failed to infer schema. " \
+               "Make sure tables exist before ROM container is set up. " \
+               "This may also happen when your migration tasks load ROM container, " \
+               "which is not needed for migrations as only the connection is required " \
+               "(#{e.message})"
+        end
+
         # @api private
         def call(source, gateway)
           dataset = source.dataset

data/lib/rom/sql/types.rb

@@ -9,7 +9,7 @@ module ROM
         ROM::Types.Constructor(*args, &block)
       end
 
-      Serial = Int.constrained(gt: 0).meta(primary_key: true)
+      Serial = Int.meta(primary_key: true)
 
       Blob = Constructor(Sequel::SQL::Blob, &Sequel::SQL::Blob.method(:new))
     end

data/lib/rom/sql/version.rb

@@ -1,5 +1,5 @@
 module ROM
   module SQL
-    VERSION = '1.0.0.rc1'.freeze
+    VERSION = '1.0.0.rc2'.freeze
   end
 end

data/spec/integration/plugins/associates/many_to_many_spec.rb

@@ -0,0 +1,69 @@
+RSpec.describe 'Plugins / :associates / with many-to-many', :sqlite do
+  include_context 'database setup'
+
+  let(:tasks) { container.commands[:tasks] }
+  let(:tags) { container.commands[:tags] }
+
+  let(:jane) do
+    relations[:users].by_pk(relations[:users].insert(name: 'Jane')).one
+  end
+
+  let(:john) do
+    relations[:users].by_pk(relations[:users].insert(name: 'John')).one
+  end
+
+  before do
+    conf.relation(:tasks) do
+      schema(infer: true) do
+        associations do
+          has_many :tags, through: :task_tags
+        end
+      end
+    end
+
+    conf.relation(:task_tags) do
+      schema(infer: true) do
+        associations do
+          belongs_to :tasks, as: :task
+          belongs_to :tags, as: :tag
+        end
+      end
+    end
+
+    conf.relation(:tags) do
+      schema(infer: true) do
+        associations do
+          has_many :tasks, through: :task_tags
+        end
+      end
+    end
+
+    conf.commands(:tags) do
+      define(:create) do
+        result :many
+      end
+    end
+
+    conf.commands(:tasks) do
+      define(:create) do
+        result :many
+        associates :tags
+      end
+    end
+  end
+
+  it 'associates a child with many parents' do
+    create_tags = tags[:create].with([{ name: 'red' }, { name: 'blue' }])
+    create_task = tasks[:create].with(user_id: jane[:id], title: "Jade's task")
+
+    command = create_tags >> create_task
+
+    result = command.call
+
+    expect(result).
+      to eql([
+               { id: 1, user_id: jane[:id], title: "Jade's task", tag_id: 1 },
+               { id: 1, user_id: jane[:id], title: "Jade's task", tag_id: 2 }
+             ])
+  end
+end

data/spec/spec_helper.rb

@@ -39,6 +39,10 @@ ADAPTERS = DB_URIS.keys
 PG_LTE_95 = ENV.fetch('PG_LTE_95', 'true') == 'true'
 
 SPEC_ROOT = root = Pathname(__FILE__).dirname
+
+# Redirect inferrer warnings to a log file
+$stderr.reopen(SPEC_ROOT.join('../log/warnings.log'), 'w')
+
 TMP_PATH = root.join('../tmp')
 
 Dir[root.join('shared/**/*')].each { |f| require f }

data/spec/unit/types_spec.rb

@@ -1,16 +1,6 @@
 require 'rom/sql/types'
 
 RSpec.describe ROM::SQL::Types, :postgres do
-  describe 'ROM::SQL::Types::Serial' do
-    it 'accepts ints > 0' do
-      expect(ROM::SQL::Types::Serial[1]).to be(1)
-    end
-
-    it 'raises when input is <= 0' do
-      expect { ROM::SQL::Types::Serial[0] }.to raise_error(Dry::Types::ConstraintError)
-    end
-  end
-
   describe ROM::SQL::Types::Blob do
     it 'coerces strings to Sequel::SQL::Blob' do
       input = 'sutin'

metadata

@@ -1,44 +1,45 @@
 --- !ruby/object:Gem::Specification
 name: rom-sql
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc1
+  version: 1.0.0.rc2
 platform: ruby
 authors:
 - Piotr Solnica
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-24 00:00:00.000000000 Z
+date: 2017-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: sequel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.42'
-  name: sequel
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.42'
 - !ruby/object:Gem::Dependency
+  name: dry-equalizer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
-  name: dry-equalizer
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
 - !ruby/object:Gem::Dependency
+  name: dry-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -47,9 +48,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.4
-  name: dry-types
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -59,6 +59,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.9.4
 - !ruby/object:Gem::Dependency
+  name: dry-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -67,9 +68,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.3
-  name: dry-core
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -79,42 +79,42 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.2.3
 - !ruby/object:Gem::Dependency
+  name: rom
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0.rc
-  name: rom
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0.rc
 - !ruby/object:Gem::Dependency
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: bundler
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-  name: rake
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -224,6 +224,7 @@ files:
 - 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_wrap_spec.rb
 - spec/integration/relation_schema_spec.rb
@@ -299,7 +300,7 @@ homepage: http://rom-rb.org
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -314,9 +315,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubyforge_project:
-rubygems_version: 2.6.8
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.5.1
+signing_key: 
 specification_version: 4
 summary: SQL databases support for ROM
 test_files:
@@ -344,6 +345,7 @@ test_files:
 - 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_wrap_spec.rb
 - spec/integration/relation_schema_spec.rb