rom-sql 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3faf5e4b8e2aa655c4a646421cf148cad3e137e
-  data.tar.gz: 2b1ac9258b8f15111297a71acf92f46f0f19607c
+  metadata.gz: fb7aa3ae6fc950b9149086e31c3162e99a524b37
+  data.tar.gz: c324b47d45d23e01fc606d65f853b163e2699a59
 SHA512:
-  metadata.gz: d11f6ab0d5a70192f29b1028d5d3acd81ce8b06f3d0edb6a74c24f8c869006837630476fcda3260aa021adbd3f0b5aa321e70df50feeb6d480b701524ff34329
-  data.tar.gz: b3f894dc4a8eddc3cca586186beaa530a0bf6317593622fca1ab86a568083dbeb88564bcba1c4110ee8230fb04c39792df0a760993908feaa999bed601e708a3
+  metadata.gz: 172e07e4a8073164d7b9f8eec06eaefa16b052f7439a2b4d3f211cd2f932da9976df4d3a9863d525083b5e37a5dd230151b9a126f923cf8b5acdfb12b2b36469
+  data.tar.gz: 69352c745545be3e04a9eba2a196e0e2a3b59cd1d5f4782fa0ec9e78d78b4a5893b8bfa98f80a6bf208914ecc93a11dcc3f7e0f9549a10d764862eb110a2cf69

data/CHANGELOG.md

@@ -1,8 +1,20 @@
+## v1.0.3 2017-02-23
+
+### Changed
+
+* `AutoCombine#preload` uses better restriction for `ManyToOne` association which greatly speeds up loading bigger amounts of data (solnic + flash-gordon)
+
+### Fixed
+
+* Fix the usage of timestamp in command chains (cflipse)
+
+[Compare v1.0.2...v1.0.3](https://github.com/rom-rb/rom-sql/compare/v1.0.2...v1.0.3)
+
 ## v1.0.2 2017-02-16
 
 ### Added
 
-* Support for selecting literal strings via `select { `'foo'`.as(:bar) }` (solnic)
+* Support for selecting literal strings via ``select { `'foo'`.as(:bar) }`` (solnic)
 
 [Compare v1.0.1...v1.0.2](https://github.com/rom-rb/rom-sql/compare/v1.0.1...v1.0.2)
 

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

@@ -33,23 +33,29 @@ module ROM
             #
             # @api private
             def for_combine(spec)
-              source_key, target_key, target =
-                case spec
-                when ROM::SQL::Association
-                  [*spec.join_keys(__registry__).flatten, spec.call(__registry__, self)]
-                else
-                  [*spec.flatten, self]
-                end
-
-              target.preload(source_key, target_key)
+              case spec
+              when ROM::SQL::Association
+                spec.call(__registry__, self).preload(spec)
+              else
+                preload(spec)
+              end
             end
 
             # @api private
-            def preload(source_key, target_key, source)
-              target_pks = source.pluck(source_key.to_sym).uniq
-              target_pks.uniq!
+            def preload(spec, source)
+              case spec
+              when ROM::SQL::Association::ManyToOne
+                pk = source.source[source.source.primary_key].qualified
+
+                where(pk => source.pluck(pk.name))
+              when Hash, ROM::SQL::Association
+                source_key, target_key = spec.is_a?(Hash) ? spec.flatten(1) : spec.join_keys(__registry__).flatten(1)
+
+                target_pks = source.pluck(source_key.to_sym)
+                target_pks.uniq!
 
-              where(target_key => target_pks)
+                where(target_key => target_pks)
+              end
             end
           end
         end

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

@@ -96,7 +96,7 @@ module ROM
           # @return [Array<Hash>, Hash]
           #
           # @api private
-          def set_timestamps(tuples)
+          def set_timestamps(tuples, *)
             timestamps = build_timestamps
 
             case tuples

data/lib/rom/sql/version.rb

@@ -1,5 +1,5 @@
 module ROM
   module SQL
-    VERSION = '1.0.2'.freeze
+    VERSION = '1.0.3'.freeze
   end
 end

data/spec/shared/notes.rb

@@ -1,5 +1,4 @@
 RSpec.shared_context 'notes' do
-  include_context 'database setup'
 
   before do
     inferrable_relations.concat %i(notes)
@@ -10,6 +9,7 @@ RSpec.shared_context 'notes' do
 
     conn.create_table :notes do
       primary_key :id
+      foreign_key :user_id, :users
       String :text, null: false
       # TODO: Remove Oracle's workarounds once inferer can infer not-null timestamps
       DateTime :created_at, null: ctx.oracle?(example)

data/spec/unit/plugin/timestamp_spec.rb

@@ -1,6 +1,7 @@
 require 'rom/sql/plugin/timestamps'
 
 RSpec.describe 'Plugin / Timestamp' do
+  include_context 'users'
   include_context 'notes'
 
   with_adapters do
@@ -23,6 +24,23 @@ RSpec.describe 'Plugin / Timestamp' do
           use :timestamps
           timestamp :updated_at
         end
+
+        define :create_with_user, type: :create do
+          result :one
+          use :timestamps
+          timestamp :updated_at, :created_at
+
+          before :assign_user
+          def assign_user(tuple, user)
+            tuple.merge(user_id: user[:id])
+          end
+        end
+      end
+
+      conf.commands(:users) do
+        define :create do
+          result :one
+        end
       end
     end
 
@@ -77,5 +95,23 @@ RSpec.describe 'Plugin / Timestamp' do
         expect(updated[:updated_at].iso8601).to eql(tomorrow.iso8601)
       end
     end
+
+    it "works with chained commands" do
+      create_user = container.command(:users).create.with(name: "John Doe")
+      create_note = container.command(:notes).create_with_user.with(text: "new note")
+
+      time   = DateTime.now
+      command = create_user >> create_note
+
+      result = command.call
+
+      created = DateTime.parse(result[:created_at].to_s)
+      updated = DateTime.parse(result[:updated_at].to_s)
+
+      expect(result[:user_id]).not_to be_nil
+      expect(created).to be_within(1).of(time)
+      expect(updated).to eq created
+   end
+
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rom-sql
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-15 00:00:00.000000000 Z
+date: 2017-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel