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.
Files changed (282) hide show
  1. data/.gitignore +14 -8
  2. data/.travis.yml +40 -31
  3. data/.yardopts +4 -0
  4. data/Appraisals +2 -5
  5. data/CONTRIBUTING.md +46 -0
  6. data/Gemfile +21 -4
  7. data/Gemfile.lock +42 -17
  8. data/{History.txt → History.md} +142 -75
  9. data/README.md +102 -104
  10. data/RUNNING_TESTS.md +76 -0
  11. data/Rakefile.jdbc +20 -0
  12. data/activerecord-jdbc-adapter.gemspec +35 -18
  13. data/gemfiles/rails23.gemfile +4 -3
  14. data/gemfiles/rails23.gemfile.lock +9 -6
  15. data/gemfiles/rails30.gemfile +4 -3
  16. data/gemfiles/rails30.gemfile.lock +9 -6
  17. data/gemfiles/rails31.gemfile +4 -3
  18. data/gemfiles/rails31.gemfile.lock +9 -6
  19. data/gemfiles/rails32.gemfile +4 -3
  20. data/gemfiles/rails32.gemfile.lock +17 -14
  21. data/gemfiles/rails40.gemfile +5 -5
  22. data/gemfiles/rails40.gemfile.lock +17 -69
  23. data/lib/active_record/connection_adapters/firebird_adapter.rb +1 -0
  24. data/lib/active_record/connection_adapters/sqlserver_adapter.rb +1 -0
  25. data/lib/arel/visitors/compat.rb +22 -3
  26. data/lib/arel/visitors/db2.rb +8 -4
  27. data/lib/arel/visitors/derby.rb +14 -13
  28. data/lib/arel/visitors/firebird.rb +5 -4
  29. data/lib/arel/visitors/hsqldb.rb +11 -9
  30. data/lib/arel/visitors/sql_server.rb +89 -61
  31. data/lib/arjdbc.rb +1 -1
  32. data/lib/arjdbc/db2/adapter.rb +181 -212
  33. data/lib/arjdbc/db2/as400.rb +31 -18
  34. data/lib/arjdbc/db2/column.rb +167 -0
  35. data/lib/arjdbc/db2/connection_methods.rb +2 -0
  36. data/lib/arjdbc/derby/adapter.rb +206 -107
  37. data/lib/arjdbc/derby/connection_methods.rb +4 -9
  38. data/lib/arjdbc/firebird.rb +1 -0
  39. data/lib/arjdbc/firebird/adapter.rb +202 -64
  40. data/lib/arjdbc/firebird/connection_methods.rb +20 -0
  41. data/lib/arjdbc/h2/adapter.rb +56 -36
  42. data/lib/arjdbc/hsqldb/adapter.rb +99 -68
  43. data/lib/arjdbc/jdbc/adapter.rb +474 -265
  44. data/lib/arjdbc/jdbc/adapter_java.jar +0 -0
  45. data/lib/arjdbc/jdbc/adapter_require.rb +8 -7
  46. data/lib/arjdbc/jdbc/arel_support.rb +132 -0
  47. data/lib/arjdbc/jdbc/base_ext.rb +8 -7
  48. data/lib/arjdbc/jdbc/callbacks.rb +16 -10
  49. data/lib/arjdbc/jdbc/column.rb +25 -3
  50. data/lib/arjdbc/jdbc/connection.rb +28 -55
  51. data/lib/arjdbc/jdbc/extension.rb +14 -14
  52. data/lib/arjdbc/jdbc/java.rb +6 -3
  53. data/lib/arjdbc/jdbc/jdbc.rake +1 -1
  54. data/lib/arjdbc/jdbc/quoted_primary_key.rb +2 -2
  55. data/lib/arjdbc/jdbc/rake_tasks.rb +1 -1
  56. data/lib/arjdbc/jdbc/type_converter.rb +5 -2
  57. data/lib/arjdbc/mssql/adapter.rb +160 -280
  58. data/lib/arjdbc/mssql/column.rb +182 -0
  59. data/lib/arjdbc/mssql/connection_methods.rb +37 -4
  60. data/lib/arjdbc/mssql/explain_support.rb +13 -21
  61. data/lib/arjdbc/mssql/limit_helpers.rb +79 -42
  62. data/lib/arjdbc/mssql/lock_methods.rb +77 -0
  63. data/lib/arjdbc/mssql/utils.rb +11 -11
  64. data/lib/arjdbc/mysql/adapter.rb +165 -247
  65. data/lib/arjdbc/mysql/column.rb +123 -0
  66. data/lib/arjdbc/mysql/connection_methods.rb +3 -6
  67. data/lib/arjdbc/oracle/adapter.rb +282 -288
  68. data/lib/arjdbc/oracle/column.rb +122 -0
  69. data/lib/arjdbc/oracle/connection_methods.rb +3 -0
  70. data/lib/arjdbc/postgresql/adapter.rb +336 -574
  71. data/lib/arjdbc/postgresql/column.rb +458 -0
  72. data/lib/arjdbc/postgresql/connection_methods.rb +1 -2
  73. data/lib/arjdbc/postgresql/schema_creation.rb +38 -0
  74. data/lib/arjdbc/sqlite3/adapter.rb +189 -145
  75. data/lib/arjdbc/sqlite3/explain_support.rb +1 -1
  76. data/lib/arjdbc/tasks/oracle/enhanced_structure_dump.rb +8 -8
  77. data/lib/arjdbc/util/quoted_cache.rb +60 -0
  78. data/lib/arjdbc/util/table_copier.rb +110 -0
  79. data/lib/arjdbc/version.rb +6 -7
  80. data/pom.xml +56 -2
  81. data/rakelib/02-test.rake +72 -83
  82. data/rakelib/db.rake +29 -17
  83. data/src/java/arjdbc/ArJdbcModule.java +21 -18
  84. data/src/java/arjdbc/db2/DB2RubyJdbcConnection.java +84 -12
  85. data/src/java/arjdbc/derby/DerbyModule.java +140 -143
  86. data/src/java/arjdbc/derby/DerbyRubyJdbcConnection.java +58 -7
  87. data/src/java/arjdbc/h2/H2Module.java +43 -0
  88. data/src/java/arjdbc/informix/InformixRubyJdbcConnection.java +7 -6
  89. data/src/java/arjdbc/jdbc/RubyJdbcConnection.java +1223 -648
  90. data/src/java/arjdbc/mssql/MSSQLRubyJdbcConnection.java +24 -23
  91. data/src/java/arjdbc/mysql/MySQLModule.java +33 -32
  92. data/src/java/arjdbc/mysql/MySQLRubyJdbcConnection.java +147 -30
  93. data/src/java/arjdbc/oracle/OracleModule.java +13 -13
  94. data/src/java/arjdbc/oracle/OracleRubyJdbcConnection.java +114 -6
  95. data/src/java/arjdbc/postgresql/PostgreSQLRubyJdbcConnection.java +166 -36
  96. data/src/java/arjdbc/sqlite3/SQLite3RubyJdbcConnection.java +101 -19
  97. data/src/java/arjdbc/util/QuotingUtils.java +19 -19
  98. metadata +240 -394
  99. data/bench/bench_attributes.rb +0 -13
  100. data/bench/bench_attributes_new.rb +0 -14
  101. data/bench/bench_create.rb +0 -12
  102. data/bench/bench_find_all.rb +0 -12
  103. data/bench/bench_find_all_mt.rb +0 -25
  104. data/bench/bench_model.rb +0 -85
  105. data/bench/bench_new.rb +0 -12
  106. data/bench/bench_new_valid.rb +0 -12
  107. data/bench/bench_valid.rb +0 -13
  108. data/lib/arel/engines/sql/compilers/db2_compiler.rb +0 -9
  109. data/lib/arel/engines/sql/compilers/derby_compiler.rb +0 -6
  110. data/lib/arel/engines/sql/compilers/h2_compiler.rb +0 -6
  111. data/lib/arel/engines/sql/compilers/hsqldb_compiler.rb +0 -15
  112. data/lib/arel/engines/sql/compilers/jdbc_compiler.rb +0 -6
  113. data/lib/arel/engines/sql/compilers/mssql_compiler.rb +0 -46
  114. data/lib/arjdbc/jdbc/missing_functionality_helper.rb +0 -98
  115. data/lib/arjdbc/mssql/lock_helpers.rb +0 -76
  116. data/lib/arjdbc/mssql/tsql_methods.rb +0 -58
  117. data/lib/arjdbc/postgresql/column_cast.rb +0 -134
  118. data/test/activerecord/connections/native_jdbc_mysql/connection.rb +0 -25
  119. data/test/activerecord/jall.sh +0 -7
  120. data/test/activerecord/jtest.sh +0 -3
  121. data/test/assets/flowers.jpg +0 -0
  122. data/test/binary.rb +0 -67
  123. data/test/db/db2.rb +0 -43
  124. data/test/db/db2/binary_test.rb +0 -6
  125. data/test/db/db2/has_many_through_test.rb +0 -6
  126. data/test/db/db2/rake_test.rb +0 -82
  127. data/test/db/db2/rake_test_data.sql +0 -35
  128. data/test/db/db2/reset_column_information_test.rb +0 -5
  129. data/test/db/db2/serialize_test.rb +0 -6
  130. data/test/db/db2/simple_test.rb +0 -81
  131. data/test/db/db2/test_helper.rb +0 -6
  132. data/test/db/db2/unit_test.rb +0 -73
  133. data/test/db/derby.rb +0 -12
  134. data/test/db/derby/binary_test.rb +0 -6
  135. data/test/db/derby/migration_test.rb +0 -74
  136. data/test/db/derby/rake_test.rb +0 -96
  137. data/test/db/derby/reset_column_information_test.rb +0 -6
  138. data/test/db/derby/row_locking_test.rb +0 -20
  139. data/test/db/derby/schema_dump_test.rb +0 -5
  140. data/test/db/derby/serialize_test.rb +0 -6
  141. data/test/db/derby/simple_test.rb +0 -173
  142. data/test/db/derby/test_helper.rb +0 -6
  143. data/test/db/derby/unit_test.rb +0 -32
  144. data/test/db/derby/xml_column_test.rb +0 -17
  145. data/test/db/h2.rb +0 -11
  146. data/test/db/h2/binary_test.rb +0 -6
  147. data/test/db/h2/change_column_test.rb +0 -68
  148. data/test/db/h2/identity_column_test.rb +0 -35
  149. data/test/db/h2/offset_test.rb +0 -49
  150. data/test/db/h2/rake_test.rb +0 -98
  151. data/test/db/h2/schema_dump_test.rb +0 -29
  152. data/test/db/h2/serialize_test.rb +0 -6
  153. data/test/db/h2/simple_test.rb +0 -56
  154. data/test/db/hsqldb.rb +0 -11
  155. data/test/db/hsqldb/binary_test.rb +0 -6
  156. data/test/db/hsqldb/rake_test.rb +0 -101
  157. data/test/db/hsqldb/schema_dump_test.rb +0 -19
  158. data/test/db/hsqldb/serialize_test.rb +0 -6
  159. data/test/db/hsqldb/simple_test.rb +0 -17
  160. data/test/db/informix.rb +0 -13
  161. data/test/db/jdbc.rb +0 -16
  162. data/test/db/jdbc_derby.rb +0 -14
  163. data/test/db/jdbc_h2.rb +0 -17
  164. data/test/db/jdbc_mysql.rb +0 -13
  165. data/test/db/jdbc_postgres.rb +0 -23
  166. data/test/db/jndi_config.rb +0 -32
  167. data/test/db/jndi_pooled_config.rb +0 -32
  168. data/test/db/mssql.rb +0 -11
  169. data/test/db/mssql/binary_test.rb +0 -6
  170. data/test/db/mssql/exec_proc_test.rb +0 -46
  171. data/test/db/mssql/identity_insert_test.rb +0 -18
  172. data/test/db/mssql/ignore_system_views_test.rb +0 -40
  173. data/test/db/mssql/limit_offset_test.rb +0 -190
  174. data/test/db/mssql/multibyte_test.rb +0 -16
  175. data/test/db/mssql/multiple_connections_test.rb +0 -71
  176. data/test/db/mssql/rake_test.rb +0 -143
  177. data/test/db/mssql/reset_column_information_test.rb +0 -6
  178. data/test/db/mssql/row_locking_test.rb +0 -7
  179. data/test/db/mssql/serialize_test.rb +0 -6
  180. data/test/db/mssql/simple_test.rb +0 -140
  181. data/test/db/mssql/transaction_test.rb +0 -6
  182. data/test/db/mssql/types_test.rb +0 -205
  183. data/test/db/mssql/unit_test.rb +0 -249
  184. data/test/db/mysql.rb +0 -4
  185. data/test/db/mysql/_rails_test_mysql.32.out +0 -6585
  186. data/test/db/mysql/binary_test.rb +0 -6
  187. data/test/db/mysql/connection_test.rb +0 -51
  188. data/test/db/mysql/index_length_test.rb +0 -58
  189. data/test/db/mysql/multibyte_test.rb +0 -10
  190. data/test/db/mysql/nonstandard_primary_key_test.rb +0 -39
  191. data/test/db/mysql/rake_test.rb +0 -97
  192. data/test/db/mysql/reset_column_information_test.rb +0 -6
  193. data/test/db/mysql/schema_dump_test.rb +0 -228
  194. data/test/db/mysql/serialize_test.rb +0 -6
  195. data/test/db/mysql/simple_test.rb +0 -187
  196. data/test/db/mysql/statement_escaping_test.rb +0 -46
  197. data/test/db/mysql/transaction_test.rb +0 -6
  198. data/test/db/mysql/types_test.rb +0 -30
  199. data/test/db/mysql/unit_test.rb +0 -93
  200. data/test/db/mysql_config.rb +0 -7
  201. data/test/db/oracle.rb +0 -27
  202. data/test/db/oracle/binary_test.rb +0 -6
  203. data/test/db/oracle/limit_test.rb +0 -24
  204. data/test/db/oracle/multibyte_test.rb +0 -22
  205. data/test/db/oracle/rake_test.rb +0 -100
  206. data/test/db/oracle/reset_column_information_test.rb +0 -6
  207. data/test/db/oracle/serialize_test.rb +0 -6
  208. data/test/db/oracle/simple_test.rb +0 -140
  209. data/test/db/oracle/specific_test.rb +0 -180
  210. data/test/db/oracle/transaction_test.rb +0 -31
  211. data/test/db/oracle/unit_test.rb +0 -31
  212. data/test/db/postgres.rb +0 -11
  213. data/test/db/postgres/_rails_test_postgres.32.out +0 -6405
  214. data/test/db/postgres/a_custom_primary_key_test.rb +0 -50
  215. data/test/db/postgres/active_schema_unit_test.rb +0 -68
  216. data/test/db/postgres/array_type_test.rb +0 -101
  217. data/test/db/postgres/binary_test.rb +0 -6
  218. data/test/db/postgres/connection_test.rb +0 -63
  219. data/test/db/postgres/data_types_test.rb +0 -703
  220. data/test/db/postgres/hstore_test.rb +0 -200
  221. data/test/db/postgres/information_schema_leak_test.rb +0 -30
  222. data/test/db/postgres/json_test.rb +0 -86
  223. data/test/db/postgres/ltree_test.rb +0 -51
  224. data/test/db/postgres/mixed_case_test.rb +0 -29
  225. data/test/db/postgres/native_types_test.rb +0 -124
  226. data/test/db/postgres/rake_test.rb +0 -117
  227. data/test/db/postgres/reserved_test.rb +0 -22
  228. data/test/db/postgres/reset_column_information_test.rb +0 -6
  229. data/test/db/postgres/row_locking_test.rb +0 -21
  230. data/test/db/postgres/schema_dump_test.rb +0 -95
  231. data/test/db/postgres/schema_test.rb +0 -115
  232. data/test/db/postgres/simple_test.rb +0 -260
  233. data/test/db/postgres/table_alias_length_test.rb +0 -16
  234. data/test/db/postgres/transaction_test.rb +0 -6
  235. data/test/db/postgres/unit_test.rb +0 -31
  236. data/test/db/postgres_config.rb +0 -10
  237. data/test/db/sqlite3.rb +0 -6
  238. data/test/db/sqlite3/_rails_test_sqlite3.32.out +0 -6274
  239. data/test/db/sqlite3/has_many_though_test.rb +0 -6
  240. data/test/db/sqlite3/rake_test.rb +0 -71
  241. data/test/db/sqlite3/reset_column_information_test.rb +0 -6
  242. data/test/db/sqlite3/schema_dump_test.rb +0 -6
  243. data/test/db/sqlite3/serialize_test.rb +0 -6
  244. data/test/db/sqlite3/simple_test.rb +0 -268
  245. data/test/db/sqlite3/transaction_test.rb +0 -32
  246. data/test/db/sqlite3/type_conversion_test.rb +0 -104
  247. data/test/has_many_through.rb +0 -61
  248. data/test/informix_simple_test.rb +0 -48
  249. data/test/jdbc/db2.rb +0 -36
  250. data/test/jdbc/oracle.rb +0 -34
  251. data/test/jdbc_column_test.rb +0 -23
  252. data/test/jdbc_common.rb +0 -16
  253. data/test/jdbc_connection_test.rb +0 -196
  254. data/test/jndi_callbacks_test.rb +0 -33
  255. data/test/jndi_test.rb +0 -55
  256. data/test/manualTestDatabase.rb +0 -191
  257. data/test/models/add_not_null_column_to_table.rb +0 -9
  258. data/test/models/auto_id.rb +0 -15
  259. data/test/models/binary.rb +0 -18
  260. data/test/models/custom_pk_name.rb +0 -15
  261. data/test/models/data_types.rb +0 -40
  262. data/test/models/entry.rb +0 -41
  263. data/test/models/mixed_case.rb +0 -22
  264. data/test/models/reserved_word.rb +0 -15
  265. data/test/models/rights_and_roles.rb +0 -57
  266. data/test/models/string_id.rb +0 -17
  267. data/test/models/thing.rb +0 -17
  268. data/test/models/topic.rb +0 -32
  269. data/test/models/validates_uniqueness_of_string.rb +0 -19
  270. data/test/rails/mysql.rb +0 -13
  271. data/test/rails/sqlite3/version.rb +0 -6
  272. data/test/rails_stub.rb +0 -31
  273. data/test/rake_test_support.rb +0 -298
  274. data/test/row_locking.rb +0 -102
  275. data/test/schema_dump.rb +0 -182
  276. data/test/serialize.rb +0 -275
  277. data/test/shared_helper.rb +0 -35
  278. data/test/simple.rb +0 -1317
  279. data/test/sybase_jtds_simple_test.rb +0 -28
  280. data/test/sybase_reset_column_information_test.rb +0 -6
  281. data/test/test_helper.rb +0 -304
  282. data/test/transaction.rb +0 -109
