activerecord-nuodb-adapter 1.1 → 2.0

data/.travis.yml

@@ -4,11 +4,8 @@ rvm:
   - 1.9.3
 
 env:
-  - NUODB_ROOT=/opt/nuodb NUODB_VERSION=1.2
-  - NUODB_ROOT=/opt/nuodb NUODB_VERSION=1.1.1
-  - NUODB_ROOT=/opt/nuodb NUODB_VERSION=1.1
-  - NUODB_ROOT=/opt/nuodb NUODB_VERSION=1.0.2
-  - NUODB_ROOT=/opt/nuodb NUODB_VERSION=1.0.1
+  - NUODB_HOME=/opt/nuodb NUODB_VERSION=2.0
+  - NUODB_HOME=/opt/nuodb NUODB_VERSION=1.2
 
 notifications:
   recipients:
@@ -21,22 +18,14 @@ before_install:
   - wget http://www.nuodb.com/latest/releases/nuodb-${NUODB_VERSION}.linux.x64.deb --output-document=/var/tmp/nuodb.deb
   - sudo dpkg -i /var/tmp/nuodb.deb
   - sleep 2
-  - sudo chmod 777 active_setup_linux.sh
 
 before_script:
-  - ${NUODB_ROOT}/bin/nuodb --chorus test --password bar --dba-user dba --dba-password baz --verbose debug --archive /var/tmp/nuodb --initialize --force &
-  - sleep 2
-  - ${NUODB_ROOT}/bin/nuodb --chorus test --password bar --dba-user dba --dba-password baz &
-  - sleep 2
-  - echo "create user cloud password 'user';" | ${NUODB_ROOT}/bin/nuosql test@localhost --user dba --password baz
-  - sleep 10
+  - java -jar ${NUODB_HOME}/jar/nuodbmanager.jar --broker localhost --user domain --password bird --command "start process sm database test host localhost archive /var/tmp/nuodb initialize true waitForRunning true"
+  - java -jar ${NUODB_HOME}/jar/nuodbmanager.jar --broker localhost --user domain --password bird --command "start process te database test host localhost options '--dba-user dba --dba-password baz' waitForRunning true"
+  - echo "create user cloud password 'user';" | ${NUODB_HOME}/bin/nuosql test@localhost --user dba --password baz
 
 script:
-  - . ./active_setup_linux.sh
-  - cd ~/rails-latest
-  - bundle install
-  - gem list -d
-  - ARCONN=nuodb ruby -I"~/rails-latest/activerecord/test/" activerecord/test/cases/base_test.rb
+  - ruby -I"lib:test" test/cases/base_test.rb 
 
 after_script:
   - sudo dpkg -r nuodb

data/Gemfile

@@ -6,4 +6,8 @@ group(:development, :test) do
   gem 'rake'
   gem 'rake-compiler'
   gem 'rdoc'
+  gem 'mocha', '>= 0.13.0'
+  gem 'erubis'
+  gem 'bcrypt-ruby', '~> 3.0.0'
+  gem 'actionpack', '~>3.2.11'
 end

data/Rakefile

@@ -33,6 +33,82 @@ require 'rake/testtask'
 require 'rdoc/task'
 require 'date'
 
