activerecord-jdbcnuodb-adapter 1.0.2 → 1.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 SHA1:
   metadata.gz: !binary |-
-    YjQyNTYyZWU5MjBmN2M5NGVhOWU2ZjVjYmJlY2M4ZjhmZDZhNGM4OQ==
+    MWEzZGEzNTljYjZiNTIzZWI5NDkxMmFhMTlhNmU2ODU1Njg0ODhmYQ==
   data.tar.gz: !binary |-
-    NGRmZmI2ZmM2ZjBlODY0MmM0ODViYWFlMjdjNjIxNjRmZDc2OGMyNg==
+    MTY0NDY4Yzg1YzI1YjA1NGJkZTIzMzA3ODcxYTMxMzI0MWE5YjA4Zg==
 SHA512:
   metadata.gz: !binary |-
-    ZjVlMGM1ODc2ODJkZjYxNTg2ZTdmYjdhY2M3YTQwZWRhYzc4MWY5ZjRhYTY1
-    Zjk5YTk1MDEzNTJlMWI3MjM0NWFmNDNlYjg1OWI0NzZkOTY2YWMzODg3NDlh
-    YzI4ODk5MTBiNDJhZDI2ZWE2MjZiNDViZWQyYjg0M2MwMjMwZWE=
+    MTM1Y2YxMzllNDYwZTRlMWVlN2YzOWQ2NzVjODgxZTQyYTc2MjFkZTkzOGM1
+    YWU5NDYwNzM4OWJjODgzMDJiMzMxMGQ2NjlmZGViMGIwODk4Mjg2NTdmZTg0
+    NDY3NGE5ZTA5NTdiOGE2NTBhYjUzMDlhZDNlNmEzN2RmNmYxMTU=
   data.tar.gz: !binary |-
-    ZWQ4ZDNjMTJhN2U2YWU2NDI2MTAwNmExYjFkMDA4YjkxYWRlMjU1MWNkMWFk
-    MWM2YmU1OTI4YmM5MWZiZmVjZWY4ZjJjMjU4YmM3N2E0MDlhZTQ2MTc4OTMx
-    MzNjNjBlNGUzMWQ4NTcyNzMwOGY0MmQzNjA1YjNjNDI5MzhlMjI=
+    OGFjMTUxODYyN2RiNzgxMGEyMmJiOWZjMTc1NTNlMGIwNWE2Mjg0MzFiODRl
+    NjJjM2Y2Y2VhOWI1NDQ4ZDg5NmE3NTU5N2U2MTNmMDU2MDI1YjE4YmVmNjBk
+    MWIwNjBiMWE0ODFkNGRkY2MyNDcxZjc4OTg0Nzk0MDBkMjYyNDI=

data/README.rdoc

@@ -138,11 +138,11 @@ To compile and test run this command:
 
 == INSTALLING THE GEM
 
-    jruby -S gem install activerecord-jdbcnuodb-adapter-1.0.2.gem
+    jruby -S gem install activerecord-jdbcnuodb-adapter-1.0.3.gem
 
 Or from the source tree:
 
-    jruby -S gem install pkg/activerecord-jdbcnuodb-adapter-1.0.2.gem
+    jruby -S gem install pkg/activerecord-jdbcnuodb-adapter-1.0.3.gem
 
 == TESTING THE GEM
 
@@ -169,7 +169,7 @@ Run the tests:
 
     jruby -S gem install rails
     jruby -S gem install jdbc-nuodb-1.0.1.gem
-    jruby -S gem install activerecord-jdbcnuodb-adapter-1.0.2.gem
+    jruby -S gem install activerecord-jdbcnuodb-adapter-1.0.3.gem
 
 2. Verify the gems are installed:
 
@@ -186,26 +186,26 @@ Run the tests:
 
 Tag the product using tags per the SemVer specification; our tags have a v-prefix:
 
-    git tag -a v1.0.2 -m "SemVer Version: v1.0.2"
+    git tag -a v1.0.3 -m "SemVer Version: v1.0.3"
     git push --tags
 
 If you make a mistake, take it back quickly:
 
-    git tag -d v1.0.2
-    git push origin :refs/tags/v1.0.2
+    git tag -d v1.0.3
+    git push origin :refs/tags/v1.0.3
 
 ===PUBLISHING
 
 Here are the commands used to publish:
 
