activerecord-jdbc-adapter 1.3.0.beta1 → 1.3.0.beta2

data/test/db/h2.rb

@@ -1,13 +1,11 @@
 require 'test_helper'
 
-config = {
-  :adapter => 'h2',
-  :database => 'test.db'
-}
+config = { :adapter => 'h2', :database => 'test' } # adds .h2.db suffix
 
 ActiveRecord::Base.establish_connection(config)
 
-at_exit {
-  # Clean up hsqldb when done
-  Dir['test.db*'].each {|f| FileUtils.rm_rf(f) }
-}
+at_exit do 
+  Dir['*test.h2.db'].each { |f| FileUtils.rm(f) }
+  Dir['*test.lock.db'].each { |f| FileUtils.rm(f) }
+  Dir['*test.trace.db'].each { |f| FileUtils.rm(f) }
+end

data/test/db/h2/identity_column_test.rb

@@ -0,0 +1,35 @@
+require 'test_helper'
+require 'db/h2'
+
+class H2IdentityColumnTest < Test::Unit::TestCase
+
+  class Persona < ActiveRecord::Base
+  end
+
+  class CreatePersonasTable < ActiveRecord::Migration
+    def self.up
+      create_table :personas do |t|
+        t.string :firstname
+        t.string :lastname
+      end
+    end
+
+    def self.down
+      drop_table :personas
+    end
+  end
+
+  def setup
+    CreatePersonasTable.up
+    Persona.create(:firstname => "John",     :lastname => "Smith")
+  end
+
+  def teardown
+    CreatePersonasTable.down
+  end
+
+  def test_auto_increment
+    assert_equal 1, Persona.all[0].id, "H2 auto increment initially should start at ID 1, not 0"
+  end
+end
+

data/test/db/h2/offset_test.rb

@@ -0,0 +1,49 @@
+require 'test_helper'
+require 'db/h2'
+
+class H2OffsetTest < Test::Unit::TestCase
+
+  class Persona < ActiveRecord::Base
+  end
+
+  class CreatePersonasTable < ActiveRecord::Migration
+    def self.up
+      create_table :personas do |t|
+        t.string :firstname
+        t.string :lastname
+      end
+    end
+
+    def self.down
+      drop_table :personas
+    end
+  end
+
+  def setup
+    CreatePersonasTable.up
+    Persona.create(:firstname => "John",     :lastname => "Smith")
+    Persona.create(:firstname => "Jill",     :lastname => "Smith")
+    Persona.create(:firstname => "Joan",     :lastname => "Smith")
+    Persona.create(:firstname => "Jason",    :lastname => "Smith")
+    Persona.create(:firstname => "Jack",     :lastname => "Smith")
+    Persona.create(:firstname => "Jenssen",  :lastname => "Smith")
+    Persona.create(:firstname => "Joe",      :lastname => "Smith")
+    Persona.create(:firstname => "Johanna",  :lastname => "Smith")
+    Persona.create(:firstname => "James",    :lastname => "Smith")
+    Persona.create(:firstname => "Jim",      :lastname => "Smith")
+    Persona.create(:firstname => "Jody",     :lastname => "Smith")
+  end
+
+  def teardown
+    CreatePersonasTable.down
+  end
+
+  def test_offset
+    query = Arel::Table.new(:persons).skip(3)
+    assert_nothing_raised do
+      sql = query.to_sql
+      assert_equal "SELECT LIMIT 3", sql[0..13], "SQL statement was not generated, properly"
+    end
+  end if ar_version('3.0')
+  
+end

data/test/db/h2/rake_test.rb

