activerecord-jdbcnuodb-adapter 1.0.1 → 1.0.2

checksums.yaml

@@ -0,0 +1,15 @@
+---
+SHA1:
+  metadata.gz: !binary |-
+    YjQyNTYyZWU5MjBmN2M5NGVhOWU2ZjVjYmJlY2M4ZjhmZDZhNGM4OQ==
+  data.tar.gz: !binary |-
+    NGRmZmI2ZmM2ZjBlODY0MmM0ODViYWFlMjdjNjIxNjRmZDc2OGMyNg==
+SHA512:
+  metadata.gz: !binary |-
+    ZjVlMGM1ODc2ODJkZjYxNTg2ZTdmYjdhY2M3YTQwZWRhYzc4MWY5ZjRhYTY1
+    Zjk5YTk1MDEzNTJlMWI3MjM0NWFmNDNlYjg1OWI0NzZkOTY2YWMzODg3NDlh
+    YzI4ODk5MTBiNDJhZDI2ZWE2MjZiNDViZWQyYjg0M2MwMjMwZWE=
+  data.tar.gz: !binary |-
+    ZWQ4ZDNjMTJhN2U2YWU2NDI2MTAwNmExYjFkMDA4YjkxYWRlMjU1MWNkMWFk
+    MWM2YmU1OTI4YmM5MWZiZmVjZWY4ZjJjMjU4YmM3N2E0MDlhZTQ2MTc4OTMx
+    MzNjNjBlNGUzMWQ4NTcyNzMwOGY0MmQzNjA1YjNjNDI5MzhlMjI=

data/.travis.yml

@@ -2,6 +2,8 @@ language: ruby
 
 rvm:
   - jruby-head
+  - jruby-18mode
+  - jruby-19mode
 
 env:
   - NUODB_ROOT=/opt/nuodb
@@ -16,7 +18,11 @@ before_script:
   - sudo dpkg -i /var/tmp/nuodb.deb
 
 script:
-  - NUODB_ROOT=/opt/nuodb bundle exec rake test install
+  - jruby -S gem update --system
+  - jruby -S bundle install
+  - jruby -S gem list
+  - NUODB_ROOT=/opt/nuodb jruby -S bundle exec rake build install
+  - jruby -S gem list
 
 after_script:
   - sudo dpkg -r nuodb

data/README.rdoc

@@ -13,16 +13,106 @@ An ActiveRecord JDBC Adapter for NuoDB.
 1. Include NuoDB information in the database.yml file as:
 
     development:
-        adapter: nuodb
-        database: test
-        username: cloud
-        password: user
-        schema: test
+      adapter: nuodb
+      database: development
+      schema: test
+      username: cloud
+      password: user
+
+    test:
+      adapter: nuodb
+      database: development
+      schema: test
+      username: cloud
+      password: user
+
+    production:
+      adapter: nuodb
+      database: development
+      schema: test
+      username: cloud
+      password: user
 
 2. In the Gemfile, call the nuodb gem with:
 
     jruby -S gem 'activerecord-jdbcnuodb-adapter'
 
+3. Optionally integrate rake db:test tasks (see below).
+
+===SUPPORTING RAILS DB MIGRATE TASKS
+
+We are making the driver compliant with the rake task interfaces in the :db namespace.
+You can now use standard rake tasks for just about everything except for creating the
+actual databases.
+
+The only problem is that the rails tasks themselves are not open or extensible in a
+manner that a driver can extend. As such there are a few integration points necessary
+on the application side of the house; this section details them.
+
+Place the following content in your lib/override_task.rb file:
+
+    Rake::TaskManager.class_eval do
+      def alias_task(fq_name)
+        new_name = "#{fq_name}:original"
+        @tasks[new_name] = @tasks.delete(fq_name)
+      end
+    end
+
+    def alias_task(fq_name)
+      Rake.application.alias_task(fq_name)
+    end
+
+    def alias_task_chain(*args, &block)
+      name, params, deps = Rake.application.resolve_args(args.dup)
+      fq_name = Rake.application.instance_variable_get(:@scope).dup.push(name).join(':')
+      alias_task(fq_name)
+      Rake::Task.define_task(*args, &block)
+    end
+
+Then in your lib/tasks/databases.rake script add the following content:
+
+    require 'override_task'
+
+    namespace :db do
+
+      namespace :structure do
+
+        alias_task_chain :dump => :environment do
+          if ActiveRecord::Base.configurations[Rails.env]['adapter'] == 'nuodb'
+            puts 'Task db:structure:dump skipped for NuoDB.'
+          else
+            Rake::Task['db:structure:dump:original'].execute
+          end
+        end
+
+      end
+
+      namespace :test do
+
+        alias_task_chain :purge => [:environment, :load_config] do
+          if ActiveRecord::Base.configurations[Rails.env]['adapter'] == 'nuodb'
+            ActiveRecord::Base.establish_connection(:test)
+            ActiveRecord::Base.connection.execute("drop schema #{ActiveRecord::Base.configurations[Rails.env]['schema']} cascade;")
+          else
+            Rake::Task['db:test:purge:original'].execute
+          end
+        end
+
+        alias_task_chain :clone_structure => 'db:structure:dump' do
+          if ActiveRecord::Base.configurations[Rails.env]['adapter'] == 'nuodb'
+            puts 'Task db:structure:clone_structure skipped for NuoDB.'
+          else
+            Rake::Task['db:test:clone_structure:original'].execute
+          end
+        end
+
+      end
+
+    end
+
+With these changes to your Rails application you will be able to run
+db:test:prepare tasks or similar.
+
 == ENVIRONMENT SETUP
 
 === MAC