+require File.expand_path(File.dirname(__FILE__)) + "/test/config"
+require File.expand_path(File.dirname(__FILE__)) + "/test/support/config"
+
+def run_without_aborting(*tasks)
+  errors = []
+
+  tasks.each do |task|
+    begin
+      Rake::Task[task].invoke
+    rescue Exception
+      errors << task
+    end
+  end
+
+  abort "Errors running #{errors.join(', ')}" if errors.any?
+end
+
+desc 'Run nuodb tests by default'
+task :default => :test
+
+desc 'Run nuodb tests'
+task :test do
+  tasks = defined?(JRUBY_VERSION) ?
+    %w(test_jdbcnuodb) :
+    %w(test_nuodb)
+  run_without_aborting(*tasks)
+end
+
+namespace :test do
+  task :isolated do
+    tasks = defined?(JRUBY_VERSION) ?
+      %w(isolated_test_jdbcmysql isolated_test_jdbcsqlite3 isolated_test_jdbcpostgresql) :
+      %w(isolated_test_mysql isolated_test_mysql2 isolated_test_sqlite3 isolated_test_postgresql)
+    run_without_aborting(*tasks)
+  end
+end
+
+%w( nuodb ).each do |adapter|
+  Rake::TestTask.new("test_#{adapter}") { |t|
+    adapter_short = adapter == 'db2' ? adapter : adapter[/^[a-z0-9]+/]
+    t.libs << 'test'
+    t.test_files = (Dir.glob( "test/cases/**/*_test.rb" ).reject {
+      |x| x =~ /\/adapters\//
+    } + Dir.glob("test/cases/adapters/#{adapter_short}/**/*_test.rb")).sort
+
+    t.verbose = true
+    t.warning = true
+  }
+
+  task "isolated_test_#{adapter}" do
+    adapter_short = adapter == 'db2' ? adapter : adapter[/^[a-z0-9]+/]
+    puts [adapter, adapter_short].inspect
+    ruby = File.join(*RbConfig::CONFIG.values_at('bindir', 'RUBY_INSTALL_NAME'))
+    (Dir["test/cases/**/*_test.rb"].reject {
+      |x| x =~ /\/adapters\//
+    } + Dir["test/cases/adapters/#{adapter_short}/**/*_test.rb"]).all? do |file|
+      sh(ruby, "-Itest", file)
+    end or raise "Failures"
+  end
+
+  namespace adapter do
+    task :test => "test_#{adapter}"
+    task :isolated_test => "isolated_test_#{adapter}"
+
+    # Set the connection environment for the adapter
+    task(:env) { ENV['ARCONN'] = adapter }
+  end
+
+  # Make sure the adapter test evaluates the env setting task
+  task "test_#{adapter}" => "#{adapter}:env"
+  task "isolated_test_#{adapter}" => "#{adapter}:env"
+end
+
+
+
+
 #############################################################################
 #
 # Helper functions
@@ -103,13 +179,6 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-Rake::TestTask.new do |t|
-  t.libs << 'test'
-  t.test_files = FileList['test/test*.rb']
-end
-
-task :default => :test
-
 #############################################################################
 #
 # Packaging tasks

data/activerecord-nuodb-adapter.gemspec

@@ -12,12 +12,12 @@ Gem::Specification.new do |gem|
   gem.license = 'BSD'
 
   gem.rdoc_options = %w(--charset=UTF-8)
-  gem.extra_rdoc_files = %w[README.md]
 
   gem.add_dependency('activerecord', '~> 3.2.11')
   gem.add_development_dependency('rake', '~> 10.0.3')
   gem.add_development_dependency('rdoc', '~> 3.10')
-  gem.add_dependency('nuodb', '~> 1.1')
+  gem.add_dependency('nuodb', '~> 2.0')
+
 
   gem.files = `git ls-files`.split($\)
   gem.test_files = gem.files.grep(%r{^(test|spec|features)/})

data/lib/active_record/connection_adapters/nuodb/version.rb

@@ -29,7 +29,7 @@
 module ActiveRecord
   module ConnectionAdapters
     module NuoDB
-      VERSION = '1.1'
+      VERSION = '2.0'
     end
   end
 end

data/test/active_record/connection_adapters/fake_adapter.rb

@@ -1,6 +1,6 @@
 module ActiveRecord
-  module ConnectionHandling
-    def fake_connection(config)
+  class Base
+    def self.fake_connection(config)
       ConnectionAdapters::FakeAdapter.new nil, logger
     end
   end
@@ -33,13 +33,9 @@ module ActiveRecord
           options[:null])
       end
 
-      def columns(table_name)
+      def columns(table_name, message)
         @columns[table_name]
       end
-
-      def active?
-        true
-      end
     end
   end
 end

