data_objects 0.10.9 → 0.10.10

data/ChangeLog.markdown

@@ -1,3 +1,9 @@
+## 0.10.10 2012-10-11
+
+* JRuby performance improvements
+* Reconnect added on JRuby
+* do\_sqlite3 C driver supports busy\_timeout
+
 ## 0.10.9 2012-08-13
 
 * Don't try to escape queries when no binding parameters are given

data/lib/data_objects/connection.rb

@@ -119,7 +119,7 @@ module DataObjects
 
     # Create a Command object of the right subclass using the given text
     def create_command(text)
-      concrete_command.new(self, text)
+      self.class.concrete_command.new(self, text)
     end
 
     def extension
@@ -132,19 +132,10 @@ module DataObjects
       DataObjects::const_get(self.class.name.split('::')[-2])
     end
 
-    def concrete_command
-      @concrete_command || begin
-
-        class << self
-          private
-          def concrete_command
-            @concrete_command
-          end
-        end
-
-        @concrete_command = DataObjects::const_get(self.class.name.split('::')[-2]).const_get('Command')
-      end
+    def self.concrete_command
+      @concrete_command ||= DataObjects::const_get(self.name.split('::')[-2]).const_get('Command')
     end
 
   end
+
 end

data/lib/data_objects/pooling.rb

@@ -98,33 +98,37 @@ module DataObjects
     end
 
     def self.included(target)
-      target.class_eval do
-        class << self
-          alias __new new
-        end
+      lock.synchronize do
+        unless target.respond_to? :__pools
+          target.class_eval do
+            class << self
+              alias __new new
+            end
 
-        @__pools     = {}
-        @__pool_lock = Mutex.new
-        @__pool_wait = ConditionVariable.new
+            @__pools     = {}
+            @__pool_lock = Mutex.new
+            @__pool_wait = ConditionVariable.new
 
-        def self.__pool_lock
-          @__pool_lock
-        end
+            def self.__pool_lock
+              @__pool_lock
+            end
 
-        def self.__pool_wait
-          @__pool_wait
-        end
+            def self.__pool_wait
+              @__pool_wait
+            end
 
-        def self.new(*args)
-          (@__pools[args] ||= __pool_lock.synchronize { Pool.new(self.pool_size, self, args) }).new
-        end
+            def self.new(*args)
+              (@__pools[args] ||= __pool_lock.synchronize { Pool.new(self.pool_size, self, args) }).new
+            end
 
-        def self.__pools
-          @__pools
-        end
+            def self.__pools
+              @__pools
+            end
 
-        def self.pool_size
-          8
+            def self.pool_size
+              8
+            end
+          end
         end
       end
     end

data/lib/data_objects/version.rb

@@ -1,3 +1,3 @@
 module DataObjects
-  VERSION = '0.10.9'
+  VERSION = '0.10.10'
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 10
-  - 9
-  version: 0.10.9
+  - 10
+  version: 0.10.10
 platform: ruby
 authors: 
 - Dirkjan Bussink