-    gem push pkg/activerecord-jdbcnuodb-adapter-1.0.2.gem
+    gem push pkg/activerecord-jdbcnuodb-adapter-1.0.3.gem
 
 == INSPECTING THE GEM
 
 It is often useful to inspect the contents of a Gem before distribution.
 To do this you dump the contents of a gem thus:
 
-    gem unpack pkg/activerecord-jdbcnuodb-adapter-1.0.2.gem
+    gem unpack pkg/activerecord-jdbcnuodb-adapter-1.0.3.gem
 
 == REFERENCES
 

data/Rakefile

@@ -147,7 +147,7 @@ task :build do
 end
 
 task :install => :build do
-  sh %{jruby -S gem install pkg/#{name}-#{version}}
+  sh %{jruby -S gem install pkg/#{name}-#{version}.gem}
 end
 
 task :uninstall do

data/lib/activerecord-jdbcnuodb-adapter.rb

@@ -1,5 +1,5 @@
 module ArJdbc
   module NuoDB
-    VERSION = '1.0.2'
+    VERSION = '1.0.3'
   end
 end

data/lib/arjdbc/nuodb/adapter.rb

@@ -171,7 +171,18 @@ module ::ArJdbc
 
     # SCHEMA STATEMENTS ======================================================
 
+    def tables(name = nil)
+      #puts "called columns"
+      super
+    end
+
+    def indexes(table_name, name = nil, schema_name = nil)
+      #puts "called columns"
+      super
+    end
+
     def columns(table_name, name=nil)
+      #puts "called columns"
       @connection.columns_internal(table_name.to_s, name, nuodb_schema)
     end
 
@@ -240,24 +251,35 @@ module ::ArJdbc
 
     # DATABASE STATEMENTS ====================================================
 
-    def exec_insert(sql, name, binds)
-      sql = substitute_binds(sql, binds)
-      @connection.execute_insert(sql)
-    end
-
     LOST_CONNECTION_ERROR_MESSAGES = [
         "End of stream reached",
-        "Broken pipe"]
+        "Broken pipe",
+        "Connection reset"
+    ]
 
     # Monkey patch the execute method as reconnect is broken in the underlying
     # Rails infrastructure; see these bug numbers and references:
     #
     # - https://github.com/jruby/activerecord-jdbc-adapter/issues/232
     # - https://github.com/jruby/activerecord-jdbc-adapter/issues/237
+
     def execute(sql, name = nil, binds = [])
+      tries ||= 2
+      super(sql, name, binds)
+    rescue ActiveRecord::StatementInvalid, ActiveRecord::JDBCError => exception
+      if LOST_CONNECTION_ERROR_MESSAGES.any? { |msg| exception.message =~ /#{msg}/ }
+        if open_transactions == 0
+          reconnect!
+          retry unless (tries -= 1).zero?
+        end
+      end
+      raise
+    end
+
+    def begin_db_transaction
       tries ||= 2
       super
-    rescue ActiveRecord::StatementInvalid => exception
+    rescue ActiveRecord::StatementInvalid, ActiveRecord::JDBCError => exception
       if LOST_CONNECTION_ERROR_MESSAGES.any? { |msg| exception.message =~ /#{msg}/ }
         reconnect!
         retry unless (tries -= 1).zero?
@@ -265,6 +287,25 @@ module ::ArJdbc
       raise
     end
 
+    def commit_db_transaction
+      super
+    rescue ActiveRecord::StatementInvalid, ActiveRecord::JDBCError => exception
+      if LOST_CONNECTION_ERROR_MESSAGES.any? { |msg| exception.message =~ /#{msg}/ }
+        reconnect!
+      end
+      raise
+    end
+
+    def rollback_db_transaction
+      super
+    rescue ActiveRecord::StatementInvalid, ActiveRecord::JDBCError => exception
+      if LOST_CONNECTION_ERROR_MESSAGES.any? { |msg| exception.message =~ /#{msg}/ }
+        reconnect!
+      else
+        raise
+      end
+    end
+
     # CONNECTION POOL ========================================================
 
     def primary_keys(table)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-jdbcnuodb-adapter
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Robert Buck
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-03-17 00:00:00.000000000 Z
+date: 2013-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jdbc-nuodb