data/test/cases/adapter_test.rb

@@ -1,5 +1,4 @@
 require "cases/helper"
-require "models/book"
 
 module ActiveRecord
   class AdapterTest < ActiveRecord::TestCase
@@ -7,19 +6,6 @@ module ActiveRecord
       @connection = ActiveRecord::Base.connection
     end
 
-    ##
-    # PostgreSQL does not support null bytes in strings
-    unless current_adapter?(:PostgreSQLAdapter)
-      def test_update_prepared_statement
-        b = Book.create(name: "my \x00 book")
-        b.reload
-        assert_equal "my \x00 book", b.name
-        b.update_attributes(name: "my other \x00 book")
-        b.reload
-        assert_equal "my other \x00 book", b.name
-      end
-    end
-
     def test_tables
       tables = @connection.tables
       assert tables.include?("accounts")
@@ -114,7 +100,7 @@ module ActiveRecord
       end
     end
 
-    # test resetting sequences in odd tables in PostgreSQL
+    # test resetting sequences in odd tables in postgreSQL
     if ActiveRecord::Base.connection.respond_to?(:reset_pk_sequence!)
       require 'models/movie'
       require 'models/subscriber'
@@ -167,45 +153,11 @@ module ActiveRecord
           else
             @connection.execute "INSERT INTO fk_test_has_fk (fk_id) VALUES (0)"
           end
-          # should delete created record as otherwise disable_referential_integrity will try to enable constraints after executed block
+          # should deleted created record as otherwise disable_referential_integrity will try to enable contraints after executed block
           # and will fail (at least on Oracle)
           @connection.execute "DELETE FROM fk_test_has_fk"
         end
       end
     end
   end
-
-  class AdapterTestWithoutTransaction < ActiveRecord::TestCase
-    self.use_transactional_fixtures = false
-
-    class Klass < ActiveRecord::Base
-    end
-
-    def setup
-      Klass.establish_connection 'arunit'
-      @connection = Klass.connection
-    end
-
-    def teardown
-      Klass.remove_connection
-    end
-
-    test "transaction state is reset after a reconnect" do
-      skip "in-memory db doesn't allow reconnect" if in_memory_db?
-
-      @connection.begin_transaction
-      assert @connection.transaction_open?
-      @connection.reconnect!
-      assert !@connection.transaction_open?
-    end
-
-    test "transaction state is reset after a disconnect" do
-      skip "in-memory db doesn't allow disconnect" if in_memory_db?
-
-      @connection.begin_transaction
-      assert @connection.transaction_open?
-      @connection.disconnect!
-      assert !@connection.transaction_open?
-    end
-  end
 end

data/test/cases/adapters/mysql/active_schema_test.rb

@@ -2,68 +2,47 @@ require "cases/helper"
 
 class ActiveSchemaTest < ActiveRecord::TestCase
   def setup
-    @connection = ActiveRecord::Base.remove_connection
-    ActiveRecord::Base.establish_connection(@connection)
-
-    ActiveRecord::Base.connection.singleton_class.class_eval do
+    ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter.class_eval do
       alias_method :execute_without_stub, :execute
+      remove_method :execute
       def execute(sql, name = nil) return sql end
     end
   end
 
   def teardown
-    ActiveRecord::Base.remove_connection
-    ActiveRecord::Base.establish_connection(@connection)
+    ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter.class_eval do
+      remove_method :execute
+      alias_method :execute, :execute_without_stub
+    end
   end
 
   def test_add_index
     # add_index calls index_name_exists? which can't work since execute is stubbed
-    def (ActiveRecord::Base.connection).index_name_exists?(*); false; end
-
-    expected = "CREATE  INDEX `index_people_on_last_name`  ON `people` (`last_name`) "
+    ActiveRecord::ConnectionAdapters::MysqlAdapter.send(:define_method, :index_name_exists?) do |*|
+      false
+    end
+    expected = "CREATE  INDEX `index_people_on_last_name` ON `people` (`last_name`)"
     assert_equal expected, add_index(:people, :last_name, :length => nil)
 
