pg-connection-general_log 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1d256e00f37404799aeb51dc7f5dd6aab648eb2
-  data.tar.gz: b4380f27151de0fbcb30e5920ee519c9f8c3e2da
+  metadata.gz: 732973316459a5617236cac69c99e26c8bc0b108
+  data.tar.gz: dfc8204ba19f9c962f2c1a7aeb0708e372e2bab3
 SHA512:
-  metadata.gz: e1237391687bdbe6a51421c385492c5983bdd29d5436c79c0b7b927fbc137ecda28e5209eaba84f00690af16cc67e9b75c3a905eaa872efccb11cafafbd21346
-  data.tar.gz: 811f8a7dee59434860f688f370013b672b6a8ebb09cced6c2b1e342646499324268119aaab250ccf1d6dc8a21d86db20eb189b3e5b5a7e2ab01abcbc322468e8
+  metadata.gz: 3b8bc83c051c3cfbb81bdc55a8aba42e3aaf45c97c40b93cd92b427d633574a6e30c1304998f5b78feb29d6850d982cde40b78518485b53dae0a91badbffa624
+  data.tar.gz: 8e82a0bbd54b50036461c95b67f4737eab973870e61194c598d3a574e233ff0ce2915cfc105c74bdce3d1906451af4a94f235ffea1136e425110fcc0251bdcbc

data/lib/pg/connection/general_log.rb

@@ -17,7 +17,7 @@ module PG
         end
 
         def general_log_with_request_id(request_id)
-          Thread.current[:general_log]&.fetch(request_id)
+          Thread.current[:general_log]&.fetch(request_id, nil)
         end
 
         def delete_general_log(request_id)

data/lib/pg/connection/general_log/connection_ext.rb

@@ -43,6 +43,16 @@ module PG
           GeneralLog.general_log.push(sql, params, caller_locations, time)
           ret
         end
+
+        def async_exec(*args)
+          sql, params = args
+          ret = nil
+          time = Benchmark.realtime do
+            ret = super
+          end
+          GeneralLog.general_log.push(sql, params || [], caller_locations, time)
+          ret
+        end
       end
     end
   end

data/lib/pg/connection/general_log/version.rb

@@ -1,7 +1,7 @@
 module PG
   class Connection
     module GeneralLog
-      VERSION = "0.0.4"
+      VERSION = "0.0.5"
     end
   end
 end

data/lib/pg/connection/general_log_test.rb

@@ -122,6 +122,30 @@ module PGConnectionGeneralLogTest
     end
   end
 
+  def test_async_values(t)
+    db_init
+    ret = @client.async_exec("SELECT * FROM users WHERE name = '#{'hoge'}'").first
+    @client.async_exec("SELECT * FROM users WHERE name = '#{'bar'}'")
+    @client.async_exec("SELECT * FROM users WHERE name = '#{'foo'}'")
+
+    if PG::Connection::GeneralLog.general_log.length != 3
+      t.error("expect log length 3 got #{PG::Connection::GeneralLog.general_log.length}")
+    end
+    if PG::Connection::GeneralLog.general_log.any?{|log| !log.is_a?(PG::Connection::GeneralLog::Log)}
+      t.error("expect all collection item is instance of PG::Connection::GeneralLog::Log got #{PG::Connection::GeneralLog.general_log.map(&:class).uniq}")
+    end
+    expect = { 'id' => '1', 'name' => 'hoge', 'password' => 'cheap-pass' }
+    if ret != expect
+      t.error("expect exec output not change from #{expect} got #{ret}")
+    end
+    unless PG::Connection::GeneralLog.general_log.first.format =~ /^SQL\t\(\d+\.\d+ms\)\tSELECT \* FROM users WHERE name = 'hoge'\t\[\]$/
+      t.error("expect log format not correct got `#{PG::Connection::GeneralLog.general_log.first.format}`")
+    end
+    unless PG::Connection::GeneralLog.general_log.first.format(true) =~ /^SQL\t\(\d+\.\d+ms\)\tSELECT \* FROM users WHERE name = 'hoge'\t\[\].+in `test_async_values'$/
+      t.error("expect log format not correct got `#{PG::Connection::GeneralLog.general_log.first.format(true)}`")
+    end
+  end
+
   def test_log_class(t)
     if PG::Connection::GeneralLog::Log.members != %i[sql args backtrace time]
       t.error("expect PG::Connection::GeneralLog::Log.members is [:sql, :args, :backtrace, :time] got #{PG::Connection::GeneralLog::Log.members}")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg-connection-general_log
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - abcang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-18 00:00:00.000000000 Z
+date: 2017-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg