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

data/src/java/arjdbc/mssql/MSSQLModule.java

@@ -40,9 +40,10 @@ import org.jruby.runtime.builtin.IRubyObject;
  */
 public class MSSQLModule {
     
-    public static void load(final RubyModule arJdbc) {
+    public static RubyModule load(final RubyModule arJdbc) {
         RubyModule mssql = arJdbc.defineModuleUnder("MSSQL");
         mssql.defineAnnotatedMethods( MSSQLModule.class );
+        return mssql;
     }
     
     @JRubyMethod(name = "quote_string", required = 1, frame = false)

data/src/java/arjdbc/mysql/MySQLModule.java

@@ -42,9 +42,10 @@ import org.jruby.util.ByteList;
 
 public class MySQLModule {
     
-    public static void load(RubyModule arJdbc) {
-        RubyModule mySQL = arJdbc.defineModuleUnder("MySQL");
-        mySQL.defineAnnotatedMethods(MySQLModule.class);
+    public static RubyModule load(final RubyModule arJdbc) {
+        RubyModule mysql = arJdbc.defineModuleUnder("MySQL");
+        mysql.defineAnnotatedMethods(MySQLModule.class);
+        return mysql;
     }
 
     //private final static byte[] ZERO = new byte[] {'\\','0'};

data/src/java/arjdbc/mysql/MySQLRubyJdbcConnection.java

@@ -80,19 +80,24 @@ public class MySQLRubyJdbcConnection extends RubyJdbcConnection {
         return super.jdbcToRuby(runtime, column, type, resultSet);
     }
 
-    public static RubyClass createMySQLJdbcConnectionClass(Ruby runtime, RubyClass jdbcConnection) {
-        RubyClass clazz = RubyJdbcConnection.getConnectionAdapters(runtime).defineClassUnder("MySQLJdbcConnection",
-                jdbcConnection, MYSQL_JDBCCONNECTION_ALLOCATOR);
-        clazz.defineAnnotatedMethods(MySQLRubyJdbcConnection.class);
-
-        return clazz;
-    }
     private static ObjectAllocator MYSQL_JDBCCONNECTION_ALLOCATOR = new ObjectAllocator() {
         public IRubyObject allocate(Ruby runtime, RubyClass klass) {
             return new MySQLRubyJdbcConnection(runtime, klass);
         }
     };
+    
+    public static RubyClass createMySQLJdbcConnectionClass(Ruby runtime, RubyClass jdbcConnection) {
+        RubyClass clazz = getConnectionAdapters(runtime).
+            defineClassUnder("MySQLJdbcConnection", jdbcConnection, MYSQL_JDBCCONNECTION_ALLOCATOR);
+        clazz.defineAnnotatedMethods(MySQLRubyJdbcConnection.class);
+        return clazz;
+    }
 
+    /*
+    public static RubyClass getMySQLJdbcConnectionClass(final Ruby runtime) {
+        return getConnectionAdapters(runtime).getClass("MySQLJdbcConnection");
+    } */
+    
     @Override
     protected IRubyObject indexes(final ThreadContext context, final String tableName, final String name, final String schemaName) {
         return withConnection(context, new Callable<IRubyObject>() {

data/src/java/arjdbc/oracle/OracleModule.java

@@ -40,9 +40,10 @@ import org.jruby.runtime.builtin.IRubyObject;
  */
 public class OracleModule {
     
-    public static void load(final RubyModule arJdbc) {
+    public static RubyModule load(final RubyModule arJdbc) {
         RubyModule oracle = arJdbc.defineModuleUnder("Oracle");
         oracle.defineAnnotatedMethods( OracleModule.class );
+        return oracle;
     }
     
     @JRubyMethod(name = "quote_string", required = 1, frame = false)

data/src/java/arjdbc/sqlite3/SQLite3Module.java

@@ -39,9 +39,10 @@ import org.jruby.util.ByteList;
  */
 public class SQLite3Module {
     
-    public static void load(final RubyModule arJdbc) {
+    public static RubyModule load(final RubyModule arJdbc) {
         RubyModule sqlite3 = arJdbc.defineModuleUnder("SQLite3");
         sqlite3.defineAnnotatedMethods( SQLite3Module.class );
+        return sqlite3;
     }
     
     @JRubyMethod(name = "quote_string", required = 1, frame = false)

data/src/java/arjdbc/sqlite3/SQLite3RubyJdbcConnection.java

@@ -92,6 +92,18 @@ public class SQLite3RubyJdbcConnection extends RubyJdbcConnection {
         });
     }
 
+    @Override
+    protected Statement createStatement(final ThreadContext context, final Connection connection) 
+        throws SQLException {
+        final Statement statement = connection.createStatement();
+        IRubyObject statementEscapeProcessing = getConfigValue(context, "statement_escape_processing");
+        if ( ! statementEscapeProcessing.isNil() ) {
+            statement.setEscapeProcessing(statementEscapeProcessing.isTrue());
+        }
+        // else leave as is by default
+        return statement;
+    }
+    
     @Override
     protected IRubyObject jdbcToRuby(final Ruby runtime, final int column, int type, final ResultSet resultSet)
         throws SQLException {

data/test/db/db2.rb

@@ -9,24 +9,31 @@ config[:port] = ENV['DB2PORT'] if ENV['DB2PORT']
 config[:username] = ENV['DB2USER'] if ENV['DB2USER'] # db2inst1
 config[:password] = ENV['DB2PASS'] if ENV['DB2PASS']
 
+# for AS400 specify the full JDBC URL "jdbc:as400://..."
+config[:url] = ENV['DB2URL'] if ENV['DB2URL']
+
 # DB2 does not like "_" in database names :
 # SQL0104N  An unexpected token "weblog_development" was found
 # create the sample database using `db2sampl` command
-database = ENV['DB2DATABASE'] || 'SAMPLE'
-if config[:host]
-  config[:database] = database
-else
-  config[:url] = "jdbc:db2:#{database}" # local instance
+unless config[:url]
+  database = ENV['DB2DATABASE'] || 'SAMPLE'
+  if config[:host]
+    config[:database] = database
+  else
+    config[:url] = "jdbc:db2:#{database}" # local instance
+  end
 end
 
 require 'jdbc/db2'
 # Download IBM DB2 JCC driver from :
 # https://www-304.ibm.com/support/docview.wss?rs=4020&uid=swg21385217
+# or http://sourceforge.net/projects/jt400/ for AS400
+jdbc_db2 = (config[:url] || '') =~ /\:as400/ ? Jdbc::AS400 : Jdbc::DB2
 begin
-  Java::JavaClass.for_name(Jdbc::DB2.driver_name)
+  Java::JavaClass.for_name(jdbc_db2.driver_name)
 rescue NameError
   begin
-    Jdbc::DB2.load_driver
+    jdbc_db2.load_driver
   rescue LoadError => e
     puts "Please setup a JDBC driver to run the DB2 tests !"
     raise e

data/test/db/db2/rake_test.rb

@@ -0,0 +1,82 @@
+require 'rake_test_support'
+require 'db/db2'
+
+class DB2RakeDbCreateTest < Test::Unit::TestCase
+  include RakeTestSupport
+  
+  def db_name; nil; end # using same DB (db:create is a bit IBM-plicated)
+  
+  test 'rake db:test:purge' do
+    # Rake::Task["db:create"].invoke
+    create_rake_test_database do |connection|
+      create_schema_migrations_table(connection)
+      connection.create_table('ibmers_test') { |t| t.string :name }
+    end
+    
+    Rake::Task["db:test:purge"].invoke
+
+    establish_test_connection
+    assert_false ActiveRecord::Base.connection.table_exists?('ibmers_test')
+    ActiveRecord::Base.connection.disconnect!
+  end
+
+  test 'rake db:structure:dump (and db:structure:load)' do
+    # Rake::Task["db:create"].invoke
+    create_rake_test_database do |connection|
+      drop_all_database_tables(connection)
+      create_sample_database_data(connection)
+      create_schema_migrations_table(connection)
+      connection.create_table('ibmers') { |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)
+      assert_match /CREATE TABLE ibmers/im, File.read(structure_sql)
+      
+      # db:structure:load
+      drop_all_database_tables
+      create_rake_test_database
+      Rake::Task["db:structure:load"].invoke
+      
+      establish_test_connection
+      assert ActiveRecord::Base.connection.table_exists?('ibmers')
+      ActiveRecord::Base.connection.disconnect!
+    ensure
+      File.delete(structure_sql) if File.exists?(structure_sql)
+      Dir.rmdir 'db'
+    end
+  end
+  
+  setup { rm_r 'db' if File.exist?('db') }
+  
+  private
+  
+  def establish_test_connection
+    config = db_config.dup
+    config.merge! :database => db_name if db_name
+    ActiveRecord::Base.establish_connection config
+  end
+  
+  def create_sample_database_data(connection)
+    filename = File.expand_path('rake_test_data.sql', File.dirname(__FILE__))
+    File.read(filename).split(/;\n\n/).each { |ddl| connection.execute(ddl) }
+  end
+  
+  def drop_all_database_tables(connection = nil)
+    established = nil
+    connection ||= begin 
+      ActiveRecord::Base.connection
+    rescue
+      ActiveRecord::Base.establish_connection db_config
+      established = true
+      ActiveRecord::Base.connection
+    end
+    connection.tables.each { |table| connection.drop_table(table) }
+    ActiveRecord::Base.connection.disconnect! if established
+  end
+  
+end

data/test/db/db2/rake_test_data.sql

@@ -0,0 +1,35 @@
+CREATE TABLE EMPLOYEE (
+  EMPNO CHAR(6) NOT NULL,
+  FIRSTNME VARCHAR(12) NOT NULL,
+  MIDINIT CHAR(1),
+  LASTNAME VARCHAR(15) NOT NULL,
+  WORKDEPT CHAR(3),
+  PHONENO CHAR(4),
+  HIREDATE DATE,
+  JOB CHAR(8),
+  EDLEVEL SMALLINT NOT NULL,
+  SEX CHAR(1),
+  BIRTHDATE DATE,
+  SALARY DECIMAL(9,2),
+  BONUS DECIMAL(9,2),
+  COMM DECIMAL(9,2)
+);
+
+ALTER TABLE EMPLOYEE ADD CONSTRAINT PK_EMPLOYEE PRIMARY KEY (EMPNO);
+
+CREATE TABLE EMP_PHOTO (
+  EMPNO CHAR(6) NOT NULL,
+  PHOTO_FORMAT VARCHAR(10) NOT NULL,
+  PICTURE BLOB(102400)
+);
+
+ALTER TABLE EMP_PHOTO ADD CONSTRAINT PK_EMP_PHOTO PRIMARY KEY (EMPNO, PHOTO_FORMAT);
+
+CREATE TABLE EMP_RESUME (
+  EMPNO CHAR(6) NOT NULL,
+  RESUME_FORMAT VARCHAR(10) NOT NULL,
+  RESUME CLOB(5120)
+);
+
+ALTER TABLE EMP_RESUME ADD CONSTRAINT PK_EMP_RESUME PRIMARY KEY (EMPNO, RESUME_FORMAT);
+

data/test/db/db2/simple_test.rb

@@ -42,6 +42,26 @@ class DB2SimpleTest < Test::Unit::TestCase
     assert_equal false, e.sample_boolean?
   end
   
+  def test_emulates_booleans_by_default
+    assert_true ArJdbc::DB2.emulate_booleans
+  end if ar_version('3.0')
+
+  def test_boolean_emulation_can_be_disabled
+    db_type = DbType.create! :sample_boolean => true
+    column = DbType.columns.find { |col| col.name.to_s == 'sample_boolean' }
+    assert_equal :boolean, column.type
+    ArJdbc::DB2.emulate_booleans = false
+    
+    DbType.reset_column_information
+    column = DbType.columns.find { |col| col.name.to_s == 'sample_boolean' }
+    assert_equal :integer, column.type
+    
+    assert_equal 1, db_type.reload.sample_boolean
+  ensure
+    ArJdbc::DB2.emulate_booleans = true
+    DbType.reset_column_information
+  end if ar_version('3.0')
+  
   def test_find_by_sql_WITH_statement
     user = User.create! :login => 'ferko'
     Entry.create! :title => 'aaa', :user_id => user.id

data/test/db/db2/unit_test.rb

@@ -1,5 +1,6 @@
 require 'test_helper'
 require 'arjdbc/db2'
+require 'arjdbc/db2/as400'
 
 class DB2UnitTest < Test::Unit::TestCase
   
@@ -52,7 +53,8 @@ class DB2UnitTest < Test::Unit::TestCase
   private
   
   def new_adapter_stub(config = {})
-    config = config.merge({ :adapter => 'jdbc', :adapter_spec => ArJdbc::DB2 })
+    config = config.merge({ :adapter => 'jdbc' })
+    config[:adapter_spec] ||= config[:url] =~ /as400/ ? ArJdbc::AS400 : ArJdbc::DB2
     connection = stub('connection'); logger = nil
     connection.stub_everything
     adapter = ActiveRecord::ConnectionAdapters::JdbcAdapter.new connection, logger, config

data/test/db/derby.rb

@@ -1,10 +1,12 @@
 require 'test_helper'
 
-config = {
-  :adapter => 'derby',
-  :database => "derby-testdb"
-}
+config = { :adapter => 'derby', :database => 'test.derby' }
 
 ActiveRecord::Base.establish_connection(config)
 
-at_exit { FileUtils.rm_rf('derby-testdb') }
+at_exit do
+  Dir.glob('test*.derby').each do |dir| 
+    FileUtils.rm_rf(dir) 
+    File.delete(dir) if File.exist?(dir)
+  end
+end

data/test/db/derby/rake_test.rb

@@ -0,0 +1,96 @@
+require 'rake_test_support'
+require 'db/derby'
+
+class DerbyRakeTest < Test::Unit::TestCase
+  include RakeTestSupport
+  
+  def db_name; 'test-rake.derby'; end
+  
+  def do_teardown
+    drop_rake_test_database(:silence)
+  end
+
+  test 'rake db:create' do
+    Rake::Task["db:create"].invoke
+    assert_true File.directory?('test-rake.derby')
+  end
+
+  test 'rake db:drop' do
+    create_rake_test_database
+    
+    Rake::Task["db:drop"].invoke
+    assert_false File.directory?('test-rake.derby')
+  end
+  
+  test 'rake db:test:purge' do
+    ActiveRecord::Base.connection.disconnect!
+    # Rake::Task["db:create"].invoke
+    create_rake_test_database do |connection|
+      connection.create_table('users') { |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?('users')
+    ActiveRecord::Base.connection.disconnect!
+  end
+  
+  test 'rake db:structure:dump (and db:structure:load)' do
+    # NOTE: need to change db name esp. when run with other (rake) tests 
+    # since Derby can not handle too much create/rm - gets inconsistent
+    db_name = @db_name = 'test-dump-rake.derby'
+    create_rake_test_database(db_name) do |connection|
+      create_schema_migrations_table(connection)
+      connection.create_table('users') { |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)
+      assert_match /CREATE TABLE "?USERS"?/i, File.read(structure_sql)
+      
+      # db:structure:load
+      ActiveRecord::Base.connection.disconnect!
+      # drop_rake_test_database(:silence)
+      ActiveRecord::Base.establish_connection db_config.merge :database => db_name
+      ActiveRecord::Base.connection.drop_table('users')
+      ActiveRecord::Base.connection.drop_table('schema_migrations')
+      ActiveRecord::Base.connection.disconnect!
+      
+      Rake::Task["db:structure:load"].invoke
+      
+      ActiveRecord::Base.establish_connection db_config.merge :database => db_name
+      assert ActiveRecord::Base.connection.table_exists?('users')
+      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)
+    if silence
+      FileUtils.rm_rf(@db_name) if File.exists?(@db_name)
+    else
+      FileUtils.rm_rf(@db_name)
+    end
+  end
+  
+end

data/test/db/derby/simple_test.rb

@@ -8,6 +8,13 @@ class DerbySimpleTest < Test::Unit::TestCase
   include ActiveRecord3TestMethods
   include CustomSelectTestMethods
   
+  # @override
+  def test_empty_insert_statement
+    # "INSERT INTO table VALUES ( DEFAULT ) " not supported by Derby DB
+    pend if ar_version('4.0')
+    super
+  end
+  
   # Check that a table-less VALUES(xxx) query (like SELECT  works.
   def test_values
     value = nil
@@ -28,7 +35,7 @@ class DerbySimpleTest < Test::Unit::TestCase
   end
 
   def test_text_and_string_conversions
-    e = DbType.first
+    e = DbType.create!(:sample_string => '', :sample_text => '').reload
 
     # Derby will normally reject any non text value.
     # The adapter has been patched to convert non text values to strings
@@ -122,7 +129,8 @@ class DerbySimpleTest < Test::Unit::TestCase
       ["sample_integer_neg_default",  :integer,   { :default => -1 }],
       ["sample_text",                 :text,      { }],
       ["big_decimal",                 :integer,   { :precision => 31, :scale => 0 }],
-    ].sort{|a,b| a[0] <=> b[0]}
+      ["decimal_with_scale",          :decimal,   { :precision => 15, :scale => 3 }],
+    ].sort{ |a,b| a[0] <=> b[0] }
 
     column_names = (expected_types.map{|et| et[0]} + DbType.column_names).sort.uniq
     result = []