@@ -0,0 +1,98 @@
+require 'rake_test_support'
+require 'db/h2'
+
+class H2RakeTest < Test::Unit::TestCase
+  include RakeTestSupport
+
+  def db_name; 'mem:rake-test'; end
+
+  def do_teardown
+    drop_rake_test_database(:silence)
+  end
+  
+  test 'rake db:create (and db:drop)' do
+    @db_name = 'rake-create-test'
+    Rake::Task["db:create"].invoke
+    assert_true File.exists?("#{@db_name}.h2.db"), "db file: #{@db_name}.h2.db is missing"
+    
+    Rake::Task["db:drop"].invoke
+    assert_false File.exists?("#{@db_name}.h2.db"), "db file: #{@db_name}.h2.db not deleted"
+  end
+
+  test 'rake db:create (and db:drop) in memory db' do
+    Rake::Task["db:create"].invoke
+    # assert_true File.exists?("#{db_name}.lck")
+    
+    Rake::Task["db:drop"].invoke
+    # assert_false File.exists?("#{db_name}.lck")
+  end
+  
+  test 'rake db:test:purge' do
+    # Rake::Task["db:create"].invoke
+    create_rake_test_database do |connection|
+      connection.create_table('loosers') { |t| t.string :name }
+    end
+    
+    Rake::Task["db:test:purge"].invoke
+    
+    ActiveRecord::Base.establish_connection db_config.merge :database => db_name
+    assert_false ActiveRecord::Base.connection.table_exists?('loosers')
+    ActiveRecord::Base.connection.disconnect!
+  end
+  
+  test 'rake db:structure:dump (and db:structure:load)' do
+    db_name = @db_name = 'test-dump-rake'
+    create_rake_test_database(db_name) do |connection|
+      create_schema_migrations_table(connection)
+      connection.create_table('loosers') { |t| t.string :name; t.timestamps }
+    end
+    
+    structure_sql = File.join('db', structure_sql_filename)
+    begin
+      Dir.mkdir 'db' # db/structure.sql
+      Rake::Task["db:structure:dump"].invoke
+      
+      assert File.exists?(structure_sql)
+      # CREATE CACHED TABLE PUBLIC.LOOSERS
+      assert_match /CREATE .*? TABLE PUBLIC.LOOSERS/i, File.read(structure_sql)
+      
+      # db:structure:load
+      drop_rake_test_database(:silence)
+      Rake::Task["db:structure:load"].invoke
+      
+      ActiveRecord::Base.establish_connection db_config.merge :database => db_name
+      assert ActiveRecord::Base.connection.table_exists?('loosers')
+      ActiveRecord::Base.connection.disconnect!
+    ensure
+      File.delete(structure_sql) if File.exists?(structure_sql)
+      Dir.rmdir 'db'
+    end
+  end
+  
+#  test 'rake db:charset' do
+#    expect_rake_output('UTF-8')
+#    Rake::Task["db:charset"].invoke
+#  end
+  
+  def create_rake_test_database(db_name = self.db_name)
+    ActiveRecord::Base.establish_connection db_config.merge :database => db_name
+    if block_given?
+      yield ActiveRecord::Base.connection
+    end
+    ActiveRecord::Base.connection.disconnect!
+  end
+  
+  def drop_rake_test_database(silence = nil)
+    # ActiveRecord::Base.establish_connection db_config.merge :database => @db_name
+    # ActiveRecord::Base.connection.disconnect!
+    
+    File.delete("#{@db_name}.lock.db") if File.exist? "#{@db_name}.lock.db"
+    File.delete("#{@db_name}.trace.db") if File.exist? "#{@db_name}.trace.db"
+    if silence
+      File.delete("#{@db_name}.h2.db") if File.exist? "#{@db_name}.h2.db"
+    else
+      File.delete("#{@db_name}.h2.db")
+    end
+  end
+  
+end

data/test/db/h2/schema_dump_test.rb

@@ -19,7 +19,11 @@ class H2SchemaDumpTest < Test::Unit::TestCase
   def test_schema_dump_decimal_when_scale_specified
     output = standard_dump(StringIO.new, [/^[^d]/]) # keep db_types
     # t.column :sample_small_decimal, :decimal, :precision => 3, :scale => 2, :default => 3.14
-    assert_match %r{t.decimal\s+"sample_small_decimal",\s+:precision => 3,\s+:scale => 2}, output
+    if ar_version('4.0')
+      assert_match %r{t.decimal\s+"sample_small_decimal",\s+precision: 3,\s+scale: 2}, output
+    else
+      assert_match %r{t.decimal\s+"sample_small_decimal",\s+:precision => 3,\s+:scale => 2}, output
+    end
   end
   
 end

data/test/db/hsqldb.rb

@@ -1,15 +1,11 @@
 require 'test_helper'
 
-config = {
-  :adapter => 'hsqldb',
-  :database => 'test.db'
-}
+config = { :adapter => 'hsqldb', :database => 'test.hsqldb' }
 
 ActiveRecord::Base.establish_connection(config)
 
-at_exit {
-  # Clean up hsqldb when done
-  require "fileutils"
-  Dir['test.db*'].each {|f| FileUtils.rm_rf(f)}
-  FileUtils.rm_rf('hsqldb-testdb.log') rescue nil #can't delete on windows
-}
+at_exit do
+  Dir['*test.hsqldb*'].each do |f|
+    FileUtils.rm_rf(f); File.delete(f) if File.exist?(f)
+  end
+end

data/test/db/hsqldb/rake_test.rb