@@ -48,11 +138,11 @@ To compile and test run this command:
 
 == INSTALLING THE GEM
 
-    jruby -S gem install activerecord-jdbcnuodb-adapter-1.0.1.gem
+    jruby -S gem install activerecord-jdbcnuodb-adapter-1.0.2.gem
 
 Or from the source tree:
 
-    jruby -S gem install pkg/activerecord-jdbcnuodb-adapter-1.0.1.gem
+    jruby -S gem install pkg/activerecord-jdbcnuodb-adapter-1.0.2.gem
 
 == TESTING THE GEM
 
@@ -79,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.1.gem
+    jruby -S gem install activerecord-jdbcnuodb-adapter-1.0.2.gem
 
 2. Verify the gems are installed:
 
@@ -96,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.1 -m "SemVer Version: v1.0.1"
+    git tag -a v1.0.2 -m "SemVer Version: v1.0.2"
     git push --tags
 
 If you make a mistake, take it back quickly:
 
-    git tag -d v1.0.1
-    git push origin :refs/tags/v1.0.1
+    git tag -d v1.0.2
+    git push origin :refs/tags/v1.0.2
 
 ===PUBLISHING
 
 Here are the commands used to publish:
 
-    gem push pkg/activerecord-jdbcnuodb-adapter-1.0.1.gem
+    gem push pkg/activerecord-jdbcnuodb-adapter-1.0.2.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.1.gem
+    gem unpack pkg/activerecord-jdbcnuodb-adapter-1.0.2.gem
 
 == REFERENCES
 

data/lib/activerecord-jdbcnuodb-adapter.rb

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

data/lib/arel/visitors/nuodb.rb

@@ -1,7 +1,7 @@
 module Arel
   module Visitors
     class NuoDB < Arel::Visitors::ToSql
-      def visit_Arel_Nodes_SelectStatement o
+      def visit_Arel_Nodes_SelectStatement(o)
         [
             (visit(o.with) if o.with),
             o.cores.map { |x| visit_Arel_Nodes_SelectCore x }.join,
@@ -12,7 +12,7 @@ module Arel
         ].compact.join ' '
       end
 
-      def visit_Arel_Nodes_Limit o
+      def visit_Arel_Nodes_Limit(o)
         "FETCH FIRST #{visit o.expr} ROWS ONLY"
       end
     end

data/lib/arjdbc/nuodb/adapter.rb

@@ -16,10 +16,17 @@ module ::ArJdbc
 
     module ColumnExtensions
 
+      # Maps NuoDB types to logical rails types.
       def simplified_type(field_type)
         case field_type
           when /bit/i then
             :boolean
+          when /timestamp/i then
+            :timestamp
+          when /time/i then
+            :time
+          when /date/i then
+            :date
           else
             super
         end
@@ -49,7 +56,7 @@ module ::ArJdbc
         :binary => {:name => 'binary'},
         :boolean => {:name => 'boolean'},
         :date => {:name => 'date'},
-        :datetime => {:name => 'datetime'},
+        :datetime => {:name => 'timestamp'},
         :decimal => {:name => 'decimal'},
         :float => {:name => 'float', :limit => 8},
         :integer => {:name => 'integer'},
@@ -63,6 +70,7 @@ module ::ArJdbc
         :numeric => {:name => 'numeric(20)'},
     }
 
+    # Maps logical rails types to NuoDB types.
     def native_database_types
       NATIVE_DATABASE_TYPES
     end
@@ -98,14 +106,25 @@ module ::ArJdbc
     def modify_types(tp)
       tp[:primary_key] = 'int not null generated always primary key'
       tp[:boolean] = {:name => 'boolean'}
-      tp[:integer] = {:name => 'int', :limit => 4}
+      tp[:date] = {:name => 'date', :limit => nil}
+      tp[:datetime] = {:name => 'timestamp', :limit => nil}
       tp[:decimal] = {:name => 'decimal'}
+      tp[:integer] = {:name => 'int', :limit => 4}
       tp[:string] = {:name => 'string'}