-    expected = "CREATE  INDEX `index_people_on_last_name`  ON `people` (`last_name`(10)) "
+    expected = "CREATE  INDEX `index_people_on_last_name` ON `people` (`last_name`(10))"
     assert_equal expected, add_index(:people, :last_name, :length => 10)
 
-    expected = "CREATE  INDEX `index_people_on_last_name_and_first_name`  ON `people` (`last_name`(15), `first_name`(15)) "
+    expected = "CREATE  INDEX `index_people_on_last_name_and_first_name` ON `people` (`last_name`(15), `first_name`(15))"
     assert_equal expected, add_index(:people, [:last_name, :first_name], :length => 15)
 
-    expected = "CREATE  INDEX `index_people_on_last_name_and_first_name`  ON `people` (`last_name`(15), `first_name`) "
+    expected = "CREATE  INDEX `index_people_on_last_name_and_first_name` ON `people` (`last_name`(15), `first_name`)"
     assert_equal expected, add_index(:people, [:last_name, :first_name], :length => {:last_name => 15})
 
-    expected = "CREATE  INDEX `index_people_on_last_name_and_first_name`  ON `people` (`last_name`(15), `first_name`(10)) "
+    expected = "CREATE  INDEX `index_people_on_last_name_and_first_name` ON `people` (`last_name`(15), `first_name`(10))"
     assert_equal expected, add_index(:people, [:last_name, :first_name], :length => {:last_name => 15, :first_name => 10})
-
-    %w(SPATIAL FULLTEXT UNIQUE).each do |type|
-      expected = "CREATE #{type} INDEX `index_people_on_last_name`  ON `people` (`last_name`) "
-      assert_equal expected, add_index(:people, :last_name, :type => type)
-    end
-
-    %w(btree hash).each do |using|
-      expected = "CREATE  INDEX `index_people_on_last_name` USING #{using} ON `people` (`last_name`) "
-      assert_equal expected, add_index(:people, :last_name, :using => using)
-    end
-
-    expected = "CREATE  INDEX `index_people_on_last_name` USING btree ON `people` (`last_name`(10)) "
-    assert_equal expected, add_index(:people, :last_name, :length => 10, :using => :btree)
-
-    expected = "CREATE  INDEX `index_people_on_last_name` USING btree ON `people` (`last_name`(10)) ALGORITHM = COPY"
-    assert_equal expected, add_index(:people, :last_name, :length => 10, using: :btree, algorithm: :copy)
-
-    assert_raise ArgumentError do
-      add_index(:people, :last_name, algorithm: :coyp)
-    end
-
-    expected = "CREATE  INDEX `index_people_on_last_name_and_first_name` USING btree ON `people` (`last_name`(15), `first_name`(15)) "
-    assert_equal expected, add_index(:people, [:last_name, :first_name], :length => 15, :using => :btree)
+    ActiveRecord::ConnectionAdapters::MysqlAdapter.send(:remove_method, :index_name_exists?)
   end
 
   def test_drop_table
     assert_equal "DROP TABLE `people`", drop_table(:people)
   end
 
-  if current_adapter?(:MysqlAdapter, :Mysql2Adapter)
+  if current_adapter?(:MysqlAdapter) or current_adapter?(:Mysql2Adapter)
     def test_create_mysql_database_with_encoding
       assert_equal "CREATE DATABASE `matt` DEFAULT CHARACTER SET `utf8`", create_database(:matt)
       assert_equal "CREATE DATABASE `aimonetti` DEFAULT CHARACTER SET `latin1`", create_database(:aimonetti, {:charset => 'latin1'})
@@ -91,7 +70,8 @@ class ActiveSchemaTest < ActiveRecord::TestCase
   def test_add_timestamps
     with_real_execute do
       begin
-        ActiveRecord::Base.connection.create_table :delete_me
+        ActiveRecord::Base.connection.create_table :delete_me do |t|
+        end
         ActiveRecord::Base.connection.add_timestamps :delete_me
         assert column_present?('delete_me', 'updated_at', 'datetime')
         assert column_present?('delete_me', 'created_at', 'datetime')