@@ -0,0 +1,101 @@
+require 'rake_test_support'
+require 'db/hsqldb'
+
+class HSQLDBRakeTest < Test::Unit::TestCase
+  include RakeTestSupport
+
+  def db_name; 'mem:rake-test.hsqldb'; end
+  
+  def do_teardown
+    drop_rake_test_database
+  end
+
+  test 'rake db:create (and db:drop)' do
+    @db_name = 'rake-create-test.hsqldb'
+    Rake::Task["db:create"].invoke
+    assert_true File.exists?("#{@db_name}.lck")
+    
+    Rake::Task["db:drop"].invoke
+    assert_false File.exists?("#{@db_name}.lck")
+  end
+
+  test 'rake db:create (and db:drop) in memory db' do
+    Rake::Task["db:create"].invoke
+    # assert_true File.exists?("#{db_name}.lck")
+    
+    Rake::Task["db:drop"].invoke
+    # assert_false File.exists?("#{db_name}.lck")
+  end
+  
+  test 'rake db:test:purge' do
+    # Rake::Task["db:create"].invoke
+    create_rake_test_database do |connection|
+      connection.create_table('loosers') { |t| t.string :name }
+    end
+    
+    Rake::Task["db:test:purge"].invoke
+    
+    ActiveRecord::Base.establish_connection db_config.merge :database => db_name
+    assert_false ActiveRecord::Base.connection.table_exists?('loosers')
+    ActiveRecord::Base.connection.disconnect!
+  end
+  
+  test 'rake db:structure:dump (and db:structure:load)' do
+    db_name = @db_name = 'test-dump-rake.hsqldb'
+    create_rake_test_database(db_name) do |connection|
+      create_schema_migrations_table(connection)
+      connection.create_table('loosers') { |t| t.string :name; t.timestamps }
+    end
+    
+    structure_sql = File.join('db', structure_sql_filename)
+    begin
+      Dir.mkdir 'db' # db/structure.sql
+      Rake::Task["db:structure:dump"].invoke
+      
+      assert File.exists?(structure_sql)
+      # CREATE MEMORY TABLE PUBLIC.LOOSERS
+      assert_match /CREATE .*? TABLE PUBLIC.LOOSERS/i, File.read(structure_sql)
+      
+      # db:structure:load
+      drop_rake_test_database(:silence)
+      Rake::Task["db:structure:load"].invoke
+      
+      ActiveRecord::Base.establish_connection db_config.merge :database => db_name
+      assert ActiveRecord::Base.connection.table_exists?('loosers')
+      ActiveRecord::Base.connection.disconnect!
+    ensure
+      File.delete(structure_sql) if File.exists?(structure_sql)
+      Dir.rmdir 'db'
+    end
+  end
+  
+#  test 'rake db:charset' do
+#    expect_rake_output('UTF-8')
+#    Rake::Task["db:charset"].invoke
+#  end
+  
+  def create_rake_test_database(db_name = self.db_name)
+    ActiveRecord::Base.establish_connection db_config.merge :database => db_name
+    if block_given?
+      yield ActiveRecord::Base.connection
+    end
+    ActiveRecord::Base.connection.shutdown
+    ActiveRecord::Base.connection.disconnect!
+  end
+  
+  def drop_rake_test_database(silence = nil)
+    ActiveRecord::Base.establish_connection db_config.merge :database => @db_name
+    ActiveRecord::Base.connection.shutdown
+    ActiveRecord::Base.connection.disconnect!
+    
+    Dir.glob("#{@db_name}*").each do |f|
+      if silence
+        FileUtils.rm_rf(f) if File.exists?(f)
+      else
+        FileUtils.rm_rf(f)
+      end
+      FileUtils.rmdir(f) if File.directory?(f)
+    end
+  end
+  
+end

data/test/db/hsqldb/schema_dump_test.rb

@@ -9,7 +9,11 @@ class HSQLDBSchemaDumpTest < Test::Unit::TestCase
   def test_schema_dump_decimal_when_scale_specified
     output = standard_dump(StringIO.new, [/^[^d]/]) # keep db_types
     # t.column :sample_small_decimal, :decimal, :precision => 3, :scale => 2, :default => 3.14
-    assert_match %r{t.decimal\s+"sample_small_decimal",\s+:precision => 3,\s+:scale => 2}, output
+    if ar_version('4.0')
+      assert_match %r{t.decimal\s+"sample_small_decimal",\s+precision: 3,\s+scale: 2}, output
+    else
+      assert_match %r{t.decimal\s+"sample_small_decimal",\s+:precision => 3,\s+:scale => 2}, output
+    end
   end
   
 end

data/test/db/hsqldb/simple_test.rb

@@ -6,4 +6,12 @@ class HsqldbSimpleTest < Test::Unit::TestCase
   include ExplainSupportTestMethods if ar_version("3.1")
   include ActiveRecord3TestMethods
   include CustomSelectTestMethods