@@ -1,28 +0,0 @@
1
- require 'jdbc_common'
2
- require 'db/sybase_jtds'
3
-
4
- class SybaseJtdsSimpleTest < Test::Unit::TestCase
5
- include SimpleTestMethods
6
- end
7
-
8
- class SybaseAdapterSelectionTest < Test::Unit::TestCase
9
- class MockConnection
10
- def adapter=(adapt)
11
- end
12
- end
13
-
14
- def test_jtds_selection_using_dialect
15
- config = {
16
- :driver => 'net.sourceforge.jtds.Driver',
17
- :dialect => 'sybase'
18
- }
19
- adapt = JdbcAdapter.new(MockConnection.new, nil, config)
20
- assert adapt.kind_of?(ArJdbc::Sybase), "Should be a sybase adapter"
21
- end
22
-
23
- def test_jtds_selection_not_using_dialect
24
- config = { :driver => 'net.sourceforge.jtds.Driver' }
25
- adapt = JdbcAdapter.new(MockConnection.new, nil, config)
26
- assert adapt.kind_of?(ArJdbc::MsSQL), "Should be a MsSQL apdater"
27
- end
28
- end
@@ -1,6 +0,0 @@
1
- require 'jdbc_common'
2
- require 'db/sybase'
3
-
4
- class SybaseResetColumnInformationTest < Test::Unit::TestCase
5
- include ResetColumnInformationTestMethods
6
- end
data/test/test_helper.rb DELETED
@@ -1,304 +0,0 @@
1
- require 'stringio'
2
-
3
- begin
4
- require 'bundler'
5
- rescue LoadError => e
6
- require('rubygems') && retry
7
- raise e
8
- end
9
- Bundler.require(:default, :test)
10
-
11
- require 'test/unit'
12
- require 'test/unit/context'
13
- begin; require 'mocha/setup'; rescue LoadError; require 'mocha'; end
14
-
15
- require 'shared_helper'
16
-
17
- if ENV['COVERAGE']
18
- require 'simplecov'
19
- SimpleCov.start
20
- puts 'started simplecov'
21
- end
22
-
23
- require 'arjdbc' if defined?(JRUBY_VERSION)
24
-
25
- puts "Using ActiveRecord::VERSION = #{ActiveRecord::VERSION::STRING}"
26
-
27
- # we always set-up logger (some tests fail if ActiveRecord::Base.logger is nil),
28
- # but level is set to "warn" unless $DEBUG or ENV['DEBUG'] is set :
29
- require 'logger'
30
- ActiveRecord::Base.logger = Logger.new($stdout)
31
- ActiveRecord::Base.logger.level =
32
- if level = ENV['LOG_LEVEL']
33
- level.to_i.to_s == level ? level.to_i : Logger.const_get(level.upcase)
34
- elsif $DEBUG || ENV['DEBUG']
35
- Logger::DEBUG
36
- else
37
- Logger::WARN
38
- end
39
-
40
- begin
41
- require 'ruby-debug' if $DEBUG || ENV['DEBUG']
42
- rescue LoadError
43
- puts "ruby-debug missing thus won't be loaded"
44
- end
45
-
46
- # assert_queries and SQLCounter taken from rails active_record tests
47
- class Test::Unit::TestCase
48
-
49
- alias skip omit
50
-
51
- def self.ar_version(version)
52
- match = version.match(/(\d+)\.(\d+)(?:\.(\d+))?/)
53
- ActiveRecord::VERSION::MAJOR > match[1].to_i ||
54
- (ActiveRecord::VERSION::MAJOR == match[1].to_i &&
55
- ActiveRecord::VERSION::MINOR >= match[2].to_i)
56
- end
57
-
58
- def ar_version(version); self.class.ar_version(version); end
59
-
60
- def with_java_connection(config = nil)
61
- config ||= ActiveRecord::Base.connection.config
62
- jdbc_driver = ActiveRecord::ConnectionAdapters::JdbcDriver.new(config[:driver])
63
- begin
64
- java_connection = jdbc_driver.connection(config[:url], config[:username], config[:password])
65
- java_connection.setAutoCommit(true)
66
- yield(java_connection)
67
- ensure
68
- java_connection.close rescue nil
69
- end
70
- end
71
-
72
- def connection
73
- @connection ||= ActiveRecord::Base.connection
74
- end
75
-
76
- def schema_dump
77
- strio = StringIO.new
78
- ActiveRecord::SchemaDumper::dump(connection, strio)
79
- strio.string
80
- end
81
-
82
- def self.disable_logger(connection, &block)
83
- raise "need a block" unless block_given?
84
- return disable_connection_logger(connection, &block) if connection
85
- logger = ActiveRecord::Base.logger
86
- begin
87
- ActiveRecord::Base.logger = nil
88
- yield
89
- ensure
90
- ActiveRecord::Base.logger = logger
91
- end
92
- end
93
-
94
- def self.disable_connection_logger(connection)
95
- logger = connection.send(:instance_variable_get, :@logger)
96
- begin
97
- connection.send(:instance_variable_set, :@logger, nil)
98
- yield
99
- ensure
100
- connection.send(:instance_variable_set, :@logger, logger)
101
- end
102
- end
103
-
104
- def disable_logger(connection, &block)
105
- self.class.disable_logger(connection, &block)
106
- end
107
-
108
- def clear_active_connections!
109
- ActiveRecord::Base.clear_active_connections!
110
- end
111
-
112
- protected
113
-
114
- def assert_queries(count, matching = nil)
115
- if ActiveRecord::SQLCounter.enabled?
116
- log = ActiveRecord::SQLCounter.log = []
117
- begin
118
- yield
119
- ensure
120
- queries = queries = ( matching ? log.select { |s| s =~ matching } : log )
121
- assert_equal count, queries.size,
122
- "#{ queries.size } instead of #{ count } queries were executed." +
123
- "#{ queries.size == 0 ? '' : "\nQueries:\n#{queries.join("\n")}" }"
124
- end
125
- else
126
- warn "assert_queries skipped as SQLCounter is not enabled"
127
- yield
128
- end
129
- end
130
-
131
- # re-defined by Oracle
132
- def assert_empty_string value
133
- assert_equal '', value
134
- end
135
-
136
- # re-defined by Oracle
137
- def assert_null_text value
138
- assert_nil value
139
- end
140
-
141
- def assert_date_equal expected, actual
142
- actual = actual_in_expected_time_zone(expected, actual)
143
- actual = actual.to_date if actual.is_a?(Time)
144
- assert_equal(expected.nil? ? nil : expected.to_date, actual)
145
- end
146
-
147
- def assert_time_equal expected, actual
148
- actual = actual_in_expected_time_zone(expected, actual)
149
- [ :hour, :min, :sec ].each do |method|
150
- assert_equal expected.send(method), actual.send(method), "<#{expected}> but was <#{actual}> (differ at #{method.inspect})"
151
- end
152
- end
153
-
154
- def assert_datetime_equal expected, actual
155
- assert_date_equal expected, actual
156
- assert_time_equal expected, actual
157
- end
158
-
159
- def assert_timestamp_equal expected, actual
160
- e_utc = expected.utc; a_utc = actual.utc
161
- [ :year, :month, :day, :hour, :min, :sec ].each do |method|
162
- assert_equal e_utc.send(method), a_utc.send(method), "<#{expected}> but was <#{actual}> (differ at #{method.inspect})"
163
- end
164
- assert_equal e_utc.usec, a_utc.usec, "<#{expected}> but was <#{actual}> (differ at :usec)"
165
- # :usec Ruby Time precision: 123_456 (although JRuby only supports ms with Time.now) :
166
- #e_usec = ( e_utc.usec / 1000 ) * 1000
167
- #a_usec = ( a_utc.usec / 1000 ) * 1000
168
- #assert_equal e_usec, a_usec, "<#{expected}> but was <#{actual}> (differ at :usec / 1000)"
169
- end
170
-
171
- def assert_date_not_equal expected, actual
172
- actual = actual_in_expected_time_zone(expected, actual)
173
- actual = actual.to_date if actual.is_a?(Time)
174
- assert_not_equal(expected.nil? ? nil : expected.to_date, actual)
175
- end
176
-
177
- def assert_time_not_equal expected, actual, msg = nil
178
- actual = actual_in_expected_time_zone(expected, actual)
179
- equal = true
180
- [ :hour, :min, :sec ].each do |method|
181
- equal &&= ( expected.send(method) == actual.send(method) )
182
- end
183
- assert ! equal, msg || "<#{expected}> to not (time) equal to <#{actual}> but did"
184
- end
185
-
186
- def assert_datetime_not_equal expected, actual
187
- if date_equal?(expected, actual) && time_equal?(expected, actual)
188
- assert false, "<#{expected}> to not (datetime) equal to <#{actual}> but did"
189
- end
190
- end
191
-
192
- private
193
-
194
- def date_equal?(expected, actual)
195
- actual = actual_in_expected_time_zone(expected, actual)
196
- actual = actual.to_date if actual.is_a?(Time)
197
- (expected.nil? ? nil : expected.to_date) == actual
198
- end
199
-
200
- def time_equal?(expected, actual)
201
- actual = actual_in_expected_time_zone(expected, actual)
202
- equal = true; [ :hour, :min, :sec ].each do |method|
203
- equal &&= ( expected.send(method) == actual.send(method) )
204
- end
205
- equal
206
- end
207
-
208
- def actual_in_expected_time_zone(expected, actual)
209
- if actual.respond_to?(:in_time_zone)
210
- if expected.respond_to?(:time_zone)
211
- return actual.in_time_zone expected.time_zone
212
- end
213
- if expected.is_a?(Time) # due AR 2.3
214
- #expected = expected.in_time_zone
215
- #return actual.in_time_zone expected.time_zone
216
- return actual.in_time_zone ActiveSupport::TimeZone[expected.zone]
217
- end
218
- end
219
- actual
220
- end
221
-
222
- end
223
-
224
- module ActiveRecord
225
- class SQLCounter
226
-
227
- @@ignored_sql = [
228
- /^PRAGMA (?!(table_info))/,
229
- /^SELECT currval/,
230
- /^SELECT CAST/,
231
- /^SELECT @@IDENTITY/,
232
- /^SELECT @@ROWCOUNT/,
233
- /^SAVEPOINT/,
234
- /^ROLLBACK TO SAVEPOINT/,
235
- /^RELEASE SAVEPOINT/,
236
- /^SHOW max_identifier_length/,
237
- /^BEGIN/,
238
- /^COMMIT/
239
- ]
240
- def self.ignored_sql; @@ignored_sql; end
241
- def self.ignored_sql=(value)
242
- @@ignored_sql = value || []
243
- end
244
-
245
- # FIXME: this needs to be refactored so specific database can add their own
246
- # ignored SQL. This ignored SQL is for Oracle.
247
- ignored_sql.concat [/^select .*nextval/i,
248
- /^SAVEPOINT/,
249
- /^ROLLBACK TO/,
250
- /^\s*select .* from all_triggers/im
251
- ]
252
-
253
- @@log = []
254
- def self.log; @@log; end
255
- def self.log=(log); @@log = log;; end
256
-
257
- def initialize(ignored_sql = self.class.ignored_sql)
258
- @ignored_sql = ignored_sql
259
- end
260
-
261
- def call(name, start, finish, message_id, values)
262
- return if 'CACHE' == values[:name]
263
-
264
- sql = values[:sql]
265
- sql = sql.to_sql unless sql.is_a?(String)
266
-
267
- return if @ignored_sql.any? { |x| x =~ sql }
268
-
269
- self.class.log << sql
270
- end
271
-
272
- @@enabled = true
273
- def self.enabled?; @@enabled; end
274
-
275
- begin
276
- require 'active_support/notifications'
277
- ActiveSupport::Notifications.subscribe('sql.active_record', SQLCounter.new)
278
- rescue LoadError
279
- @@enabled = false
280
- end
281
-
282
- end
283
- end
284
-
285
- # less (2.3) warnings otherwise the test console output is hard to read :
286
- if ActiveRecord::VERSION::MAJOR == 2 && ActiveRecord::VERSION::MINOR == 3
287
- ActiveRecord::Migration.class_eval do
288
- class << self # warning: instance variable @version not initialized
289
- alias_method :_announce, :announce
290
- def announce(message)
291
- @version = nil unless defined?(@version)
292
- _announce(message)
293
- end
294
- end
295
- end
296
- ActiveRecord::Base.class_eval do
297
- def destroyed? # warning: instance variable @destroyed not initialized
298
- defined?(@destroyed) && @destroyed # @destroyed
299
- end
300
- def new_record? # warning: instance variable @new_record not initialized
301
- @new_record ||= false # @new_record || false
302
- end
303
- end
304
- end
data/test/transaction.rb DELETED
@@ -1,109 +0,0 @@
1
- require 'test_helper'
2
- require 'simple' # due MigrationSetup
3
-
4
- module TransactionTestMethods
5
- include MigrationSetup
6
-
7
- def setup!
8
- CreateEntries.up
9
- CreateUsers.up
10
- end
11
-
12
- def teardown!
13
- CreateUsers.down
14
- CreateEntries.down
15
- end
16
-
17
- class Entry2 < ActiveRecord::Base; self.table_name = 'entries' ; end
18
-
19
- def setup
20
- super
21
- Entry.delete_all
22
- config = ActiveRecord::Base.connection.config
23
- Entry2.establish_connection config
24
- end
25
-
26
- def test_supports_transaction_isolation
27
- unless ActiveRecord::Base.connection.supports_transaction_isolation?
28
- omit("transaction isolation not supported")
29
- end
30
- assert ActiveRecord::Base.connection.supports_transaction_isolation?(:read_uncommitted)
31
- assert ActiveRecord::Base.connection.supports_transaction_isolation?(:read_committed)
32
- assert ActiveRecord::Base.connection.supports_transaction_isolation?(:repeatable_read)
33
- assert ActiveRecord::Base.connection.supports_transaction_isolation?(:serializable)
34
- end
35
-
36
- def test_transaction_isolation_read_uncommitted
37
- # It is impossible to properly test read uncommitted. The SQL standard only
38
- # specifies what must not happen at a certain level, not what must happen. At
39
- # the read uncommitted level, there is nothing that must not happen.
40
- # test "read uncommitted" do
41
- Entry.transaction(:isolation => :read_uncommitted) do
42
- assert_equal 0, Entry.count
43
- Entry2.create
44
- assert_equal 1, Entry.count
45
- end
46
- end if Test::Unit::TestCase.ar_version('4.0')
47
-
48
- def test_transaction_isolation_read_committed
49
- unless ActiveRecord::Base.connection.supports_transaction_isolation?
50
- omit("transaction isolation not supported")
51
- end
52
-
53
- # We are testing that a dirty read does not happen
54
- # test "read committed" do
55
- Entry.transaction(:isolation => :read_committed) do
56
- assert_equal 0, Entry.count
57
-
58
- Entry2.transaction do
59
- Entry2.create
60
- assert_equal 0, Entry.count
61
- end
62
- end
63
- assert_equal 1, Entry.count
64
- end if Test::Unit::TestCase.ar_version('4.0')
65
-
66
- def test_transaction_isolation_repeatable_read
67
- unless ActiveRecord::Base.connection.supports_transaction_isolation?
68
- omit("transaction isolation not supported")
69
- end
70
-
71
- # We are testing that a non-repeatable read does not happen
72
- # test "repeatable read" do
73
- entry = Entry.create(:title => '1234')
74
-
75
- Entry.transaction(:isolation => :repeatable_read) do
76
- entry.reload
77
- Entry2.find(entry.id).update_attributes(:title => '567')
78
-
79
- entry.reload
80
- assert_equal '1234', entry.title
81
- end
82
- entry.reload
83
- assert_equal '567', entry.title
84
- end if Test::Unit::TestCase.ar_version('4.0')
85
-
86
- # def test_transaction_isolation_serializable
87
- # # We are testing that a non-serializable sequence of statements will raise
88
- # # an error.
89
- # # test "serializable" do
90
- # #if Entry2.connection.adapter_name =~ /mysql/i
91
- # # # Unfortunately it cannot be set to 0
92
- # # Entry2.connection.execute "SET innodb_lock_wait_timeout = 1"
93
- # #end
94
- #
95
- # assert_raise ActiveRecord::StatementInvalid do
96
- # Entry.transaction(:isolation => :serializable) do
97
- # Entry.create
98
- #
99
- # Entry2.transaction(:isolation => :serializable) do
100
- # Entry2.create
101
- # Entry2.count
102
- # end
103
- #
104
- # Entry.count
105
- # end
106
- # end
107
- # end if Test::Unit::TestCase.ar_version('4.0')
108
-
109
- end