simple-sql 0.4.8 → 0.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4a5965a480d2c68067412ad12ebe98a6b88ad183
-  data.tar.gz: a5aad91e0de50c5d1f9e5ac75e4e3b21c6ef92eb
+SHA256:
+  metadata.gz: 272c5b7847b93e3eba9c7705e48270e5c1ccde3182d230506693e36d6f35ba9d
+  data.tar.gz: ec175e9dce36cc4869c0dbe9848285c7f279174232324e746dcace81d4ddf34d
 SHA512:
-  metadata.gz: 2b3cd7357f416fd6308584d8a9652963080ba334a21c08cbd6def6cb5f52ef82024c093b42333efe5dd740775571908250565b0aafe7d773620c3020ab5b9e90
-  data.tar.gz: db5e37cfdd5960ec0b6b84ed7d8bbd65298cf1baff8f7cb4b17c7461d41b96719ccfd95a713782682844cc16d413e619f6589444f80af25dd8dcea8e85ab2da4
+  metadata.gz: ec84f765746d3ffaf73b1eaf108b50f712be07e66429cbd702c19385fc008aad5eef1c7a84244790a41b710c74996ec790b17b19158a43d721c0d0ac0e3c16f6
+  data.tar.gz: 8c5c6fb5cf4c3e2e6d4d4f5400714f056c9be11727d4ddc9ef97ce8fa1da79540c9fbd11dfe90fe299da8fd87acb73416938e3d766b8ba8d02106d0b127bccda

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    simple-sql (0.4.8)
+    simple-sql (0.4.9)
       pg (~> 0.20)
       pg_array_parser (~> 0)
 

data/lib/simple/sql.rb

@@ -80,16 +80,15 @@ module Simple
     def connect!(database_url = :auto)
       database_url = Config.determine_url if database_url == :auto
 
-      Logging.info "Connecting to #{database_url}"
-      config = Config.parse_url(database_url)
-
-      require "pg"
-      connection = Connection.pg_connection(PG::Connection.new(config))
+      connection = Connection.pg_connection(database_url)
       self.connector = lambda { connection }
     end
 
     # disconnects the current connection.
     def disconnect!
+      return unless connector
+
+      connection.disconnect!
       self.connector = nil
     end
   end

data/lib/simple/sql/connection.rb

@@ -1,11 +1,20 @@
+require "pg"
+
 # private
 module Simple::SQL::Connection
+  Logging = ::Simple::SQL::Logging
+
   def self.active_record_connection
     ActiveRecordConnection
   end
 
-  def self.pg_connection(connection)
-    PgConnection.new(connection)
+  def self.pg_connection(database_url)
+    config = ::Simple::SQL::Config.parse_url(database_url)
+
+    Logging.info "Connecting to #{database_url}"
+
+    raw_connection = PG::Connection.new(config)
+    PgConnection.new(raw_connection)
   end
 
   # A PgConnection object is built around a raw connection. It includes
@@ -18,6 +27,14 @@ module Simple::SQL::Connection
       @raw_connection = raw_connection
     end
 
+    def disconnect!
+      return unless @raw_connection
+
+      Logging.info "Disconnecting from database"
+      @raw_connection.close
+      @raw_connection = nil
+    end
+
     include ::Simple::SQL::ConnectionAdapter          # all, ask, first, etc.
     include ::Simple::SQL::SimpleTransactions         # transactions
 
@@ -38,6 +55,12 @@ module Simple::SQL::Connection
       ActiveRecord::Base.connection.raw_connection
     end
 
+    def disconnect!
+      # This doesn't really disconnect. We hope ActiveRecord puts the connection
+      # back into the connection pool instead.
+      @raw_connection = nil
+    end
+
     def connection
       ActiveRecord::Base.connection
     end

data/lib/simple/sql/version.rb

@@ -1,5 +1,5 @@
 module Simple
   module SQL
-    VERSION = "0.4.8"
+    VERSION = "0.4.9"
   end
 end

data/spec/manual/threadtest.rb

@@ -0,0 +1,34 @@
+#
+# Run this script with `ruby spec/manual/threadtest.rb`
+#
+# The last output must be "number_of_connections: 1"
+#
+
+$: << "lib"
+require "simple/sql"
+
+Simple::SQL.connect!
+
+def print_number_of_connections
+  n = Simple::SQL.ask "SELECT sum(numbackends) FROM pg_stat_database"
+  puts "number_of_connections: #{n}"
+end
+
+threads = []
+100.times do
+  threads << Thread.new do
+    begin
+      Simple::SQL.connect!
+      p Simple::SQL.ask "SELECT 1"
+      print_number_of_connections
+    ensure
+      Simple::SQL.disconnect!
+    end
+  end
+end
+
+threads.each(&:join)
+sleep 0.1
+
+p Simple::SQL.ask "SELECT 1"
+print_number_of_connections

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple-sql
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 0.4.9
 platform: ruby
 authors:
 - radiospiel
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-16 00:00:00.000000000 Z
+date: 2018-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg_array_parser
@@ -186,6 +186,7 @@ files:
 - log/.gitkeep
 - scripts/watch
 - simple-sql.gemspec
+- spec/manual/threadtest.rb
 - spec/simple/sql/version_spec.rb
 - spec/simple/sql_all_into_spec.rb
 - spec/simple/sql_ask_into_spec.rb
@@ -224,11 +225,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: SQL with a simple interface
 test_files:
+- spec/manual/threadtest.rb
 - spec/simple/sql/version_spec.rb
 - spec/simple/sql_all_into_spec.rb
 - spec/simple/sql_ask_into_spec.rb