rom-sql 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b429ab1e11613744f6b0626ea822abe070424c0
-  data.tar.gz: 86220401f55baec6bc56a40545379971f74ed17e
+  metadata.gz: a3b5357a86ca00174aa17cce24a077a1eb843238
+  data.tar.gz: 4e7165c1dc95b56b1823def507746fefc0c0c74e
 SHA512:
-  metadata.gz: f0169d4b08b6e037dbb7c18b76e41e14a6cff5f2d1edb0bdaba4705c216a6f52e57b04de4bb3ef14b5e329ba45e55205be7afe18c85f3179f345612158cbbc0d
-  data.tar.gz: beceab2da1ed5cea31bf03224cf30752a6b1c2a922e88f6a5f61875c03bf4239b1626d8b5d9d51930244492957362f2efab80f87773e2e1118b50d354e36c8db
+  metadata.gz: fe54d5beae0bf5cb3b249ff8a6c17b445b351ebcf61651b02903dda3205d4d1696162be311b82ff68a08b6d9496f735529e7d0807f200a88f3b5445b11787314
+  data.tar.gz: 5458d5da39115d940d9c01989723bbee280ad6f50710c3324e78936c41b91d1c2b2a642e1a5ed58d2bf04320c9b6b1fb1beff26f5795f2806082f0f635dc241b

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+## v0.5.3 2015-07-23
+
+### Added
+
+* `Relation#multi_insert` (draxxxeus)
+
+### Changed
+
+* Command that receives many tuples will use `multi_insert` now (draxxxeus)
+
+### Fixed
+
+* Relation name and join key fixes for `many_to_one` macro (jamesmoriarty)
+
+[Compare v0.5.2...v0.5.3](https://github.com/rom-rb/rom-sql/compare/v0.5.2...v0.5.3)
+
 ## v0.5.2 2015-06-22
 
 ### Added

data/README.md

@@ -35,110 +35,7 @@ Or install it yourself as:
 
     $ gem install rom-sql
 
-## Setup
-
-ROM uses [Sequel](http://sequel.jeremyevans.net) under the hood and exposes its
-[Dataset API](http://sequel.jeremyevans.net/rdoc/files/doc/dataset_basics_rdoc.html)
-in relation objects. For schema migrations you can use its
-[Migration API](http://sequel.jeremyevans.net/rdoc/files/doc/migration_rdoc.html)
-which is available via repositories.
-
-``` ruby
-require "rom-sql"
-require "sqlite3"
-
-setup = ROM.setup(:sql, "sqlite::memory")
-
-setup.default.connection.create_table(:users) do
-  primary_key :id
-  String :name
-  Boolean :admin
-end
-
-setup.default.connection.create_table(:tasks) do
-  primary_key :id
-  Integer :user_id
-  String :title
-end
-```
-
-## Relations
-
-``` ruby
-
-class Users < ROM::Relation[:sql]
-  def by_name(name)
-    where(name: name)
-  end
-end
-
-class Tasks < ROM::Relation[:sql]
-end
-
-rom = ROM.finalize.env
-
-users = rom.relations.users
-tasks = rom.relations.tasks
-
-users.insert(id: 1, name: "Piotr")
-tasks.insert(user_id: 1, title: "Be happy")
-
-puts rom.relation(:users).by_name("Piotr").to_a.inspect
-# => [{:id=>1, :name=>"Piotr", :user_id=>1}]
-```
-
-## Mapping joins to aggregates
-
-ROM doesn't have a relationship concept like in ActiveRecord or Sequel. Instead
-it provides a convenient interface for building joined relations that can be
-mapped to [aggregate objects](http://martinfowler.com/bliki/Aggregate.html).
-
-There's no lazy-loading, eager-loading or any other magic happening behind the
-scenes. You're in full control of how data are fetched from the database and it's
-an explicit operation.
-
-Sequel's association DSL is available in relation definitions which enables
-`association_join` interface inside relations. To map joined results to
-aggregate objects `wrap` and `group` mapping transformation can be used
-
-``` ruby
-ROM.setup(:sql, "sqlite::memory")
-
-class Users < ROM::Relation[:sql]
-  one_to_many :tasks, key: :user_id
-
-  def by_name(name)
-    where(name: name)
-  end
-
-  def with_tasks
-    association_join(:tasks, select: [:title])
-  end
-end
-
-class UserMapper < ROM::Mapper
-  relation :users
-  register_as :model
-
-  model name: 'User'
-
-  group tasks: [:title]
-end
-
-rom = ROM.finalize.env
-
-users = rom.relations.users
-tasks = rom.relations.tasks
-
-users.insert(id: 1, name: "Piotr")
-tasks.insert(user_id: 1, title: "Be happy")
-
-rom.relation(:users).with_tasks.by_name("Piotr").to_a
-# => [{:id=>1, :name=>"Piotr", :admin=>nil, :title=>"Be happy"}]
-
-rom.relation(:users).as(:model).with_tasks.by_name("Piotr").to_a
-# => [#<User:0x007fb31542a098 @id=1, @name="Piotr", @tasks=[{:title=>"Be happy"}]>]
-```
+Check out [SQL guide](http://rom-rb.org/guides/adapters/sql/) for usage examples.
 
 ## ROADMAP
 

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

@@ -26,7 +26,11 @@ module ROM
             attributes.to_h
           end
 
-          insert(insert_tuples)
+          if insert_tuples.length > 1
+            multi_insert(insert_tuples)
+          else
+            insert(insert_tuples)
+          end
         end
 
         private
@@ -39,6 +43,14 @@ module ROM
           relation.where(relation.primary_key => pks)
         end
 
+        # Executes multi_insert statement and returns inserted tuples
+        #
+        # @api private
+        def multi_insert(tuples)
+          pks = relation.multi_insert(tuples, return: :primary_key)
+          relation.where(relation.primary_key => pks).to_a
+        end
+
         # Yields tuples for insertion or return an enumerator
         #
         # @api private

data/lib/rom/sql/commands_ext/postgres.rb

@@ -11,6 +11,10 @@ module ROM
               relation.dataset.returning(*relation.columns).insert(tuple)
             end.flatten
           end
+
+          def multi_insert(tuples)
+            relation.dataset.returning(*relation.columns).multi_insert(tuples)
+          end
         end
 
         module Update

data/lib/rom/sql/relation.rb

@@ -348,6 +348,20 @@ module ROM
         dataset.insert(*args, &block)
       end
 
+      # Multi insert tuples into relation
+      #
+      # @example
+      #   users.multi_insert([{name: 'Jane'}, {name: 'Jack'}])
+      #
+      # @param [Array] tuples
+      #
+      # @return [Relation]
+      #
+      # @api public
+      def multi_insert(*args, &block)
+        dataset.multi_insert(*args, &block)
+      end
+
       # Update tuples in the relation
       #
       # @example

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

@@ -97,12 +97,12 @@ module ROM
         end
 
         def graph_join_other(name, assoc, type, join_type, options)
-          key = assoc[:key]
+          key           = assoc[:key]
           on_conditions = assoc[:on] || {}
 
           join_keys =
             if type == :many_to_one
-              { primary_key => key }
+              { assoc[:class].primary_key => key }
             else
               { key => primary_key }
             end.merge(on_conditions)

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

@@ -88,9 +88,7 @@ module ROM
         #
         # @api public
         def many_to_one(name, options = {})
-          relation_name = Inflector.pluralize(name).to_sym
-          new_options = options.merge(relation: relation_name)
-          associations << [__method__, name, new_options]
+          associations << [__method__, name, { relation: name }.merge(options)]
         end
 
         # Finalize the relation by setting up its associations (if any)

data/lib/rom/sql/version.rb

@@ -1,5 +1,5 @@
 module ROM
   module SQL
-    VERSION = '0.5.2'.freeze
+    VERSION = '0.5.3'.freeze
   end
 end

data/spec/integration/commands/create_spec.rb

@@ -51,6 +51,16 @@ describe 'Commands / Create' do
       expect(result.value).to eq(id: 1, name: 'Jane')
     end
 
+    it 'creates multiple records if nothing was raised' do
+      result = users.create.transaction {
+        users.create_many.call([{name: 'Jane'}, {name: 'Jack'}])
+      }
+
+      expect(result.value).to match_array([
+        { id: 1, name: 'Jane' }, { id: 2, name: 'Jack' }
+      ])
+    end
+
     it 'allows for nested transactions' do
       result = users.create.transaction {
         users.create.transaction {

data/spec/unit/many_to_one_spec.rb

@@ -43,4 +43,18 @@ describe 'Defining many-to-one association' do
       [{ id: 1, title: 'Finish ROM', user: { name: 'Piotr' } }]
     )
   end
+
+  it "joins on specified key" do
+    setup.relation(:task_tags) do
+      many_to_one :tags, key: :tag_id
+
+      def with_tags
+        association_left_join(:tags)
+      end
+    end
+
+    expect(rom.relation(:task_tags).with_tags.to_a).to eq(
+      [{ tag_id: 1, task_id: 1, id: 1, name: "important" }]
+    )
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rom-sql
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-22 00:00:00.000000000 Z
+date: 2015-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel