active_record-sequence 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2043cdec6848e80f36c99347db78eb9d68f879a2
-  data.tar.gz: cd9abcd82560fb81592fd8542c30760e89f450fa
+  metadata.gz: a5f0d7c7abbc69c87cf51109c788c28edb31b08d
+  data.tar.gz: 4c2025194325a6b489811fcfb6c4e012c271b4cb
 SHA512:
-  metadata.gz: 78c26a534695256415675748ba9fa6d2c6b9b2ca617146f226e1d5e447f5940bfb3c45614ba9bebfc0d9ee4e21104a16e9376498529e96fe21483364315d3b84
-  data.tar.gz: 7057f3e410367eefded9028303b65993887cc78b1df61d154e0adbd14f920df3e4a3d16c30e70e72882ee6da022a295cf052642c98646c073c819408720a2439
+  metadata.gz: 5d54e541caf29319fa0d3424474f2905127935bb2888e85f0bf06853a9991e080f342b6a13a3436342bf5bf018bd308f931836d192e5e3e340913eea783d33bb
+  data.tar.gz: c715186042c3d1e78f5d0adde3e2573fe5086c5f07b092eba82034ca81b59d12b41b446c1af0c84cd2c2c69d12a8d6fe4aa84a0632f50ab84758349c9767f1b6

data/README.md

@@ -1,4 +1,5 @@
 [![Build Status](https://travis-ci.org/bolshakov/active_record-sequence.svg?branch=master)](https://travis-ci.org/bolshakov/active_record-sequence)
+[![Gem Version](https://badge.fury.io/rb/active_record-sequence.svg)](https://badge.fury.io/rb/active_record-sequence)
 
 # ActiveRecord::Sequence
 

data/lib/active_record/sequence.rb

@@ -36,7 +36,9 @@ module ActiveRecord
       def create(name, options = {})
         create_sql = SequenceSQLBuilder.new(name, options).to_sql
         handle_postgres_errors(CREATE_ERRORS) do
-          connection.execute(create_sql)
+          with_connection do |connection|
+            connection.execute(create_sql)
+          end
         end
         new(name)
       end
@@ -50,12 +52,17 @@ module ActiveRecord
       def drop(name)
         drop_sql = format('DROP SEQUENCE %s', name)
         handle_postgres_errors(DROP_ERRORS) do
-          connection.execute(drop_sql)
+          with_connection do |connection|
+            connection.execute(drop_sql)
+          end
         end
       end
 
-      def connection
-        @connection ||= ActiveRecord::Base.retrieve_connection
+      # @api private
+      def with_connection
+        ActiveRecord::Base.connection_pool.with_connection do |connection|
+          yield(connection)
+        end
       end
 
       # @param mappings [{}] from PG errors to library errors
@@ -73,7 +80,6 @@ module ActiveRecord
     # @param name [String]
     def initialize(name)
       @name = name
-      @connection = self.class.connection
     end
 
     NEXT_ERRORS = {
@@ -104,14 +110,22 @@ module ActiveRecord
 
     private
 
-    attr_reader :connection
     delegate :handle_postgres_errors, to: :class
+    delegate :with_connection, to: :class
 
     def execute(sql, *args)
-      quoted_args = args.map { |arg| connection.quote(arg) }
-      formatted_sql = format(sql, *quoted_args)
+      with_connection do |connection|
+        connection.select_value(prepare_query(sql, *args)).to_i
+      end
+    end
 
-      connection.select_value(formatted_sql).to_i
+    def prepare_query(sql, *args)
+      quoted_args = args.map do |arg|
+        with_connection do |connection|
+          connection.quote(arg)
+        end
+      end
+      format(sql, *quoted_args)
     end
   end
 end

data/lib/active_record/sequence/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   class Sequence
-    VERSION = '0.1.0'.freeze
+    VERSION = '0.2.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record-sequence
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Tema Bolshakov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-25 00:00:00.000000000 Z
+date: 2016-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord