activerecord-jdbc-adapter 1.2.9.1 → 1.3.0.beta1

data/test/{hsqldb_simple_test.rb → db/hsqldb/simple_test.rb}

@@ -1,7 +1,9 @@
-require 'jdbc_common'
 require 'db/hsqldb'
+require 'simple'
 
 class HsqldbSimpleTest < Test::Unit::TestCase
   include SimpleTestMethods
   include ExplainSupportTestMethods if ar_version("3.1")
+  include ActiveRecord3TestMethods
+  include CustomSelectTestMethods
 end

data/test/db/informix.rb

@@ -1,4 +1,4 @@
-require 'jdbc_common'
+require 'test_helper'
 
 config = {
   :username   => 'blog',

data/test/db/jdbc.rb

@@ -1,4 +1,4 @@
-require 'jdbc_common'
+require 'test_helper'
 require 'db/mysql_config'
 
 require 'jdbc/mysql' # driver not loaded for plain JDBC
@@ -7,9 +7,10 @@ Jdbc::MySQL.load_driver
 JDBC_CONFIG = {
   :adapter => 'jdbc',
   :driver => 'com.mysql.jdbc.Driver',
-  :url => "jdbc:mysql://#{MYSQL_CONFIG[:host]}/#{MYSQL_CONFIG[:database]}",
   :username => MYSQL_CONFIG[:username],
   :password => MYSQL_CONFIG[:password],
 }
+JDBC_CONFIG[:url] = "jdbc:mysql://" << 
+  "#{MYSQL_CONFIG[:host]}:#{MYSQL_CONFIG[:port] || 3306}/#{MYSQL_CONFIG[:database]}"
 
 ActiveRecord::Base.establish_connection(JDBC_CONFIG)

data/test/db/jdbc_derby.rb

@@ -1,4 +1,4 @@
-require 'jdbc_common'
+require 'test_helper'
 
 config = {
   :adapter => 'jdbc',

data/test/db/jdbc_h2.rb

@@ -1,4 +1,4 @@
-require 'jdbc_common'
+require 'test_helper'
 
 config = {
   :adapter => 'jdbc',

data/test/db/jdbc_mysql.rb

@@ -1,4 +1,4 @@
-require 'jdbc_common'
+require 'test_helper'
 require 'db/mysql_config'
 
 require 'jdbc/mysql' # driver not loaded for plain JDBC

data/test/db/jdbc_postgres.rb

@@ -1,4 +1,4 @@
-require 'jdbc_common'
+require 'test_helper'
 require 'db/postgres_config'
 
 require 'jdbc/postgres' # driver not loaded for plain JDBC

data/test/db/jndi_config.rb

@@ -1,5 +1,3 @@
-require 'arjdbc'
-require 'jdbc_common'
 
 JNDI_CONFIG = {
   :adapter => 'jdbc', :jndi => 'jdbc/DerbyDB'
@@ -32,4 +30,5 @@ begin
   init_context.create_subcontext 'jdbc'
 rescue javax.naming.NameAlreadyBoundException
 end
+
 init_context.bind JNDI_CONFIG[:jndi], data_source

data/test/db/jndi_pooled_config.rb

@@ -1,5 +1,3 @@
-require 'arjdbc'
-require 'jdbc_common'
 
 JNDI_POOLED_CONFIG = {
   :adapter => 'jdbc', :jndi => 'jdbc/PooledDerbyDB'
@@ -32,4 +30,5 @@ begin
   init_context.create_subcontext 'jdbc'
 rescue javax.naming.NameAlreadyBoundException
 end
-init_context.bind JNDI_POOLED_CONFIG[:jndi], data_source
+
+init_context.bind JNDI_POOLED_CONFIG[:jndi], data_source

data/test/db/mssql.rb

@@ -1,4 +1,4 @@
-require 'jdbc_common'
+require 'test_helper'
 
 MSSQL_CONFIG = { :adapter  => 'mssql' }
 MSSQL_CONFIG[:database] = ENV['SQLDATABASE'] || 'weblog_development'
@@ -8,4 +8,4 @@ MSSQL_CONFIG[:password] = ENV['SQLPASS'] || ''
 MSSQL_CONFIG[:host] = ENV['SQLHOST'] || 'localhost'
 MSSQL_CONFIG[:port] = ENV['SQLPORT'] if ENV['SQLPORT']
 
-ActiveRecord::Base.establish_connection(MSSQL_CONFIG)
+ActiveRecord::Base.establish_connection(MSSQL_CONFIG)

data/test/{mssql_db_create_test.rb → db/mssql/db_create_test.rb}

@@ -1,7 +1,7 @@
 require 'abstract_db_create'
 require 'db/mssql'
 
-class MysqlDbCreateTest < Test::Unit::TestCase
+class MSSQLDbCreateTest < Test::Unit::TestCase
   include AbstractDbCreate
 
   def db_config

data/test/db/mssql/exec_proc_test.rb

@@ -0,0 +1,46 @@
+require 'test_helper'
+require 'db/mssql'
+
+class MSSQLExecProcTest < Test::Unit::TestCase
+  
+  def self.startup
+    ActiveRecord::Base.connection.
+      create_table :sample_table, :force => true do |t|
+        t.column :sample_column, :datetime
+      end
+    # ActiveRecord::Base.logger.level = Logger::DEBUG
+  end
+
+  def self.shutdown
+    # ActiveRecord::Base.logger.level = Logger::WARN
+    ActiveRecord::Base.connection.drop_table :sample_table
+  end
+
+  test 'execute a simple procedure' do
+    tables = connection.execute_procedure :sp_tables
+    assert_instance_of Array, tables
+    assert tables.first.respond_to?(:keys)
+  end
+  
+  test 'takes parameter arguments' do
+    tables = connection.execute_procedure :sp_tables, 'sample_table'
+    table_info = tables.first
+    assert_equal 1, tables.size
+    assert_equal 'TABLE', table_info['TABLE_TYPE']
+    assert_equal 'sample_table', table_info['TABLE_NAME']
+  end
+  
+  test 'takes named parameter arguments' do
+    tables = connection.exec_proc :sp_tables, :table_name => 'tables', :table_owner => 'sys'
+    table_info = tables.first
+    assert_equal 1, tables.size
+    assert_equal 'VIEW', table_info['TABLE_TYPE'], "Table Info: #{table_info.inspect}"
+  end
+  
+  private
+  
+  def connection
+    ActiveRecord::Base.connection
+  end
+  
+end

data/test/db/mssql/ignore_system_views_test.rb

@@ -0,0 +1,40 @@
+require 'jdbc_common'
+require 'db/mssql'
+
+class MSSQLIgnoreSystemViewsTest < Test::Unit::TestCase
+  include MigrationSetup
+
+  def test_system_views_ignored
+    assert_not_include tables, 'views'
+    if ActiveRecord::Base.connection.sqlserver_version == "2000"
+      assert_false table_exists?("sys.views"), %{table_exists?("sys.views")}
+      assert_false table_exists?("information_schema.views"), %{table_exists?("information_schema.views")}
+    else
+      assert_true table_exists?("sys.views"), %{table_exists?("sys.views")}
+      assert_true table_exists?("information_schema.views"), %{table_exists?("information_schema.views")}
+      
+      assert_true table_exists?(:views), %{table_exists?(:views)}
+    end
+    assert_false table_exists?("dbo.views"), %{table_exists?("dbo.views")}
+    #assert_false table_exists?(:views), %{table_exists?(:views)}
+    ActiveRecord::Schema.define { suppress_messages { create_table :views } }
+    assert_include tables, 'views'
+    assert_true table_exists?(:views), %{table_exists?(:views)}
+    ActiveRecord::Schema.define { suppress_messages { drop_table :views } }
+    #assert_false table_exists?(:views), %{table_exists?(:views)}
+  ensure
+    ActiveRecord::Base.connection.drop_table(:views) rescue nil
+  end
+
+  private
+
+  def tables
+    ActiveRecord::Base.connection.tables
+  end
+  
+  def table_exists?(*args)
+    ActiveRecord::Base.connection.table_exists?(*args)
+  end
+    
+end
+

data/test/{mssql_limit_offset_test.rb → db/mssql/limit_offset_test.rb}

@@ -108,7 +108,7 @@ class MSSQLLimitOffsetTest < Test::Unit::TestCase
     end
     ships = LegacyShip.limit(3)
     assert_equal(3, ships.size)
-  end
+  end if ar_version('3.0')
 
   def test_limit_and_offset
     %w(one two three four five six seven eight).each do |name|
@@ -169,4 +169,13 @@ class MSSQLLimitOffsetTest < Test::Unit::TestCase
     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|
+      LongShip.create!(:name => name)
+    end
+
+    ships = LongShip.group(:name).find(:all, :limit => 2)
+    asset_equal(['one', 'two'], ships.map(&:name))
+  end if ar_version('3.0')
+  
 end

data/test/db/mssql/multiple_connections_test.rb

@@ -0,0 +1,71 @@
+require 'test_helper'
+require 'db/mssql'
+
+class MSSQLMultipleConnectionsTest < Test::Unit::TestCase
+  
+  MSSQL_CONFIG2 = { :adapter  => 'mssql' }
+  MSSQL_CONFIG2[:database] = ENV['SQL2DATABASE']
+  MSSQL_CONFIG2[:username] = ENV['SQL2USER'] || MSSQL_CONFIG[:username]
+  MSSQL_CONFIG2[:password] = ENV['SQL2PASS'] || MSSQL_CONFIG[:password]
+  MSSQL_CONFIG2[:host] = MSSQL_CONFIG[:host]
+  MSSQL_CONFIG2[:port] = MSSQL_CONFIG[:port]
+  
+  OLD_CONFIG = ActiveRecord::Base.configurations.dup
+  
+  if MSSQL_CONFIG2[:database]
+    
+    class Database1 < ActiveRecord::Base
+      self.abstract_class = true
+      #establish_connection 'db1'
+    end
+    
+    class Model1 < Database1
+    end
+    
+    class Database2 < ActiveRecord::Base
+      self.abstract_class = true
+      #establish_connection 'db2'
+    end
+    
+    class Model2 < Database2
+    end
+    
+    def self.startup
+      ActiveRecord::Base.clear_active_connections!
+      ActiveRecord::Base.configurations.replace('db1' => MSSQL_CONFIG, 'db2' => MSSQL_CONFIG2)
+      
+      Database1.establish_connection 'db1'
+      Database2.establish_connection 'db2'
+      
+      Database1.connection.execute "CREATE TABLE [model1s] " + 
+        "([id] int NOT NULL IDENTITY(1, 1) PRIMARY KEY, [name] NVARCHAR(10))"
+      Database2.connection.execute "CREATE TABLE [model2s] " + 
+        "([id] int NOT NULL IDENTITY(1, 1) PRIMARY KEY, [name] NVARCHAR(10))"
+    end
+    
+    def self.shutdown
+      Database1.connection.execute "DROP TABLE [model1s]"
+      Database2.connection.execute "DROP TABLE [model2s]"
+      
+      ActiveRecord::Base.clear_active_connections!
+      
+      ActiveRecord::Base.configurations.replace OLD_CONFIG
+      ActiveRecord::Base.establish_connection MSSQL_CONFIG
+    end
+    
+    test "create and retrieve models" do
+      assert_nil Model1.first
+      assert_nil Model2.first
+      
+      Model1.create :name => 'm1'
+      Model2.create :name => 'm2'
+      
+      assert_not_nil Model1.first
+      assert_not_nil Model2.first
+    end
+    
+  else
+    puts "#{self.name} skipped since no second MS-SQL database configured"
+  end
+  
+end

data/test/{mssql_serialize_test.rb → db/mssql/serialize_test.rb}

@@ -1,6 +1,6 @@
 require 'db/mssql'
 require 'serialize'
 
-class MsSQLSerializeTest < Test::Unit::TestCase
+class MSSQLSerializeTest < Test::Unit::TestCase
   include SerializeTestMethods
 end

data/test/db/mssql/simple_test.rb

@@ -0,0 +1,140 @@
+require 'jdbc_common'
+require 'db/mssql'
+
+class MSSQLSimpleTest < Test::Unit::TestCase
+  include SimpleTestMethods
+  include ActiveRecord3TestMethods
+  include DirtyAttributeTests
+
+  include ExplainSupportTestMethods if ar_version("3.1")
+  
+  # MS SQL 2005 doesn't have a DATE class, only TIMESTAMP
+
+  # String comparisons are insensitive by default
+  undef_method :test_validates_uniqueness_of_strings_case_sensitive
+
+  def test_does_not_munge_quoted_strings
+    example_quoted_values = [%{'quoted'}, %{D\'oh!}]
+    example_quoted_values.each do |value|
+      entry = Entry.create!(:title => value)
+      entry.reload
+      assert_equal(value, entry.title)
+    end
+  end
+
+  def test_change_column_default
+    Entry.connection.change_column "entries", "title", :string, :default => "new default"
+    Entry.reset_column_information
+    assert_equal("new default", Entry.new.title)
+
+    Entry.connection.change_column "entries", "title", :string, :default => nil
+    Entry.reset_column_information
+    assert_equal(nil, Entry.new.title)
+  end
+
+  def test_change_column_nullability
+    Entry.connection.change_column "entries", "title", :string, :null => true
+    Entry.reset_column_information
+    title_column = Entry.columns.find { |c| c.name == "title" }
+    assert(title_column.null)
+
+    Entry.connection.change_column "entries", "title", :string, :null => false
+    Entry.reset_column_information
+    title_column = Entry.columns.find { |c| c.name == "title" }
+    assert(!title_column.null)
+  end
+
+  [nil, "NULL", "null", "(null)", "(NULL)"].each_with_index do |v, i|
+    define_method "test_null_#{i}" do
+      entry = Entry.create!(:title => v, :content => v)
+      entry = Entry.find(entry.id)
+      assert_equal [v, v], [entry.title, entry.content], "writing #{v.inspect} " + 
+        "should read back as #{v.inspect} for both string and text columns"
+    end
+  end
+  
+  # ACTIVERECORD_JDBC-124
+  def test_model_does_not_have_row_num_column
+    User.create! :login => 'row_num'
+    model = User.first
+    assert_false model.attributes.keys.include?("_row_num")
+    assert_false model.respond_to?(:_row_num)
+  end
+  
+  def test_returns_charset
+    assert_not_nil ActiveRecord::Base.connection.charset
+  end
+  
+  def test_rename_table
+    user = User.create! :login => 'luser'
+    begin
+      ActiveRecord::Base.connection.rename_table 'users', 'lusers'
+      lusers = Class.new(ActiveRecord::Base)
+      lusers.table_name = 'lusers'
+      assert_kind_of ActiveRecord::Base, lusers.find(user.id)
+    ensure
+      CreateUsers.up rescue nil
+      ActiveRecord::Base.connection.execute("DROP TABLE lusers") rescue nil
+    end
+  end
+  
+  def test_remove_column_with_index
+    ActiveRecord::Schema.define do
+      add_column :entries, 'another_column', :string
+      add_index :entries, 'another_column'
+    end
+
+    columns = ActiveRecord::Base.connection.columns("entries")
+    assert columns.find { |col| col.name == 'another_column' }
+
+    ActiveRecord::Schema.define do
+      remove_column "entries", 'another_column'
+    end
+
+    columns = ActiveRecord::Base.connection.columns("entries")
+    assert ! columns.find { |col| col.name == 'another_column' }
+  end
+  
+  def test_find_by_sql_WITH_statement
+    user = User.create! :login => 'ferko'
+    Entry.create! :title => 'aaa', :user_id => user.id
+    entries = Entry.find_by_sql '' + 
+      'WITH EntryAndUser (title, login, updated_on) AS ' +
+      '(' +
+      ' SELECT e.title, u.login, e.updated_on ' + 
+      ' FROM entries e INNER JOIN users u ON e.user_id = u.id ' +
+      ')' +
+      ' ' +
+      'SELECT * FROM EntryAndUser ORDER BY title ASC'
+    assert entries.first
+    assert entries.first.title
+    assert entries.first.login
+  end
+  
+  def test_exec
+    ActiveRecord::Base.connection.execute "CREATE PROCEDURE usp_allentries AS SELECT * FROM entries"
+    
+    assert ActiveRecord::Base.connection.exec_query(" EXEC usp_allentries ")
+    
+    # exec_sql = "EXEC sp_msforeachdb 'SELECT count(*) FROM sys.objects'"
+    # NOTE: our _execute logic assumes all EXEC statements to do an update :
+    # assert_not_empty ActiveRecord::Base.connection.execute(exec_sql) # [ { '' => 42 }]
+  ensure
+    ActiveRecord::Base.connection.execute "DROP PROCEDURE usp_allentries" rescue nil
+  end
+  
+  def test_current_user
+    # skip if ActiveRecord::Base.connection.send(:sqlserver_2000?)
+    assert_equal 'dbo', ActiveRecord::Base.connection.current_user
+  end
+
+  def test_default_schema
+    # skip if ActiveRecord::Base.connection.send(:sqlserver_2000?)
+    assert_equal 'dbo', ActiveRecord::Base.connection.default_schema
+  end
+  
+end
+
+class MSSQLHasManyThroughTest < Test::Unit::TestCase
+  include HasManyThroughMethods
+end