activerecord-pg-extensions 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3494201ce01b5c6d5104ae9ddb7f993310223ecc94bd902b2484ce6b6a4e525b
-  data.tar.gz: acd5b4c842cbfc275b2a86f009c048e7916709803f3d72c9ed40f42095c47a7d
+  metadata.gz: ca67149b2f8917743b8258c14b7d2e393673093d02956a192ce40ed7857efa89
+  data.tar.gz: df37221b1ba08633bcb1d059ae296c4f83ec2025e6ad35eb87aaf50c7fdbaf39
 SHA512:
-  metadata.gz: 91625c727722fb91aa1860960a3f9c5ba7ba4dcab0a0cf459e6b8301a7fa734ff91882f5ae31ac4cb492218eaf17205ed97e54236cf8760d55b6c33b4cd3f7dc
-  data.tar.gz: fbe3e4a073f7f646438b07f1226e5c654a744c3efb421ea38b9c7b7adc5cf9e173fbab479780f765cc41f3c9144294d1ac16fe7f140e68bcdf44128a0bcafd68
+  metadata.gz: 60739ca5ec1d417e709792231bc06b65af4f6d2e6cac2a883a725bc5acd553d901a2d7c2d9b7da2e1a592f2f66635e740d668070a05551ffcfbefff3b4102dba
+  data.tar.gz: 6e34ef248fb441a9dcbdd60e4a2566e9010b01900b7802c33653e77744c9d7c9d33a65f78649118beb20bdc1fc283775232a7b834d4d514a3c8ea797d7698ee4

data/lib/active_record/pg_extensions/transaction.rb

@@ -16,7 +16,7 @@ module ActiveRecord
 
             @#{kind} = timeout
             return unless materialized?
-            connection.set(#{kind.inspect}, "\#{timeout}s", local: true)
+            connection.set(#{kind.inspect}, "\#{(timeout * 1000).to_i}ms", local: true)
           end
         RUBY
       end
@@ -25,7 +25,7 @@ module ActiveRecord
         PostgreSQLAdapter::TIMEOUTS.each do |kind|
           next if (timeout = send(kind, local: true)).nil?
 
-          connection.set(kind, "#{timeout}s", local: true)
+          connection.set(kind, "#{(timeout * 1000).to_i}ms", local: true)
         end
         super
       end

data/lib/active_record/pg_extensions/version.rb

@@ -2,6 +2,6 @@
 
 module ActiveRecord
   module PGExtensions
-    VERSION = "0.4.0"
+    VERSION = "0.4.1"
   end
 end

data/spec/postgresql_adapter_spec.rb

@@ -304,7 +304,7 @@ describe ActiveRecord::ConnectionAdapters::PostgreSQLAdapter do
         expect(connection.executed_statements).to eq(
           [
             "BEGIN",
-            "SET LOCAL statement_timeout TO '30s'",
+            "SET LOCAL statement_timeout TO '30000ms'",
             "COMMIT"
           ]
         )
@@ -315,7 +315,7 @@ describe ActiveRecord::ConnectionAdapters::PostgreSQLAdapter do
         expect(connection.executed_statements).to eq(
           [
             "BEGIN",
-            "SET LOCAL statement_timeout TO '5.5s'",
+            "SET LOCAL statement_timeout TO '5500ms'",
             "COMMIT"
           ]
         )
@@ -326,7 +326,7 @@ describe ActiveRecord::ConnectionAdapters::PostgreSQLAdapter do
         expect(connection.executed_statements).to eq(
           [
             "BEGIN",
-            "SET LOCAL statement_timeout TO '5s'",
+            "SET LOCAL statement_timeout TO '5000ms'",
             "COMMIT"
           ]
         )
@@ -337,7 +337,7 @@ describe ActiveRecord::ConnectionAdapters::PostgreSQLAdapter do
         expect(connection.executed_statements).to eq(
           [
             "BEGIN",
-            "SET LOCAL statement_timeout TO '30s'",
+            "SET LOCAL statement_timeout TO '30000ms'",
             "COMMIT"
           ]
         )
@@ -375,7 +375,7 @@ describe ActiveRecord::ConnectionAdapters::PostgreSQLAdapter do
       expect(connection.executed_statements).to eq(
         ["BEGIN",
          "SELECT 1",
-         "SET LOCAL statement_timeout TO '30s'",
+         "SET LOCAL statement_timeout TO '30000ms'",
          "COMMIT"]
       )
     end
@@ -390,7 +390,7 @@ describe ActiveRecord::ConnectionAdapters::PostgreSQLAdapter do
 
       expect(connection.executed_statements).to eq(
         ["BEGIN",
-         "SET LOCAL statement_timeout TO '30s'",
+         "SET LOCAL statement_timeout TO '30000ms'",
          "SELECT 1",
          "COMMIT"]
       )
@@ -410,9 +410,9 @@ describe ActiveRecord::ConnectionAdapters::PostgreSQLAdapter do
 
       expect(connection.executed_statements).to eq(
         ["BEGIN",
-         "SET LOCAL statement_timeout TO '30s'",
+         "SET LOCAL statement_timeout TO '30000ms'",
          "SAVEPOINT active_record_1",
-         "SET LOCAL statement_timeout TO '15s'",
+         "SET LOCAL statement_timeout TO '15000ms'",
          "SELECT 1",
          "RELEASE SAVEPOINT active_record_1",
          "COMMIT"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-pg-extensions
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Cody Cutrer