activerecord-pedantmysql2-adapter 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4908d611c3be793a9b05bee55255aa2c26f95b90
-  data.tar.gz: df0b20724934de0da44e92950b340033e567f8d0
+  metadata.gz: 9d494c02a52cb2aac4d27b0023603f8508b412f6
+  data.tar.gz: c9aeafa57eaa2bfa596c30ee54eaf3862ab98f9f
 SHA512:
-  metadata.gz: e693a9dc9997acbac0b6810a7eeb6a7102204765193f90cfb70497ab504bd57e079b2cba7dc717b87cf09cc227071ada40028248f620f444fbaaec02d7ff38cc
-  data.tar.gz: c729d4433b5f9810169eb2feb8665190f1a4043a345620df4df3edd97694dc9363d960fa2f0c6e4e403085d3ebdac8c9b19dcabb8634c4e27bb85a6e95d8a713
+  metadata.gz: 50ab85d2c548b1aa4132e1923dba96b262fa2aa8cb0d4a58b22f0e30ca13b207fd94a4c418e9107c4a2cb8dd5f72c300227c68e3eeb48a18641e16a9e032fac5
+  data.tar.gz: 467fe6fe8bd380364bb1266680634d7630ba485dab2542965f64e835de446a7a018429b5e9a110afd239aaa40de9f107a14d2b1aa2068026c5d1af68cca3b550

data/lib/active_record/connection_adapters/pedant_mysql2_adapter.rb

@@ -12,6 +12,7 @@ module ActiveRecord
       end
 
       client = Mysql2::Client.new(config)
+
       options = [config[:host], config[:username], config[:password], config[:database], config[:port], config[:socket], 0]
       ActiveRecord::ConnectionAdapters::PedantMysql2Adapter.new(client, logger, options, config)
     rescue Mysql2::Error => error
@@ -37,8 +38,6 @@ class MysqlWarning < StandardError
 end
 
 class ActiveRecord::ConnectionAdapters::PedantMysql2Adapter < ActiveRecord::ConnectionAdapters::Mysql2Adapter
-  alias_method :exec_delete_without_pedant, :exec_delete
-
   def execute(sql, name = nil)
     value = super
     log_warnings(sql)
@@ -46,10 +45,9 @@ class ActiveRecord::ConnectionAdapters::PedantMysql2Adapter < ActiveRecord::Conn
   end
 
   def exec_delete(sql, name, binds)
-    exec_delete_without_pedant(to_sql(sql, binds), name, binds)
-    affected_rows = @connection.affected_rows
-    log_warnings(sql)
-    affected_rows
+    @affected_rows_before_logging = nil
+    value = super
+    @affected_rows_before_logging || value
   end
 
   alias :exec_update :exec_delete
@@ -59,7 +57,9 @@ class ActiveRecord::ConnectionAdapters::PedantMysql2Adapter < ActiveRecord::Conn
   def log_warnings(sql)
     return unless @connection.warning_count > 0
 
+    @affected_rows_before_logging = @connection.affected_rows
     result = @connection.query('SHOW WARNINGS')
+
     result.each do |level, code, message|
       warning = MysqlWarning.new(message, code, level, sql)
       ::PedantMysql2.warn(warning)

data/lib/pedant_mysql2/version.rb

@@ -1,3 +1,3 @@
 module PedantMysql2
-  VERSION = '1.1.1'
+  VERSION = '1.1.2'
 end

data/spec/adapter_spec.rb

@@ -55,13 +55,27 @@ describe PedantMysql2 do
     expect(result.to_a).to be == [[1.0]]
   end
 
-  it 'do not change the returned value of exec_update' do
+  it 'does not change the returned value of exec_update' do
+    connection.execute('INSERT INTO comment VALUES (17)')
     result = connection.update('UPDATE comment SET id = 1 ORDER BY id LIMIT 1')
+    expect(result).to be == 1
+  end
+
+  it 'does not change the returned value of exec_update when there is warnings' do
+    PedantMysql2.silence_warnings!
+    result = connection.update('UPDATE comment SET id = 1 WHERE id > (42+"foo") ORDER BY id LIMIT 1')
     expect(result).to be_zero
   end
 
-  it 'do not change the returned value of exec_delete' do
+  it 'does not change the returned value of exec_delete' do
+    connection.execute('INSERT INTO comment VALUES (17)')
     result = connection.delete('DELETE FROM comment ORDER BY id LIMIT 1')
+    expect(result).to be == 1
+  end
+
+  it 'does not change the returned value of exec_delete when there is warnings' do
+    PedantMysql2.silence_warnings!
+    result = connection.delete('DELETE FROM comment WHERE id > (42+"foo") ORDER BY id LIMIT 1')
     expect(result).to be_zero
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-pedantmysql2-adapter
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Jean Boussier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-16 00:00:00.000000000 Z
+date: 2017-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord