activerecord-jdbc-adapter 1.0.0.beta1-java → 1.0.0.beta2-java

data/test/mysql_info_test.rb

@@ -1,27 +1,33 @@
 require 'jdbc_common'
 require 'db/mysql'
+begin; require 'active_support/core_ext/numeric/bytes'; rescue LoadError; end
 
 class DBSetup < ActiveRecord::Migration
-  
+
   def self.up
     create_table :books do |t|
       t.string :title
+      t.timestamps
     end
-    
+
     create_table :cars, :primary_key => 'legacy_id' do |t|
       t.string :name
     end
-    
+
     create_table :cats, :id => false do |t|
       t.string :name
     end
-    
+
+    create_table :memos do |t|
+      t.text :text, :limit => 16.megabytes
+    end
   end
 
   def self.down
     drop_table :books
     drop_table :cars
     drop_table :cats
+    drop_table :memos
   end
 
 end
@@ -41,7 +47,7 @@ class MysqlInfoTest < Test::Unit::TestCase
   def test_should_return_the_primary_key_of_a_table
     assert_equal 'id', @connection.primary_key('books')
   end
-  
+
   def test_should_be_able_to_return_a_custom_primary_key
     assert_equal 'legacy_id', @connection.primary_key('cars')
   end
@@ -49,7 +55,7 @@ class MysqlInfoTest < Test::Unit::TestCase
   def test_should_return_nil_for_a_table_without_a_primary_key
     assert_nil @connection.primary_key('cats')
   end
-  
+
   ## structure_dump
   def test_should_include_the_tables_in_a_structure_dump
     # TODO: Improve these tests, I added this one because no other tests exists for this method.
@@ -57,6 +63,43 @@ class MysqlInfoTest < Test::Unit::TestCase
     assert dump.include?('CREATE TABLE `books`')
     assert dump.include?('CREATE TABLE `cars`')
     assert dump.include?('CREATE TABLE `cats`')
+    assert dump.include?('CREATE TABLE `memos`')
+  end
+
+  def test_should_include_longtext_in_schema_dump
+    strio = StringIO.new
+    ActiveRecord::SchemaDumper::dump(@connection, strio)
+    dump = strio.string
+    assert_match %r{t.text\s+"text",\s+:limit => 2147483647$}, dump
   end
 
+  # JRUBY-5040
+  def test_schema_dump_should_not_have_limits_on_datetime
+    strio = StringIO.new
+    ActiveRecord::SchemaDumper::dump(@connection, strio)
+    dump = strio.string
+    dump.grep(/datetime/).each {|line| assert line !~ /limit/ }
+  end
+
+  def test_should_include_limit
+    text_column = @connection.columns('memos').find { |c| c.name == 'text' }
+    assert_equal 2147483647, text_column.limit
+  end
+
+  def test_should_set_sqltype_to_longtext
+    text_column = @connection.columns('memos').find { |c| c.name == 'text' }
+    assert text_column.sql_type =~ /^longtext/
+  end
+
+  def test_should_set_type_to_text
+    text_column = @connection.columns('memos').find { |c| c.name == 'text' }
+    assert_equal :text, text_column.type
+  end
+
+  def test_verify_url_has_options
+    url = @connection.config[:url]
+    assert url =~ /characterEncoding=utf8/
+    assert url =~ /useUnicode=true/
+    assert url =~ /zeroDateTimeBehavior=convertToNull/
+  end
 end

data/test/mysql_simple_test.rb

@@ -25,6 +25,10 @@ class MysqlSimpleTest < Test::Unit::TestCase
     s = "weblog_development.posts"
     assert_equal "`weblog_development`.`posts`", ActiveRecord::Base.connection.quote_table_name(s)
   end
+
+  def test_update_all_with_limit
+    assert_nothing_raised { Entry.update_all({:title => "test"}, {}, {:limit => 1}) }
+  end
 end
 
 class MysqlHasManyThroughTest < Test::Unit::TestCase

data/test/oracle_simple_test.rb

@@ -3,52 +3,8 @@ require 'db/oracle'
 
 class OracleSimpleTest < Test::Unit::TestCase
   include SimpleTestMethods