@@ -118,20 +98,22 @@ class ActiveSchemaTest < ActiveRecord::TestCase
 
   private
     def with_real_execute
-      ActiveRecord::Base.connection.singleton_class.class_eval do
+      #we need to actually modify some data, so we make execute point to the original method
+      ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter.class_eval do
         alias_method :execute_with_stub, :execute
         remove_method :execute
         alias_method :execute, :execute_without_stub
       end
-
       yield
     ensure
-      ActiveRecord::Base.connection.singleton_class.class_eval do
+      #before finishing, we restore the alias to the mock-up method
+      ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter.class_eval do
         remove_method :execute
         alias_method :execute, :execute_with_stub
       end
     end
 
+
     def method_missing(method_symbol, *arguments)
       ActiveRecord::Base.connection.send(method_symbol, *arguments)
     end

data/test/cases/adapters/mysql/connection_test.rb

@@ -1,9 +1,6 @@
 require "cases/helper"
 
 class MysqlConnectionTest < ActiveRecord::TestCase
-  class Klass < ActiveRecord::Base
-  end
-
   def setup
     super
     @connection = ActiveRecord::Base.connection
@@ -17,14 +14,12 @@ class MysqlConnectionTest < ActiveRecord::TestCase
   end
 
   def test_connect_with_url
-    run_without_connection do
+    run_without_connection do |orig|
       ar_config = ARTest.connection_config['arunit']
-
-      skip "This test doesn't work with custom socket location" if ar_config['socket']
-
       url = "mysql://#{ar_config["username"]}@localhost/#{ar_config["database"]}"
-      Klass.establish_connection(url)
-      assert_equal ar_config['database'], Klass.connection.current_database
+      klass = Class.new(ActiveRecord::Base)
+      klass.establish_connection(url)
+      assert_equal ar_config['database'], klass.connection.current_database
     end
   end
 
@@ -128,37 +123,6 @@ class MysqlConnectionTest < ActiveRecord::TestCase
     end
   end
 
-  def test_mysql_default_in_strict_mode
-    result = @connection.exec_query "SELECT @@SESSION.sql_mode"
-    assert_equal [["STRICT_ALL_TABLES"]], result.rows
-  end
-
-  def test_mysql_strict_mode_disabled_dont_override_global_sql_mode
-    run_without_connection do |orig_connection|
-      ActiveRecord::Base.establish_connection(orig_connection.merge({:strict => false}))
-      global_sql_mode = ActiveRecord::Base.connection.exec_query "SELECT @@GLOBAL.sql_mode"
-      session_sql_mode = ActiveRecord::Base.connection.exec_query "SELECT @@SESSION.sql_mode"
-      assert_equal global_sql_mode.rows, session_sql_mode.rows
-    end
-  end
-
-  def test_mysql_set_session_variable
-    run_without_connection do |orig_connection|
-      ActiveRecord::Base.establish_connection(orig_connection.deep_merge({:variables => {:default_week_format => 3}}))
-      session_mode = ActiveRecord::Base.connection.exec_query "SELECT @@SESSION.DEFAULT_WEEK_FORMAT"
-      assert_equal 3, session_mode.rows.first.first.to_i
-    end
-  end
-
-  def test_mysql_set_session_variable_to_default
-    run_without_connection do |orig_connection|
-      ActiveRecord::Base.establish_connection(orig_connection.deep_merge({:variables => {:default_week_format => :default}}))
-      global_mode = ActiveRecord::Base.connection.exec_query "SELECT @@GLOBAL.DEFAULT_WEEK_FORMAT"
-      session_mode = ActiveRecord::Base.connection.exec_query "SELECT @@SESSION.DEFAULT_WEEK_FORMAT"
-      assert_equal global_mode.rows, session_mode.rows
-    end
-  end
-
   private
 
   def run_without_connection