-      tp[:timestamp] = {:name => 'datetime'}
-      tp[:datetime][:limit] = nil
+      tp[:time] = {:name => 'time', :limit => nil}
+      tp[:timestamp] = {:name => 'timestamp', :limit => nil}
       tp
     end
 
+    protected
+
+    def translate_exception(exception, message)
+      # future translations here...
+      super
+    end
+
+    public
+
     # QUOTING ================================================================
 
     def quote(value, column = nil)
@@ -171,6 +190,28 @@ module ::ArJdbc
             else
               raise(ActiveRecordError, "No integer type has byte size #{limit}. Use a numeric with precision 0 instead.")
           end
+        when 'timestamp'
+          column_type_sql = 'timestamp'
+          unless precision.nil?
+            case precision
+              when 0..9
+                column_type_sql << "(#{precision})"
+              else
+                nil
+            end
+          end
+          column_type_sql
+        when 'time'
+          column_type_sql = 'time'
+          unless precision.nil?
+            case precision
+              when 0..9
+                column_type_sql << "(#{precision})"
+              else
+                nil
+            end
+          end
+          column_type_sql
         else
           super
       end
@@ -184,6 +225,19 @@ module ::ArJdbc
       raise NotImplementedError, "rename_table is not implemented"
     end
 
+    def recreate_database(name, options = {}) #:nodoc:
+      drop_database(name)
+      create_database(name, options)
+    end
+
+    def create_database(name, options = {}) #:nodoc:
+      puts "create_database"
+    end
+
+    def drop_database(name) #:nodoc:
+      puts "drop_database"
+    end
+
     # DATABASE STATEMENTS ====================================================
 
     def exec_insert(sql, name, binds)
@@ -191,6 +245,26 @@ module ::ArJdbc
       @connection.execute_insert(sql)
     end
 
+    LOST_CONNECTION_ERROR_MESSAGES = [
+        "End of stream reached",
+        "Broken pipe"]
+
+    # 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
+    rescue ActiveRecord::StatementInvalid => exception
+      if LOST_CONNECTION_ERROR_MESSAGES.any? { |msg| exception.message =~ /#{msg}/ }
+        reconnect!
+        retry unless (tries -= 1).zero?
+      end
+      raise
+    end
+
     # CONNECTION POOL ========================================================
 
     def primary_keys(table)

data/lib/arjdbc/nuodb/connection_methods.rb

@@ -1,6 +1,12 @@
 class ActiveRecord::Base
   class << self
     def nuodb_connection(config)
+      begin
+        require 'jdbc/nuodb'
+        ::Jdbc::NuoDB.load_driver(:require) if defined?(::Jdbc::NuoDB.load_driver)
+      rescue LoadError # assuming driver.jar is on the class-path
+      end
+
       config[:port] ||= 48004
       config[:schema] ||= config[:database]
       config[:url] ||= "jdbc:com.nuodb://#{config[:host]}:#{config[:port]}/#{config[:database]}?schema=#{config[:schema]}"
@@ -8,6 +14,8 @@ class ActiveRecord::Base
       config[:adapter_spec] ||= ::ArJdbc::NuoDB
       config[:adapter_class] = ActiveRecord::ConnectionAdapters::NuoDBAdapter
       config[:connection_alive_sql] ||= 'select 1 from system.tables fetch first 1 rows'
+      options = (config[:options] ||= {})
+      # set connection specific options here...
       jdbc_connection(config)
     end
   end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-jdbcnuodb-adapter
 version: !ruby/object:Gem::Version
-  prerelease:
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Robert Buck
@@ -10,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-02-24 00:00:00.000000000 Z
+date: 2013-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jdbc-nuodb
@@ -19,13 +18,11 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.1
-    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.1
-    none: false
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
@@ -35,13 +32,11 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
-    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
-    none: false
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
@@ -50,16 +45,12 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
+        version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
+        version: '0'
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
@@ -69,13 +60,11 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.11.0
-    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.11.0
-    none: false
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
@@ -85,13 +74,11 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.11.0
-    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.11.0
-    none: false
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
@@ -101,13 +88,11 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.11.0
-    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.11.0
-    none: false
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
@@ -117,13 +102,11 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.11.0
-    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.11.0
-    none: false
   prerelease: false
   type: :development
 description: ActiveRecord adapter for NuoDB. Only for use with JRuby. Requires separate Cache JDBC driver.
@@ -164,6 +147,7 @@ files:
 homepage: http://jruby-extras.rubyforge.org/activerecord-jdbc-adapter
 licenses:
 - BSD
+metadata: {}
 post_install_message:
 rdoc_options:
 - "--charset=UTF-8"
@@ -173,19 +157,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: !binary |-
-        MA==
-  none: false
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - !binary |-
       Pg==
     - !ruby/object:Gem::Version
       version: 1.3.1
-  none: false
 requirements: []
 rubyforge_project:
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key:
 specification_version: 3
 summary: ActiveRecord adapter for NuoDB.