-end
-
-class OracleSpecificTest < Test::Unit::TestCase
-  include MultibyteTestMethods  # so we can get @java_con
-
-  def setup
-    super
-    @java_con.createStatement.execute "CREATE TABLE DEFAULT_NUMBER (VALUE NUMBER, DATUM DATE)"
-    @java_con.createStatement.execute "INSERT INTO DEFAULT_NUMBER (VALUE, DATUM) VALUES (0.076, TIMESTAMP'2009-11-05 00:00:00')"
-    @java_con.createStatement.execute "CREATE SYNONYM POSTS FOR ENTRIES"
-    @klass = Class.new(ActiveRecord::Base)
-    @klass.set_table_name "DEFAULT_NUMBER"
-  end
-
-  def teardown
-    @java_con.createStatement.execute "DROP TABLE DEFAULT_NUMBER"
-    @java_con.createStatement.execute "DROP SYNONYM POSTS"
-    super
-  end
-
-  def test_default_number_precision
-    obj = @klass.find(:first)
-    assert_equal 0.076, obj.value
-  end
-
-  # JRUBY-3675, ACTIVERECORD_JDBC-22
-  def test_load_date
-    obj = @klass.find(:first)
-    assert_not_nil obj.datum, "no date"
-  end
 
-  def test_load_null_date
-    @java_con.createStatement.execute "UPDATE DEFAULT_NUMBER SET DATUM = NULL"
-    obj = @klass.find(:first)
-    assert obj.datum.nil?
+  def test_default_id_type_is_integer
+    assert Integer === Entry.first.id
   end
-
-  def test_model_access_by_synonym
-    @klass.set_table_name "POSTS"
-    entry_columns = Entry.columns_hash
-    @klass.columns.each do |c|
-      ec = entry_columns[c.name]
-      assert ec
-      assert_equal ec.sql_type, c.sql_type
-      assert_equal ec.type, c.type
-    end
-  end
-
-end if defined?(JRUBY_VERSION)
+end

data/test/oracle_specific_test.rb

@@ -0,0 +1,83 @@
+require 'jdbc_common'
+require 'db/oracle'
+
+class DefaultNumber < ActiveRecord::Base
+end
+
+class OracleSpecificTest < Test::Unit::TestCase
+  include MultibyteTestMethods  # so we can get @java_con
+
+  def setup
+    super
+    @java_con.createStatement.execute "
+      CREATE TABLE DEFAULT_NUMBERS (
+       ID INTEGER NOT NULL PRIMARY KEY, VALUE NUMBER, DATUM DATE, FPOINT NUMBER(10,2), VALUE2 NUMBER(15)
+      )"
+    @java_con.createStatement.execute "
+      INSERT INTO DEFAULT_NUMBERS (ID, VALUE, DATUM, FPOINT, VALUE2)
+                          VALUES (1, 0.076, TIMESTAMP'2009-11-05 00:00:00', 1000.01, 1234)"
+    @java_con.createStatement.execute "CREATE SYNONYM POSTS FOR ENTRIES"
+  end
+
+  def teardown
+    @java_con.createStatement.execute "DROP TABLE DEFAULT_NUMBERS"
+    @java_con.createStatement.execute "DROP SYNONYM POSTS"
+    super
+  end
+
+  def test_default_number_precision
+    assert_equal 0.076, DefaultNumber.find(:first).value
+  end
+
+  def test_number_with_precision_and_scale
+    assert_equal 1000.01, DefaultNumber.find(:first).fpoint
+  end
+
+  def test_number_with_precision
+    assert_equal 1234, DefaultNumber.find(:first).value2
+  end
+
+  def test_number_type_with_precision_and_scale_is_reported_correctly
+    assert_equal 'NUMBER', DefaultNumber.columns_hash['value'].sql_type
+    assert_equal 'NUMBER(10,2)', DefaultNumber.columns_hash['fpoint'].sql_type
+    assert_equal 'NUMBER(15)', DefaultNumber.columns_hash['value2'].sql_type
+  end
+
+  # JRUBY-3675, ACTIVERECORD_JDBC-22
+  def test_load_date
+    obj = DefaultNumber.find(:first)
+    assert_not_nil obj.datum, "no date"
+  end
+
+  # ACTIVERECORD_JDBC-127
+  def test_save_date
+    obj = DefaultNumber.find(:first)
+    obj.datum = '01Jan2010'
+    obj.save!
+  end
+
+  def test_save_timestamp
+    obj = DefaultNumber.find(:first)
+    obj.datum = Time.now
+    obj.save!
+  end
+
+  def test_load_null_date
+    @java_con.createStatement.execute "UPDATE DEFAULT_NUMBERS SET DATUM = NULL"
+    obj = DefaultNumber.find(:first)
+    assert obj.datum.nil?
+  end
+
+  def test_model_access_by_synonym
+    @klass = Class.new(ActiveRecord::Base)
+    @klass.set_table_name "POSTS"
+    entry_columns = Entry.columns_hash
+    @klass.columns.each do |c|
+      ec = entry_columns[c.name]
+      assert ec
+      assert_equal ec.sql_type, c.sql_type
+      assert_equal ec.type, c.type
+    end
+  end
+
+end if defined?(JRUBY_VERSION)

