activerecord-sqlserver-adapter 5.1.5 → 5.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a40800fd3d59fb80d22946187334124093a6060
-  data.tar.gz: af15e951258df52f8a44807d7e891d2da354d8f0
+  metadata.gz: ed52e9558d488ea412397afde7def592ba77bc02
+  data.tar.gz: 74fa1e05812b1dceb9adc7c70b54340dcd8592f1
 SHA512:
-  metadata.gz: f3cd2dd2f39983e7c4b4267666e6960f8f93bf493bab25711e6cbc0b7ab3b41fe134ffb944c6e973b2e19c151a4551ffe669aa66135d708eaf738a73c42abc6b
-  data.tar.gz: bf31bc039ef3250071b784046b5cb6619797692553015f9b96da51b3bb2b08f03b6f676a7634326ba28b79e98c9aa105a3325e39008064adb79afd09f7ca08da
+  metadata.gz: 260d513189436bcc2d1a1f109e737598f6e466872cb9e7a7d3c183f8c1088877402bbd4b8dc3b7c506e1522759ce02c7ce538d0d9d42b6436d393fe5c2e625e7
+  data.tar.gz: f95f71dc632eda2c413d1d1224664ce7d48748bdf3ff541f7cee6034535645880b2ea52700db9fbcf4bf615be79ccab2c5a65f2e9883fe4d6d35736bee0785a8

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## v5.1.6
+
+#### Added
+
+* Use lock hint when joining table in query.
+
+
 ## v5.1.5
 
 #### Fixed

data/VERSION

@@ -1 +1 @@
-5.1.5
+5.1.6

data/lib/arel/visitors/sqlserver.rb

@@ -95,17 +95,29 @@ module Arel
           collector = visit_Arel_Nodes_SelectStatement_SQLServer_Lock collector
         end
         if o.right.any?
-          collector << " " if o.left
+          collector << SPACE if o.left
           collector = inject_join o.right, collector, ' '
         end
         collector
       end
 
+      def visit_Arel_Nodes_InnerJoin o, collector
+        collector << "INNER JOIN "
+        collector = visit o.left, collector
+        collector = visit_Arel_Nodes_SelectStatement_SQLServer_Lock collector, space: true
+        if o.right
+          collector << SPACE
+          visit(o.right, collector)
+        else
+          collector
+        end
+      end
+
       def visit_Arel_Nodes_OuterJoin o, collector
         collector << "LEFT OUTER JOIN "
         collector = visit o.left, collector
         collector = visit_Arel_Nodes_SelectStatement_SQLServer_Lock collector, space: true
-        collector << " "
+        collector << SPACE
         visit o.right, collector
       end
 

data/test/cases/pessimistic_locking_test_sqlserver.rb

@@ -52,6 +52,34 @@ class PessimisticLockingTestSQLServer < ActiveRecord::TestCase
       end
     end
 
+    describe 'joining tables' do
+
+      it 'joined tables use updlock by default' do
+        assert_sql %r|SELECT \[people\]\.\* FROM \[people\] WITH\(UPDLOCK\) INNER JOIN \[readers\] WITH\(UPDLOCK\)\s+ON \[readers\]\.\[person_id\] = \[people\]\.\[id\]| do
+          Person.lock(true).joins(:readers).load
+        end
+      end
+
+      it 'joined tables can use custom lock directive' do
+        assert_sql %r|SELECT \[people\]\.\* FROM \[people\] WITH\(NOLOCK\) INNER JOIN \[readers\] WITH\(NOLOCK\)\s+ON \[readers\]\.\[person_id\] = \[people\]\.\[id\]| do
+          Person.lock('WITH(NOLOCK)').joins(:readers).load
+        end
+      end
+
+      it 'left joined tables use updlock by default' do
+        assert_sql %r|SELECT \[people\]\.\* FROM \[people\] WITH\(UPDLOCK\) LEFT OUTER JOIN \[readers\] WITH\(UPDLOCK\)\s+ON \[readers\]\.\[person_id\] = \[people\]\.\[id\]| do
+          Person.lock(true).left_joins(:readers).load
+        end
+      end
+
+      it 'left joined tables can use custom lock directive' do
+        assert_sql %r|SELECT \[people\]\.\* FROM \[people\] WITH\(NOLOCK\) LEFT OUTER JOIN \[readers\] WITH\(NOLOCK\)\s+ON \[readers\]\.\[person_id\] = \[people\]\.\[id\]| do
+          Person.lock('WITH(NOLOCK)').left_joins(:readers).load
+        end
+      end
+
+    end
+
   end
 
   describe 'For paginated finds' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-sqlserver-adapter
 version: !ruby/object:Gem::Version
-  version: 5.1.5
+  version: 5.1.6
 platform: ruby
 authors:
 - Ken Collins
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-29 00:00:00.000000000 Z
+date: 2018-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord