activerecord-jdbc-adapter 1.3.0.beta2 → 1.3.0.rc1
Sign up to get free protection for your applications and to get access to all the features.
- data/.gitignore +14 -8
- data/.travis.yml +40 -31
- data/.yardopts +4 -0
- data/Appraisals +2 -5
- data/CONTRIBUTING.md +46 -0
- data/Gemfile +21 -4
- data/Gemfile.lock +42 -17
- data/{History.txt → History.md} +142 -75
- data/README.md +102 -104
- data/RUNNING_TESTS.md +76 -0
- data/Rakefile.jdbc +20 -0
- data/activerecord-jdbc-adapter.gemspec +35 -18
- data/gemfiles/rails23.gemfile +4 -3
- data/gemfiles/rails23.gemfile.lock +9 -6
- data/gemfiles/rails30.gemfile +4 -3
- data/gemfiles/rails30.gemfile.lock +9 -6
- data/gemfiles/rails31.gemfile +4 -3
- data/gemfiles/rails31.gemfile.lock +9 -6
- data/gemfiles/rails32.gemfile +4 -3
- data/gemfiles/rails32.gemfile.lock +17 -14
- data/gemfiles/rails40.gemfile +5 -5
- data/gemfiles/rails40.gemfile.lock +17 -69
- data/lib/active_record/connection_adapters/firebird_adapter.rb +1 -0
- data/lib/active_record/connection_adapters/sqlserver_adapter.rb +1 -0
- data/lib/arel/visitors/compat.rb +22 -3
- data/lib/arel/visitors/db2.rb +8 -4
- data/lib/arel/visitors/derby.rb +14 -13
- data/lib/arel/visitors/firebird.rb +5 -4
- data/lib/arel/visitors/hsqldb.rb +11 -9
- data/lib/arel/visitors/sql_server.rb +89 -61
- data/lib/arjdbc.rb +1 -1
- data/lib/arjdbc/db2/adapter.rb +181 -212
- data/lib/arjdbc/db2/as400.rb +31 -18
- data/lib/arjdbc/db2/column.rb +167 -0
- data/lib/arjdbc/db2/connection_methods.rb +2 -0
- data/lib/arjdbc/derby/adapter.rb +206 -107
- data/lib/arjdbc/derby/connection_methods.rb +4 -9
- data/lib/arjdbc/firebird.rb +1 -0
- data/lib/arjdbc/firebird/adapter.rb +202 -64
- data/lib/arjdbc/firebird/connection_methods.rb +20 -0
- data/lib/arjdbc/h2/adapter.rb +56 -36
- data/lib/arjdbc/hsqldb/adapter.rb +99 -68
- data/lib/arjdbc/jdbc/adapter.rb +474 -265
- data/lib/arjdbc/jdbc/adapter_java.jar +0 -0
- data/lib/arjdbc/jdbc/adapter_require.rb +8 -7
- data/lib/arjdbc/jdbc/arel_support.rb +132 -0
- data/lib/arjdbc/jdbc/base_ext.rb +8 -7
- data/lib/arjdbc/jdbc/callbacks.rb +16 -10
- data/lib/arjdbc/jdbc/column.rb +25 -3
- data/lib/arjdbc/jdbc/connection.rb +28 -55
- data/lib/arjdbc/jdbc/extension.rb +14 -14
- data/lib/arjdbc/jdbc/java.rb +6 -3
- data/lib/arjdbc/jdbc/jdbc.rake +1 -1
- data/lib/arjdbc/jdbc/quoted_primary_key.rb +2 -2
- data/lib/arjdbc/jdbc/rake_tasks.rb +1 -1
- data/lib/arjdbc/jdbc/type_converter.rb +5 -2
- data/lib/arjdbc/mssql/adapter.rb +160 -280
- data/lib/arjdbc/mssql/column.rb +182 -0
- data/lib/arjdbc/mssql/connection_methods.rb +37 -4
- data/lib/arjdbc/mssql/explain_support.rb +13 -21
- data/lib/arjdbc/mssql/limit_helpers.rb +79 -42
- data/lib/arjdbc/mssql/lock_methods.rb +77 -0
- data/lib/arjdbc/mssql/utils.rb +11 -11
- data/lib/arjdbc/mysql/adapter.rb +165 -247
- data/lib/arjdbc/mysql/column.rb +123 -0
- data/lib/arjdbc/mysql/connection_methods.rb +3 -6
- data/lib/arjdbc/oracle/adapter.rb +282 -288
- data/lib/arjdbc/oracle/column.rb +122 -0
- data/lib/arjdbc/oracle/connection_methods.rb +3 -0
- data/lib/arjdbc/postgresql/adapter.rb +336 -574
- data/lib/arjdbc/postgresql/column.rb +458 -0
- data/lib/arjdbc/postgresql/connection_methods.rb +1 -2
- data/lib/arjdbc/postgresql/schema_creation.rb +38 -0
- data/lib/arjdbc/sqlite3/adapter.rb +189 -145
- data/lib/arjdbc/sqlite3/explain_support.rb +1 -1
- data/lib/arjdbc/tasks/oracle/enhanced_structure_dump.rb +8 -8
- data/lib/arjdbc/util/quoted_cache.rb +60 -0
- data/lib/arjdbc/util/table_copier.rb +110 -0
- data/lib/arjdbc/version.rb +6 -7
- data/pom.xml +56 -2
- data/rakelib/02-test.rake +72 -83
- data/rakelib/db.rake +29 -17
- data/src/java/arjdbc/ArJdbcModule.java +21 -18
- data/src/java/arjdbc/db2/DB2RubyJdbcConnection.java +84 -12
- data/src/java/arjdbc/derby/DerbyModule.java +140 -143
- data/src/java/arjdbc/derby/DerbyRubyJdbcConnection.java +58 -7
- data/src/java/arjdbc/h2/H2Module.java +43 -0
- data/src/java/arjdbc/informix/InformixRubyJdbcConnection.java +7 -6
- data/src/java/arjdbc/jdbc/RubyJdbcConnection.java +1223 -648
- data/src/java/arjdbc/mssql/MSSQLRubyJdbcConnection.java +24 -23
- data/src/java/arjdbc/mysql/MySQLModule.java +33 -32
- data/src/java/arjdbc/mysql/MySQLRubyJdbcConnection.java +147 -30
- data/src/java/arjdbc/oracle/OracleModule.java +13 -13
- data/src/java/arjdbc/oracle/OracleRubyJdbcConnection.java +114 -6
- data/src/java/arjdbc/postgresql/PostgreSQLRubyJdbcConnection.java +166 -36
- data/src/java/arjdbc/sqlite3/SQLite3RubyJdbcConnection.java +101 -19
- data/src/java/arjdbc/util/QuotingUtils.java +19 -19
- metadata +240 -394
- data/bench/bench_attributes.rb +0 -13
- data/bench/bench_attributes_new.rb +0 -14
- data/bench/bench_create.rb +0 -12
- data/bench/bench_find_all.rb +0 -12
- data/bench/bench_find_all_mt.rb +0 -25
- data/bench/bench_model.rb +0 -85
- data/bench/bench_new.rb +0 -12
- data/bench/bench_new_valid.rb +0 -12
- data/bench/bench_valid.rb +0 -13
- data/lib/arel/engines/sql/compilers/db2_compiler.rb +0 -9
- data/lib/arel/engines/sql/compilers/derby_compiler.rb +0 -6
- data/lib/arel/engines/sql/compilers/h2_compiler.rb +0 -6
- data/lib/arel/engines/sql/compilers/hsqldb_compiler.rb +0 -15
- data/lib/arel/engines/sql/compilers/jdbc_compiler.rb +0 -6
- data/lib/arel/engines/sql/compilers/mssql_compiler.rb +0 -46
- data/lib/arjdbc/jdbc/missing_functionality_helper.rb +0 -98
- data/lib/arjdbc/mssql/lock_helpers.rb +0 -76
- data/lib/arjdbc/mssql/tsql_methods.rb +0 -58
- data/lib/arjdbc/postgresql/column_cast.rb +0 -134
- data/test/activerecord/connections/native_jdbc_mysql/connection.rb +0 -25
- data/test/activerecord/jall.sh +0 -7
- data/test/activerecord/jtest.sh +0 -3
- data/test/assets/flowers.jpg +0 -0
- data/test/binary.rb +0 -67
- data/test/db/db2.rb +0 -43
- data/test/db/db2/binary_test.rb +0 -6
- data/test/db/db2/has_many_through_test.rb +0 -6
- data/test/db/db2/rake_test.rb +0 -82
- data/test/db/db2/rake_test_data.sql +0 -35
- data/test/db/db2/reset_column_information_test.rb +0 -5
- data/test/db/db2/serialize_test.rb +0 -6
- data/test/db/db2/simple_test.rb +0 -81
- data/test/db/db2/test_helper.rb +0 -6
- data/test/db/db2/unit_test.rb +0 -73
- data/test/db/derby.rb +0 -12
- data/test/db/derby/binary_test.rb +0 -6
- data/test/db/derby/migration_test.rb +0 -74
- data/test/db/derby/rake_test.rb +0 -96
- data/test/db/derby/reset_column_information_test.rb +0 -6
- data/test/db/derby/row_locking_test.rb +0 -20
- data/test/db/derby/schema_dump_test.rb +0 -5
- data/test/db/derby/serialize_test.rb +0 -6
- data/test/db/derby/simple_test.rb +0 -173
- data/test/db/derby/test_helper.rb +0 -6
- data/test/db/derby/unit_test.rb +0 -32
- data/test/db/derby/xml_column_test.rb +0 -17
- data/test/db/h2.rb +0 -11
- data/test/db/h2/binary_test.rb +0 -6
- data/test/db/h2/change_column_test.rb +0 -68
- data/test/db/h2/identity_column_test.rb +0 -35
- data/test/db/h2/offset_test.rb +0 -49
- data/test/db/h2/rake_test.rb +0 -98
- data/test/db/h2/schema_dump_test.rb +0 -29
- data/test/db/h2/serialize_test.rb +0 -6
- data/test/db/h2/simple_test.rb +0 -56
- data/test/db/hsqldb.rb +0 -11
- data/test/db/hsqldb/binary_test.rb +0 -6
- data/test/db/hsqldb/rake_test.rb +0 -101
- data/test/db/hsqldb/schema_dump_test.rb +0 -19
- data/test/db/hsqldb/serialize_test.rb +0 -6
- data/test/db/hsqldb/simple_test.rb +0 -17
- data/test/db/informix.rb +0 -13
- data/test/db/jdbc.rb +0 -16
- data/test/db/jdbc_derby.rb +0 -14
- data/test/db/jdbc_h2.rb +0 -17
- data/test/db/jdbc_mysql.rb +0 -13
- data/test/db/jdbc_postgres.rb +0 -23
- data/test/db/jndi_config.rb +0 -32
- data/test/db/jndi_pooled_config.rb +0 -32
- data/test/db/mssql.rb +0 -11
- data/test/db/mssql/binary_test.rb +0 -6
- data/test/db/mssql/exec_proc_test.rb +0 -46
- data/test/db/mssql/identity_insert_test.rb +0 -18
- data/test/db/mssql/ignore_system_views_test.rb +0 -40
- data/test/db/mssql/limit_offset_test.rb +0 -190
- data/test/db/mssql/multibyte_test.rb +0 -16
- data/test/db/mssql/multiple_connections_test.rb +0 -71
- data/test/db/mssql/rake_test.rb +0 -143
- data/test/db/mssql/reset_column_information_test.rb +0 -6
- data/test/db/mssql/row_locking_test.rb +0 -7
- data/test/db/mssql/serialize_test.rb +0 -6
- data/test/db/mssql/simple_test.rb +0 -140
- data/test/db/mssql/transaction_test.rb +0 -6
- data/test/db/mssql/types_test.rb +0 -205
- data/test/db/mssql/unit_test.rb +0 -249
- data/test/db/mysql.rb +0 -4
- data/test/db/mysql/_rails_test_mysql.32.out +0 -6585
- data/test/db/mysql/binary_test.rb +0 -6
- data/test/db/mysql/connection_test.rb +0 -51
- data/test/db/mysql/index_length_test.rb +0 -58
- data/test/db/mysql/multibyte_test.rb +0 -10
- data/test/db/mysql/nonstandard_primary_key_test.rb +0 -39
- data/test/db/mysql/rake_test.rb +0 -97
- data/test/db/mysql/reset_column_information_test.rb +0 -6
- data/test/db/mysql/schema_dump_test.rb +0 -228
- data/test/db/mysql/serialize_test.rb +0 -6
- data/test/db/mysql/simple_test.rb +0 -187
- data/test/db/mysql/statement_escaping_test.rb +0 -46
- data/test/db/mysql/transaction_test.rb +0 -6
- data/test/db/mysql/types_test.rb +0 -30
- data/test/db/mysql/unit_test.rb +0 -93
- data/test/db/mysql_config.rb +0 -7
- data/test/db/oracle.rb +0 -27
- data/test/db/oracle/binary_test.rb +0 -6
- data/test/db/oracle/limit_test.rb +0 -24
- data/test/db/oracle/multibyte_test.rb +0 -22
- data/test/db/oracle/rake_test.rb +0 -100
- data/test/db/oracle/reset_column_information_test.rb +0 -6
- data/test/db/oracle/serialize_test.rb +0 -6
- data/test/db/oracle/simple_test.rb +0 -140
- data/test/db/oracle/specific_test.rb +0 -180
- data/test/db/oracle/transaction_test.rb +0 -31
- data/test/db/oracle/unit_test.rb +0 -31
- data/test/db/postgres.rb +0 -11
- data/test/db/postgres/_rails_test_postgres.32.out +0 -6405
- data/test/db/postgres/a_custom_primary_key_test.rb +0 -50
- data/test/db/postgres/active_schema_unit_test.rb +0 -68
- data/test/db/postgres/array_type_test.rb +0 -101
- data/test/db/postgres/binary_test.rb +0 -6
- data/test/db/postgres/connection_test.rb +0 -63
- data/test/db/postgres/data_types_test.rb +0 -703
- data/test/db/postgres/hstore_test.rb +0 -200
- data/test/db/postgres/information_schema_leak_test.rb +0 -30
- data/test/db/postgres/json_test.rb +0 -86
- data/test/db/postgres/ltree_test.rb +0 -51
- data/test/db/postgres/mixed_case_test.rb +0 -29
- data/test/db/postgres/native_types_test.rb +0 -124
- data/test/db/postgres/rake_test.rb +0 -117
- data/test/db/postgres/reserved_test.rb +0 -22
- data/test/db/postgres/reset_column_information_test.rb +0 -6
- data/test/db/postgres/row_locking_test.rb +0 -21
- data/test/db/postgres/schema_dump_test.rb +0 -95
- data/test/db/postgres/schema_test.rb +0 -115
- data/test/db/postgres/simple_test.rb +0 -260
- data/test/db/postgres/table_alias_length_test.rb +0 -16
- data/test/db/postgres/transaction_test.rb +0 -6
- data/test/db/postgres/unit_test.rb +0 -31
- data/test/db/postgres_config.rb +0 -10
- data/test/db/sqlite3.rb +0 -6
- data/test/db/sqlite3/_rails_test_sqlite3.32.out +0 -6274
- data/test/db/sqlite3/has_many_though_test.rb +0 -6
- data/test/db/sqlite3/rake_test.rb +0 -71
- data/test/db/sqlite3/reset_column_information_test.rb +0 -6
- data/test/db/sqlite3/schema_dump_test.rb +0 -6
- data/test/db/sqlite3/serialize_test.rb +0 -6
- data/test/db/sqlite3/simple_test.rb +0 -268
- data/test/db/sqlite3/transaction_test.rb +0 -32
- data/test/db/sqlite3/type_conversion_test.rb +0 -104
- data/test/has_many_through.rb +0 -61
- data/test/informix_simple_test.rb +0 -48
- data/test/jdbc/db2.rb +0 -36
- data/test/jdbc/oracle.rb +0 -34
- data/test/jdbc_column_test.rb +0 -23
- data/test/jdbc_common.rb +0 -16
- data/test/jdbc_connection_test.rb +0 -196
- data/test/jndi_callbacks_test.rb +0 -33
- data/test/jndi_test.rb +0 -55
- data/test/manualTestDatabase.rb +0 -191
- data/test/models/add_not_null_column_to_table.rb +0 -9
- data/test/models/auto_id.rb +0 -15
- data/test/models/binary.rb +0 -18
- data/test/models/custom_pk_name.rb +0 -15
- data/test/models/data_types.rb +0 -40
- data/test/models/entry.rb +0 -41
- data/test/models/mixed_case.rb +0 -22
- data/test/models/reserved_word.rb +0 -15
- data/test/models/rights_and_roles.rb +0 -57
- data/test/models/string_id.rb +0 -17
- data/test/models/thing.rb +0 -17
- data/test/models/topic.rb +0 -32
- data/test/models/validates_uniqueness_of_string.rb +0 -19
- data/test/rails/mysql.rb +0 -13
- data/test/rails/sqlite3/version.rb +0 -6
- data/test/rails_stub.rb +0 -31
- data/test/rake_test_support.rb +0 -298
- data/test/row_locking.rb +0 -102
- data/test/schema_dump.rb +0 -182
- data/test/serialize.rb +0 -275
- data/test/shared_helper.rb +0 -35
- data/test/simple.rb +0 -1317
- data/test/sybase_jtds_simple_test.rb +0 -28
- data/test/sybase_reset_column_information_test.rb +0 -6
- data/test/test_helper.rb +0 -304
- data/test/transaction.rb +0 -109
data/test/has_many_through.rb
DELETED
@@ -1,61 +0,0 @@
|
|
1
|
-
require 'models/rights_and_roles'
|
2
|
-
|
3
|
-
module HasManyThroughMethods
|
4
|
-
|
5
|
-
def setup
|
6
|
-
CreateRightsAndRoles.up
|
7
|
-
end
|
8
|
-
|
9
|
-
def teardown
|
10
|
-
CreateRightsAndRoles.down
|
11
|
-
end
|
12
|
-
|
13
|
-
def test_has_many_through
|
14
|
-
admin_role = Role.create! :name => "Administrator",
|
15
|
-
:description => "super user - access to right and role management"
|
16
|
-
|
17
|
-
assert_equal(0, admin_role.rights.sum(:hours))
|
18
|
-
|
19
|
-
role_rights = Right.create :name => "Administrator - Full Access To Roles",
|
20
|
-
:actions => "*", :controller_name => "Admin::RolesController", :hours => 0
|
21
|
-
right_rights = Right.create :name => "Administrator - Full Access To Rights",
|
22
|
-
:actions => "*", :controller_name => "Admin::RightsController", :hours => 1.5
|
23
|
-
|
24
|
-
admin_role.rights << role_rights
|
25
|
-
admin_role.rights << right_rights
|
26
|
-
admin_role.save!
|
27
|
-
|
28
|
-
assert_equal(1.5, admin_role.rights.sum(:hours))
|
29
|
-
|
30
|
-
rights_only_role = Role.create! :name => "Rights Manager",
|
31
|
-
:description => "access to rights management"
|
32
|
-
rights_only_role.rights << right_rights
|
33
|
-
rights_only_role.save!
|
34
|
-
rights_only_role.reload
|
35
|
-
|
36
|
-
assert admin_role.has_right?(right_rights)
|
37
|
-
assert rights_only_role.has_right?(right_rights)
|
38
|
-
assert admin_role.reload.has_right?(role_rights)
|
39
|
-
assert ! rights_only_role.has_right?(role_rights)
|
40
|
-
end
|
41
|
-
|
42
|
-
def test_has_many_select_rows_with_relation
|
43
|
-
role = Role.create! :name => "main", :description => "main role"
|
44
|
-
Role.create! :name => "user", :description => "user role"
|
45
|
-
|
46
|
-
Right.create! :name => "r0", :hours => 0
|
47
|
-
r1 = Right.create! :name => "r1", :hours => 1
|
48
|
-
r2 = Right.create! :name => "r2", :hours => 2
|
49
|
-
Right.create! :name => "r3", :hours => 3
|
50
|
-
|
51
|
-
role.permission_groups.create! :right => r1.reload
|
52
|
-
role.permission_groups.create! :right => r2.reload
|
53
|
-
|
54
|
-
connection = ActiveRecord::Base.connection
|
55
|
-
groups = role.reload.permission_groups.select('right_id')
|
56
|
-
|
57
|
-
pend 'todo: is this really supposed to work ?!' if ar_version('4.0')
|
58
|
-
assert_equal [ [ r1.id ], [ r2.id ] ], connection.select_rows(groups)
|
59
|
-
end if Test::Unit::TestCase.ar_version('3.0')
|
60
|
-
|
61
|
-
end
|
@@ -1,48 +0,0 @@
|
|
1
|
-
# -*- coding: utf-8 -*-
|
2
|
-
#
|
3
|
-
# To run this script, run the following:
|
4
|
-
#
|
5
|
-
# CREATE DATABASE weblog_development;
|
6
|
-
#
|
7
|
-
# TODO: Finish the explanation.
|
8
|
-
|
9
|
-
require 'jdbc_common'
|
10
|
-
require 'db/informix'
|
11
|
-
|
12
|
-
class InformixSimpleTest < Test::Unit::TestCase
|
13
|
-
include SimpleTestMethods
|
14
|
-
|
15
|
-
# Informix does not like "= NULL".
|
16
|
-
def test_equals_null
|
17
|
-
Entry.create!(:title => "Foo")
|
18
|
-
entry = Entry.find(:first, :conditions => ["content = NULL"])
|
19
|
-
assert_equal "Foo", entry.title
|
20
|
-
end
|
21
|
-
|
22
|
-
# Informix does not like "!= NULL" or "<> NULL".
|
23
|
-
def test_not_equals_null
|
24
|
-
Entry.create!(:title => "Foo", :content => "Bar")
|
25
|
-
entry = Entry.find_by_title("Foo", :conditions => ["content != NULL"])
|
26
|
-
assert_equal "Foo", entry.title
|
27
|
-
entry = Entry.find_by_title("Foo", :conditions => ["content <> NULL"])
|
28
|
-
assert_equal "Foo", entry.title
|
29
|
-
end
|
30
|
-
end
|
31
|
-
|
32
|
-
class InformixMultibyteTest < Test::Unit::TestCase
|
33
|
-
include MultibyteTestMethods
|
34
|
-
|
35
|
-
# Overriding the included test since we can't create text fields via a
|
36
|
-
# simple insert in Informix.
|
37
|
-
def test_select_multibyte_string
|
38
|
-
Entry.create!(:title => 'テスト', :content => '本文')
|
39
|
-
entry = Entry.first
|
40
|
-
assert_equal "テスト", entry.title
|
41
|
-
assert_equal "本文", entry.content
|
42
|
-
assert_equal entry, Entry.find_by_title("テスト")
|
43
|
-
end
|
44
|
-
end
|
45
|
-
|
46
|
-
class InformixHasManyThroughTest < Test::Unit::TestCase
|
47
|
-
include HasManyThroughMethods
|
48
|
-
end
|
data/test/jdbc/db2.rb
DELETED
@@ -1,36 +0,0 @@
|
|
1
|
-
module Jdbc
|
2
|
-
module DB2
|
3
|
-
def self.driver_jar
|
4
|
-
if const_defined?(:VERSION)
|
5
|
-
"db2jcc-#{VERSION}.jar"
|
6
|
-
else
|
7
|
-
"db2jcc4.jar"
|
8
|
-
end
|
9
|
-
end
|
10
|
-
|
11
|
-
def self.load_driver(method = :load)
|
12
|
-
send method, driver_jar
|
13
|
-
end
|
14
|
-
|
15
|
-
def self.driver_name
|
16
|
-
'com.ibm.db2.jcc.DB2Driver' # ArJdbc::DB2::DRIVER_NAME
|
17
|
-
end
|
18
|
-
end
|
19
|
-
module AS400
|
20
|
-
def self.driver_jar
|
21
|
-
"jt400.jar"
|
22
|
-
end
|
23
|
-
|
24
|
-
def self.load_driver(method = :load)
|
25
|
-
send method, driver_jar
|
26
|
-
end
|
27
|
-
|
28
|
-
def self.driver_name
|
29
|
-
'com.ibm.as400.access.AS400JDBCDriver' # ArJdbc::AS400::DRIVER_NAME
|
30
|
-
end
|
31
|
-
end
|
32
|
-
end
|
33
|
-
|
34
|
-
# NOTE: just put the db2jcc4.jar into the test/jars directory ...
|
35
|
-
jars = File.expand_path('../jars', File.dirname(__FILE__))
|
36
|
-
$LOAD_PATH << jars unless $LOAD_PATH.include?(jars)
|
data/test/jdbc/oracle.rb
DELETED
@@ -1,34 +0,0 @@
|
|
1
|
-
module Jdbc
|
2
|
-
module Oracle
|
3
|
-
def self.driver_jar
|
4
|
-
if const_defined?(:VERSION)
|
5
|
-
"ojdbc-#{VERSION}.jar"
|
6
|
-
else
|
7
|
-
"ojdbc6.jar"
|
8
|
-
end
|
9
|
-
end
|
10
|
-
|
11
|
-
def self.optional_jars
|
12
|
-
[ 'xdb6.jar', 'orai18n.jar' ] # 'xmlparserv2.jar'
|
13
|
-
end
|
14
|
-
|
15
|
-
def self.load_driver(method = :load)
|
16
|
-
send method, driver_jar
|
17
|
-
optional_jars.each do |optional_jar|
|
18
|
-
begin
|
19
|
-
send method, optional_jar
|
20
|
-
rescue LoadError => e
|
21
|
-
puts "failed to load optional driver jar: #{optional_jar} (#{e})"
|
22
|
-
end
|
23
|
-
end
|
24
|
-
end
|
25
|
-
|
26
|
-
def self.driver_name
|
27
|
-
'oracle.jdbc.driver.OracleDriver'
|
28
|
-
end
|
29
|
-
end
|
30
|
-
end
|
31
|
-
|
32
|
-
# NOTE: just put the ojdbc6.jar into the test/jars directory ...
|
33
|
-
jars = File.expand_path('../jars', File.dirname(__FILE__))
|
34
|
-
$LOAD_PATH << jars unless $LOAD_PATH.include?(jars)
|
data/test/jdbc_column_test.rb
DELETED
@@ -1,23 +0,0 @@
|
|
1
|
-
require 'test_helper'
|
2
|
-
|
3
|
-
require 'arjdbc/jdbc'
|
4
|
-
|
5
|
-
require 'arjdbc/mysql'
|
6
|
-
require 'arjdbc/postgresql'
|
7
|
-
require 'arjdbc/sqlite3'
|
8
|
-
|
9
|
-
class JdbcColumnTest < Test::Unit::TestCase
|
10
|
-
|
11
|
-
test 'modules' do
|
12
|
-
assert_include ArJdbc.modules, ArJdbc::MySQL
|
13
|
-
assert_include ArJdbc.modules, ArJdbc::PostgreSQL
|
14
|
-
assert_include ArJdbc.modules, ArJdbc::SQLite3
|
15
|
-
end
|
16
|
-
|
17
|
-
test 'column types' do
|
18
|
-
types = ActiveRecord::ConnectionAdapters::JdbcColumn.column_types
|
19
|
-
assert_kind_of Proc, types[ /mysql/i ]
|
20
|
-
assert_kind_of Proc, types[ /sqlite/i ]
|
21
|
-
end
|
22
|
-
|
23
|
-
end
|
data/test/jdbc_common.rb
DELETED
@@ -1,16 +0,0 @@
|
|
1
|
-
# Simple method to reduce the boilerplate
|
2
|
-
|
3
|
-
require 'test_helper'
|
4
|
-
|
5
|
-
require 'models/auto_id'
|
6
|
-
require 'models/entry'
|
7
|
-
require 'models/data_types'
|
8
|
-
require 'models/add_not_null_column_to_table'
|
9
|
-
require 'models/validates_uniqueness_of_string'
|
10
|
-
require 'models/string_id'
|
11
|
-
require 'models/thing'
|
12
|
-
require 'models/custom_pk_name'
|
13
|
-
|
14
|
-
require 'simple'
|
15
|
-
require 'has_many_through'
|
16
|
-
require 'row_locking'
|
@@ -1,196 +0,0 @@
|
|
1
|
-
require 'jdbc_common'
|
2
|
-
require 'db/jdbc'
|
3
|
-
|
4
|
-
class JdbcConnectionTest < Test::Unit::TestCase
|
5
|
-
|
6
|
-
def test_connection_available_through_jdbc_adapter
|
7
|
-
ActiveRecord::Base.connection.execute("show databases") # MySQL
|
8
|
-
assert ActiveRecord::Base.connected?
|
9
|
-
end
|
10
|
-
|
11
|
-
test 'configures driver/connection properties' do
|
12
|
-
config = JDBC_CONFIG.dup
|
13
|
-
config[:properties] = {
|
14
|
-
'autoDeserialize' => true,
|
15
|
-
'maxAllowedPacket' => 128,
|
16
|
-
'metadataCacheSize' => '5'
|
17
|
-
}
|
18
|
-
ActiveRecord::Base.remove_connection
|
19
|
-
begin
|
20
|
-
ActiveRecord::Base.establish_connection config
|
21
|
-
connection = ActiveRecord::Base.connection.jdbc_connection
|
22
|
-
# assuming MySQL internals :
|
23
|
-
assert_equal 'true', connection.getProperties['autoDeserialize']
|
24
|
-
assert_equal '128', connection.getProperties['maxAllowedPacket']
|
25
|
-
assert_equal '5', connection.getProperties['metadataCacheSize']
|
26
|
-
ensure
|
27
|
-
ActiveRecord::Base.establish_connection JDBC_CONFIG
|
28
|
-
end
|
29
|
-
end
|
30
|
-
|
31
|
-
test 'driver runtime errors do not get swallowed' do
|
32
|
-
config = JDBC_CONFIG.dup
|
33
|
-
config[:properties] = Java::JavaUtil::Properties.new
|
34
|
-
config[:properties]['invalid_property'] = java.lang.Object.new
|
35
|
-
ActiveRecord::Base.remove_connection
|
36
|
-
begin
|
37
|
-
ActiveRecord::Base.establish_connection config
|
38
|
-
ActiveRecord::Base.connection.jdbc_connection
|
39
|
-
fail "exception not thrown"
|
40
|
-
rescue Java::JavaLang::NullPointerException # OK :
|
41
|
-
# java.util.Hashtable.put(Hashtable.java:394)
|
42
|
-
# java.util.Properties.setProperty(Properties.java:143)
|
43
|
-
# com.mysql.jdbc.NonRegisteringDriver.parseURL(NonRegisteringDriver.java:849)
|
44
|
-
# com.mysql.jdbc.NonRegisteringDriver.connect(NonRegisteringDriver.java:325)
|
45
|
-
ensure
|
46
|
-
ActiveRecord::Base.establish_connection JDBC_CONFIG
|
47
|
-
end
|
48
|
-
end
|
49
|
-
|
50
|
-
test 'calls configure_connection on reconnect!' do
|
51
|
-
connection = ActiveRecord::Base.connection
|
52
|
-
unless connection.respond_to?(:configure_connection)
|
53
|
-
fail "no configure_connection for #{connection} can not test"
|
54
|
-
end
|
55
|
-
ActiveRecord::Base.connection.disconnect!
|
56
|
-
ActiveRecord::Base.connection.expects(:configure_connection).once
|
57
|
-
ActiveRecord::Base.connection.reconnect!
|
58
|
-
end
|
59
|
-
|
60
|
-
class MockDriver < ActiveRecord::ConnectionAdapters::JdbcDriver
|
61
|
-
|
62
|
-
class DriverImpl
|
63
|
-
include Java::JavaSql::Driver
|
64
|
-
|
65
|
-
def connect(url, info)
|
66
|
-
if url =~ /invalid_authorization_spec/i
|
67
|
-
raise Java::JavaSql::SQLInvalidAuthorizationSpecException.new
|
68
|
-
else
|
69
|
-
reason = "#{url} connect with #{info.inspect} failed"
|
70
|
-
raise Java::JavaSql::SQLException.new(reason, '42000', 1042)
|
71
|
-
end
|
72
|
-
end
|
73
|
-
|
74
|
-
end
|
75
|
-
|
76
|
-
def driver_class; DriverImpl; end
|
77
|
-
|
78
|
-
end
|
79
|
-
|
80
|
-
test 'driver sql exceptions are wrapped into jdbc errors' do
|
81
|
-
config = JDBC_CONFIG.dup
|
82
|
-
config[:driver_instance] = MockDriver.new('MockDriver')
|
83
|
-
ActiveRecord::Base.remove_connection
|
84
|
-
begin
|
85
|
-
ActiveRecord::Base.establish_connection config
|
86
|
-
ActiveRecord::Base.connection.jdbc_connection
|
87
|
-
fail "jdbc error not thrown"
|
88
|
-
rescue ActiveRecord::JDBCError => e
|
89
|
-
assert_match /connect with {"user"=>"arjdbc", "password"=>"arjdbc"} failed/, e.to_s
|
90
|
-
assert_equal 1042, e.errno
|
91
|
-
assert_kind_of Java::JavaSql::SQLException, e.sql_exception
|
92
|
-
ensure
|
93
|
-
ActiveRecord::Base.establish_connection JDBC_CONFIG
|
94
|
-
end
|
95
|
-
end
|
96
|
-
|
97
|
-
test 'driver sql exceptions without message and sql state' do
|
98
|
-
config = JDBC_CONFIG.dup
|
99
|
-
config[:url] = 'jdbc:mysql://127.0.0.1:1234/invalid_authorization_spec'
|
100
|
-
config[:driver_instance] = MockDriver.new('MockDriver')
|
101
|
-
ActiveRecord::Base.remove_connection
|
102
|
-
begin
|
103
|
-
ActiveRecord::Base.establish_connection config
|
104
|
-
ActiveRecord::Base.connection.jdbc_connection
|
105
|
-
fail "jdbc error not thrown"
|
106
|
-
rescue ActiveRecord::JDBCError => e
|
107
|
-
assert_match /java.sql.SQLInvalidAuthorizationSpecException/, e.to_s
|
108
|
-
assert_kind_of Java::JavaSql::SQLNonTransientException, e.sql_exception
|
109
|
-
ensure
|
110
|
-
ActiveRecord::Base.establish_connection JDBC_CONFIG
|
111
|
-
end
|
112
|
-
end
|
113
|
-
|
114
|
-
context 'configuration' do
|
115
|
-
|
116
|
-
test 'connection url' do
|
117
|
-
adapter = ActiveRecord::Base.connection
|
118
|
-
connection = adapter.raw_connection # JdbcConnection
|
119
|
-
connection.config = { :url => "jdbc://somehost", :options => { :hoge => "true", :fuya => "false" } }
|
120
|
-
assert_equal "jdbc://somehost?hoge=true&fuya=false", connection.send(:jdbc_url)
|
121
|
-
|
122
|
-
connection.config = { :url => "jdbc://somehost?param=0", :options => { :hoge => "true", :fuya => false } }
|
123
|
-
assert_equal "jdbc://somehost?param=0&hoge=true&fuya=false", connection.send(:jdbc_url)
|
124
|
-
end
|
125
|
-
|
126
|
-
test 'connection fails without driver and url' do
|
127
|
-
with_connection_removed do
|
128
|
-
ActiveRecord::Base.establish_connection :adapter => 'jdbc'
|
129
|
-
assert_raise ActiveRecord::ConnectionNotEstablished do
|
130
|
-
ActiveRecord::Base.connection
|
131
|
-
end
|
132
|
-
end
|
133
|
-
end
|
134
|
-
|
135
|
-
test 'connection fails without driver' do
|
136
|
-
with_connection_removed do
|
137
|
-
ActiveRecord::Base.establish_connection :adapter => 'jdbc', :url => 'jdbc:derby:test.derby;create=true'
|
138
|
-
assert_raise ActiveRecord::ConnectionNotEstablished do
|
139
|
-
ActiveRecord::Base.connection
|
140
|
-
end
|
141
|
-
end
|
142
|
-
end
|
143
|
-
|
144
|
-
test 'connection does not fail with driver_instance and url' do
|
145
|
-
load_derby_driver
|
146
|
-
with_connection_removed do
|
147
|
-
driver_instance = ActiveRecord::ConnectionAdapters::JdbcDriver.new('org.apache.derby.jdbc.EmbeddedDriver')
|
148
|
-
ActiveRecord::Base.establish_connection :adapter => 'jdbc',
|
149
|
-
:url => 'jdbc:derby:memory:TestDB;create=true', :driver_instance => driver_instance
|
150
|
-
assert_nothing_raised do
|
151
|
-
ActiveRecord::Base.connection
|
152
|
-
end
|
153
|
-
|
154
|
-
assert ActiveRecord::Base.connected?
|
155
|
-
assert_nothing_raised do
|
156
|
-
connection = ActiveRecord::Base.connection
|
157
|
-
connection.execute("create table my_table(x int)")
|
158
|
-
#connection.execute("insert into my_table values 42")
|
159
|
-
#connection.execute("select * from my_table")
|
160
|
-
end
|
161
|
-
end
|
162
|
-
end
|
163
|
-
|
164
|
-
test 'configures driver instance' do
|
165
|
-
load_derby_driver
|
166
|
-
with_connection_removed do
|
167
|
-
ActiveRecord::Base.establish_connection :adapter => 'jdbc',
|
168
|
-
:url => 'jdbc:derby:memory:TestDB;create=true', :driver => 'org.apache.derby.jdbc.EmbeddedDriver'
|
169
|
-
assert_nothing_raised do
|
170
|
-
ActiveRecord::Base.connection
|
171
|
-
end
|
172
|
-
assert config = ActiveRecord::Base.connection.config
|
173
|
-
assert_instance_of ActiveRecord::ConnectionAdapters::JdbcDriver, config[:driver_instance]
|
174
|
-
assert_equal 'org.apache.derby.jdbc.EmbeddedDriver', config[:driver_instance].name
|
175
|
-
end
|
176
|
-
end
|
177
|
-
|
178
|
-
private
|
179
|
-
|
180
|
-
def with_connection_removed
|
181
|
-
connection = ActiveRecord::Base.remove_connection
|
182
|
-
begin
|
183
|
-
yield
|
184
|
-
ensure
|
185
|
-
ActiveRecord::Base.establish_connection connection
|
186
|
-
end
|
187
|
-
end
|
188
|
-
|
189
|
-
def load_derby_driver
|
190
|
-
require 'jdbc/derby'
|
191
|
-
Jdbc::Derby.load_driver(:require)
|
192
|
-
end
|
193
|
-
|
194
|
-
end
|
195
|
-
|
196
|
-
end
|
data/test/jndi_callbacks_test.rb
DELETED
@@ -1,33 +0,0 @@
|
|
1
|
-
require 'test_helper'
|
2
|
-
require 'db/jndi_config'
|
3
|
-
|
4
|
-
class JndiConnectionPoolCallbacksTest < Test::Unit::TestCase
|
5
|
-
|
6
|
-
class Dummy < ActiveRecord::Base; end
|
7
|
-
|
8
|
-
setup do
|
9
|
-
Dummy.establish_connection JNDI_CONFIG.dup
|
10
|
-
end
|
11
|
-
|
12
|
-
teardown do
|
13
|
-
Dummy.remove_connection
|
14
|
-
end
|
15
|
-
|
16
|
-
test 'calls hooks on checkout and checkin' do
|
17
|
-
connection = Dummy.connection_pool.checkout
|
18
|
-
assert_true connection.active?
|
19
|
-
|
20
|
-
# connection = Dummy.connection
|
21
|
-
Dummy.connection_pool.checkin connection
|
22
|
-
assert_false connection.active?
|
23
|
-
|
24
|
-
pool = Dummy.connection_pool
|
25
|
-
assert_false pool.active_connection? if pool.respond_to?(:active_connection?)
|
26
|
-
assert_true pool.connection.active? # checks out
|
27
|
-
assert_true pool.active_connection? if pool.respond_to?(:active_connection?)
|
28
|
-
assert_true connection.active?
|
29
|
-
Dummy.connection_pool.disconnect!
|
30
|
-
assert_false connection.active?
|
31
|
-
end
|
32
|
-
|
33
|
-
end
|