data/test/postgres_db_create_test.rb

@@ -18,4 +18,10 @@ class PostgresDbCreateTest < Test::Unit::TestCase
     def test_skipped
     end
   end
+
+  def test_rake_db_create_does_not_load_full_environment
+    Rake::Task["db:create"].invoke
+    assert @rails_env_set
+    assert !@full_environment_loaded
+  end
 end

data/test/postgres_drop_db_test.rb

@@ -0,0 +1,16 @@
+require 'abstract_db_create'
+require 'db/postgres'
+
+class PostgresDbDropTest < Test::Unit::TestCase
+  include AbstractDbCreate
+
+  def db_config
+    POSTGRES_CONFIG
+  end
+
+  def test_dropping_nonexistent_database_does_not_raise_exception
+    assert_nothing_raised do
+      Rake::Task["db:drop"].invoke
+    end
+  end
+end

data/test/postgres_simple_test.rb

@@ -11,3 +11,20 @@ class PostgresSimpleTest < Test::Unit::TestCase
   include SimpleTestMethods
   include ActiveRecord3TestMethods
 end
+
+class PostgresDeserializationTest < Test::Unit::TestCase
+  def setup
+    DbTypeMigration.up
+  end
+
+  def teardown
+    DbTypeMigration.down
+  end
+
+  def test_should_keep_float_precision
+    expected = DbType.create(:sample_float => 7.3)
+    actual = DbType.find(expected.id)
+
+    assert_equal expected.sample_float, actual.sample_float
+  end
+end

data/test/postgres_table_alias_length_test.rb

@@ -0,0 +1,15 @@
+require 'jdbc_common'
+require 'db/postgres'
+
+class PostgresTableAliasLengthTest < Test::Unit::TestCase
+  def test_table_alias_length
+    result = ActiveRecord::Base.connection.select_one("SELECT 1 AS " + "a" * 2048)
+
+    actual_table_alias_length = result.keys.first.size
+    actual_table_alias_length = 0 if actual_table_alias_length == 2048
+   
+    assert_equal(actual_table_alias_length,
+                 ActiveRecord::Base.connection.table_alias_length)
+  end
+end
+

data/test/simple.rb

@@ -10,6 +10,7 @@ module MigrationSetup
     DbTypeMigration.up
     CreateStringIds.up
     CreateEntries.up
+    CreateUsers.up
     CreateAutoIds.up
     CreateValidatesUniquenessOf.up
 
@@ -20,6 +21,7 @@ module MigrationSetup
     DbTypeMigration.down
     CreateStringIds.down
     CreateEntries.down
+    CreateUsers.down
     CreateAutoIds.down
     CreateValidatesUniquenessOf.down
     ActiveRecord::Base.clear_active_connections!
@@ -34,7 +36,8 @@ module FixtureSetup
     @content = "Hello from JRuby on Rails!"
     @new_title = "First post updated title"
     @rating = 205.76
-    @entry = Entry.create :title => @title, :content => @content, :rating => @rating
+    @user = User.create :login=>"something"
+    @entry = Entry.create :title => @title, :content => @content, :rating => @rating, :user=>@user
     DbType.create
   end
 end
@@ -46,6 +49,10 @@ module SimpleTestMethods
     assert ActiveRecord::Base.connection.tables.find{|t| t =~ /^entries$/i}, "entries not created"
   end
 
+  def test_users_created
+    assert ActiveRecord::Base.connection.tables.find{|t| t =~ /^users$/i}, "users not created"
+  end
+
   def test_entries_empty
     Entry.delete_all
     assert_equal 0, Entry.count
@@ -274,6 +281,15 @@ module SimpleTestMethods
     assert_nil AutoId.find(test.id).value
   end
 
+  # These should make no difference, but might due to the wacky regexp SQL rewriting we do.
+  def test_save_value_containing_sql
+    e = DbType.first
+    e.save
+
+    e.sample_string = e.sample_text = "\n\nselect from nothing where id = 'foo'"
+    e.save
+  end
+
   def test_invalid
     e = Entry.new(:title => @title, :content => @content, :rating => ' ')
     assert e.valid?
@@ -324,9 +340,6 @@ module SimpleTestMethods
   end
 
   def test_validates_uniqueness_of_strings_case_sensitive
-    # In MySQL and MsSQL, string cmps are case-insensitive by default, so skip this test
-    return if ActiveRecord::Base.connection.config[:adapter] =~ /m[sy]sql/
-
     name_lower = ValidatesUniquenessOfString.new(:cs_string => "name", :ci_string => '1')
     name_lower.save!
 

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
     - 1
     - 0
     - 0