+  
+  # @override
+  def test_empty_insert_statement
+    # "INSERT INTO table DEFAULT VALUES" only works if all columns have defaults
+    pend if ar_version('4.0')
+    super
+  end
+  
 end

data/test/db/jndi_config.rb

@@ -1,7 +1,5 @@
 
-JNDI_CONFIG = {
-  :adapter => 'jdbc', :jndi => 'jdbc/DerbyDB'
-}
+JNDI_CONFIG = { :adapter => 'jdbc', :jndi => 'jdbc/DerbyDB' }
 
 # FS based JNDI impl borrowed from tomcat :
 load 'test/jars/tomcat-juli.jar'

data/test/db/jndi_pooled_config.rb

@@ -1,7 +1,5 @@
 
-JNDI_POOLED_CONFIG = {
-  :adapter => 'jdbc', :jndi => 'jdbc/PooledDerbyDB'
-}
+JNDI_POOLED_CONFIG = { :adapter => 'jndi', :jndi => 'jdbc/PooledDerbyDB' }
 
 # FS based JNDI impl borrowed from tomcat :
 load 'test/jars/tomcat-juli.jar'

data/test/db/mssql/limit_offset_test.rb

@@ -97,9 +97,9 @@ class MSSQLLimitOffsetTest < Test::Unit::TestCase
 
   def test_limit_with_no_id_column_available
     NoIdViking.create!(:name => 'Erik')
-    assert_nothing_raised(ActiveRecord::StatementInvalid) do 
+    #assert_nothing_raised(ActiveRecord::StatementInvalid) do 
       NoIdViking.first
-    end
+    #end
   end
 
   def test_limit_with_alternate_named_primary_key
@@ -140,12 +140,15 @@ class MSSQLLimitOffsetTest < Test::Unit::TestCase
     skei.vikings.create!(:name => "Bob")
     skei.vikings.create!(:name => "Ben")
     skei.vikings.create!(:name => "Basil")
-    ships = Viking.find(:all, :include => :long_ship, :offset => 1, :limit => 2)
+    if ar_version('4.0')
+      ships = Viking.includes(:long_ship).offset(1).limit(2) #.all
+    else
+      ships = Viking.find(:all, :include => :long_ship, :offset => 1, :limit => 2)
+    end
     assert_equal(2, ships.size)
   end
 
   def test_limit_and_offset_with_include_and_order
-
     boat1 = LongShip.create!(:name => "1-Skei")
     boat2 = LongShip.create!(:name => "2-Skei")
 
@@ -153,29 +156,35 @@ class MSSQLLimitOffsetTest < Test::Unit::TestCase
     boat2.vikings.create!(:name => "Ben")
     boat1.vikings.create!(:name => "Carl")
     boat2.vikings.create!(:name => "Donald")
-  
-    vikings = Viking.find(:all, :include => :long_ship, :order => "long_ships.name, vikings.name", :offset => 0, :limit => 3)
-    assert_equal(["Adam", "Carl", "Ben"], vikings.map(&:name))
 
+    if ar_version('4.0')
+      vikings = Viking.includes(:long_ship).order('long_ships.name, vikings.name').references(:long_ship).offset(0).limit(3)
+    else
+      vikings = Viking.find(:all, :include => :long_ship, :order => "long_ships.name, vikings.name", :offset => 0, :limit => 3)
+    end
+    assert_equal ["Adam", "Carl", "Ben"], vikings.map(&:name)
   end
  
   def test_offset_without_limit
-    %w(one two three four five six seven eight).each do |name|
+    %w( egy keto harom negy ot hat het nyolc ).each do |name|
       LongShip.create!(:name => name)
     end
     error = assert_raise ActiveRecord::ActiveRecordError do
-      LongShip.find(:all, :offset => 2)
+      if ar_version('3.0')
+        LongShip.select(:name).offset(2).all
+      else
+        LongShip.find(:all, :select => 'name', :offset => 2)
+      end
     end
-    assert_equal("You must specify :limit with :offset.", error.message)
+    assert_equal "You must specify :limit with :offset.", error.message
   end
 
   def test_limit_with_group_by
-    %w(one two three four five six seven eight).each do |name|
+    %w( one two three four five six seven eight ).each do |name|
       LongShip.create!(:name => name)
     end
-
-    ships = LongShip.group(:name).find(:all, :limit => 2)
-    asset_equal(['one', 'two'], ships.map(&:name))
+    ships = LongShip.select(:name).group(:name).limit(2).all
+    assert_equal ['one', 'two'], ships.map(&:name)
   end if ar_version('3.0')
   
 end