simple-sql 0.5.6 → 0.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 41c7ddee7b4212971585f7b12249d3eb37a7dc5f2c4d4553404b30bc496c2f07
-  data.tar.gz: e24b684824bdfe76191fc347ed038588bd26a5fc2860a551a7270c44c681f665
+  metadata.gz: 0d0a4a51efce9ee15d5162be03fc204009535caab84adbec768090dc1b33358a
+  data.tar.gz: 161edc1c790492df3c7fec4a0933826adcd6757d1a267fa119dbe75cab856416
 SHA512:
-  metadata.gz: 69fb213cb019c41e7425423b7f7791de730a70e4beb4f5aeff0a1179a927efa8e249ff27189160c5fca1bc4854c7b00eac395e0e0c257a9dc591c38663839841
-  data.tar.gz: 1f99c960752ba291a1f4a6d1c9a31e9075990acd70c903d43e37cbd28ff01ba7c33c17b9a31f0903dfa00193386606644a889d00999834970deb343946d0b79c
+  metadata.gz: 67be2270fd3b1e456bc573aca3c6afa25bbb070766edbf11bdf4bece2037fd91f636d12b1861f8899106874e995808e876f5fa13f697dc24508ea66bac7ff8f8
+  data.tar.gz: f06e19bd48a24dded429f6155442748944ee3f61e0e1e5cfb58248a64fa2f0133781d9bd49a90897271cb759a6f1fe1c86d55b8e88d162cdda96f8f9a90e4420

data/lib/simple/sql/connection/insert.rb

@@ -63,9 +63,9 @@ class Simple::SQL::Connection
     end
 
     def insert(records:)
-      SQL.transaction do
+      @connection.transaction do
         records.map do |record|
-          SQL.ask @sql, *record.values_at(*@columns), into: @into
+          @connection.ask @sql, *record.values_at(*@columns), into: @into
         end
       end
     end

data/lib/simple/sql/connection_adapter.rb

@@ -11,7 +11,7 @@ module Simple::SQL::ConnectionAdapter
   # arguments - since the pg client does not support this - but it allows to
   # run multiple sql statements separated by ";"
   def exec(sql)
-    Logging.with_logged_query sql do
+    Logging.with_logged_query self, sql do
       raw_connection.exec sql
     end
   end
@@ -91,7 +91,7 @@ module Simple::SQL::ConnectionAdapter
 
   # returns an Array [min_cost, max_cost] based on the database's estimation
   def costs(sql, *args)
-    explanation_first = Simple::SQL.ask "EXPLAIN #{sql}", *args
+    explanation_first = ask "EXPLAIN #{sql}", *args
     unless explanation_first =~ /cost=(\d+(\.\d+))\.+(\d+(\.\d+))/
       raise "Cannot determine cost"
     end
@@ -129,7 +129,7 @@ module Simple::SQL::ConnectionAdapter
       sql = sql_or_scope
     end
 
-    Logging.with_logged_query sql, *args do
+    Logging.with_logged_query self, sql, *args do
       raw_connection.exec_params(sql, Encoder.encode_args(raw_connection, args))
     end
   end

data/lib/simple/sql/logging.rb

@@ -54,7 +54,7 @@ module Simple
         @slow_query_treshold = slow_query_treshold
       end
 
-      def with_logged_query(sql, *args, &_block)
+      def with_logged_query(connection, sql, *args, &_block)
         r0 = Time.now
         rv = yield
         runtime = Time.now - r0
@@ -64,7 +64,7 @@ module Simple
         end
 
         if slow_query_treshold && runtime > slow_query_treshold
-          log_slow_query(sql, *args, runtime: runtime)
+          log_slow_query(connection, sql, *args, runtime: runtime)
         end
 
         rv
@@ -81,14 +81,14 @@ module Simple
 
       Formatting = ::Simple::SQL::Formatting
 
-      def log_slow_query(sql, *args, runtime:)
+      def log_slow_query(connection, sql, *args, runtime:)
         # Do not try to analyze an EXPLAIN query. This prevents endless recursion here
         # (and, in general, would not be useful anyways.)
         return if sql =~ /^EXPLAIN /
 
         log_multiple_lines ::Logger::WARN, prefix: "[sql-slow]" do
           formatted_query = Formatting.format(sql, *args)
-          query_plan = ::Simple::SQL.all "EXPLAIN #{sql}", *args
+          query_plan = connection.all "EXPLAIN #{sql}", *args
 
           <<~MSG
             === slow query detected: (#{'%.3f secs' % runtime}) ===================================================================================

data/lib/simple/sql/version.rb

@@ -1,5 +1,5 @@
 module Simple
   module SQL
-    VERSION = "0.5.6"
+    VERSION = "0.5.7"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple-sql
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.5.7
 platform: ruby
 authors:
 - radiospiel