-    - beta1
-  version: 1.0.0.beta1
+    - beta2
+  version: 1.0.0.beta2
 platform: java
 authors: 
   - Nick Sieger, Ola Bini and JRuby contributors
@@ -15,11 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-20 00:00:00 -05:00
+date: 2010-09-25 00:00:00 -05:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
-    name: hoe
+    name: rubyforge
     prerelease: false
     requirement: &id001 !ruby/object:Gem::Requirement 
       none: false
@@ -28,11 +28,26 @@ dependencies:
           - !ruby/object:Gem::Version 
             segments: 
               - 2
-              - 3
-              - 3
-            version: 2.3.3
+              - 0
+              - 4
+            version: 2.0.4
     type: :development
     version_requirements: *id001
+  - !ruby/object:Gem::Dependency 
+    name: hoe
+    prerelease: false
+    requirement: &id002 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 2
+              - 6
+              - 1
+            version: 2.6.1
+    type: :development
+    version_requirements: *id002
 description: |-
   activerecord-jdbc-adapter is a database adapter for Rails' ActiveRecord
   component that can be used with JRuby[http://www.jruby.org/]. It allows use of
@@ -65,6 +80,7 @@ files:
   - lib/active_record/connection_adapters/jdbc_adapter.rb
   - lib/active_record/connection_adapters/jndi_adapter.rb
   - lib/active_record/connection_adapters/mssql_adapter.rb
+  - lib/active_record/connection_adapters/mysql2_adapter.rb
   - lib/active_record/connection_adapters/mysql_adapter.rb
   - lib/active_record/connection_adapters/oracle_adapter.rb
   - lib/active_record/connection_adapters/postgresql_adapter.rb
@@ -74,6 +90,7 @@ files:
   - lib/arel/engines/sql/compilers/h2_compiler.rb
   - lib/arel/engines/sql/compilers/hsqldb_compiler.rb
   - lib/arel/engines/sql/compilers/jdbc_compiler.rb
+  - lib/arel/engines/sql/compilers/mssql_compiler.rb
   - lib/arjdbc/cachedb.rb
   - lib/arjdbc/db2.rb
   - lib/arjdbc/derby.rb
@@ -134,6 +151,7 @@ files:
   - lib/arjdbc/sqlite3/connection_methods.rb
   - lib/arjdbc/sybase/adapter.rb
   - lib/generators/jdbc/jdbc_generator.rb
+  - lib/jdbc_adapter/rake_tasks.rb
   - lib/jdbc_adapter/version.rb
   - lib/arjdbc/jdbc/adapter_java.jar
   - test/abstract_db_create.rb
@@ -164,13 +182,16 @@ files:
   - test/mysql_nonstandard_primary_key_test.rb
   - test/mysql_simple_test.rb
   - test/oracle_simple_test.rb
+  - test/oracle_specific_test.rb
   - test/pick_rails_version.rb
   - test/postgres_db_create_test.rb
+  - test/postgres_drop_db_test.rb
   - test/postgres_mixed_case_test.rb
   - test/postgres_nonseq_pkey_test.rb
   - test/postgres_reserved_test.rb
   - test/postgres_schema_search_path_test.rb
   - test/postgres_simple_test.rb
+  - test/postgres_table_alias_length_test.rb
   - test/simple.rb
   - test/sqlite3_simple_test.rb
   - test/sybase_jtds_simple_test.rb
@@ -200,12 +221,14 @@ files:
   - test/models/validates_uniqueness_of_string.rb
   - lib/arjdbc/jdbc/jdbc.rake
   - src/java/arjdbc/derby/DerbyModule.java
+  - src/java/arjdbc/informix/InformixRubyJdbcConnection.java
   - src/java/arjdbc/jdbc/AdapterJavaService.java
   - src/java/arjdbc/jdbc/JdbcConnectionFactory.java
   - src/java/arjdbc/jdbc/RubyJdbcConnection.java
   - src/java/arjdbc/jdbc/SQLBlock.java
   - src/java/arjdbc/mssql/MssqlRubyJdbcConnection.java
   - src/java/arjdbc/mysql/MySQLModule.java
+  - src/java/arjdbc/oracle/OracleRubyJdbcConnection.java
   - src/java/arjdbc/postgresql/PostgresqlRubyJdbcConnection.java
   - src/java/arjdbc/sqlite3/Sqlite3RubyJdbcConnection.java
   - rakelib/compile.rake
@@ -223,6 +246,9 @@ post_install_message:
 rdoc_options: 
   - --main
   - README.txt
+  - -SHN
+  - -f
+  - darkfish
 require_paths: 
   - lib
 required_ruby_version: !ruby/object:Gem::Requirement