diff options
| author | wycats <wycats@gmail.com> | 2010-06-07 23:03:59 -0400 |
|---|---|---|
| committer | wycats <wycats@gmail.com> | 2010-06-07 23:03:59 -0400 |
| commit | b97a3f33a36f936531e608343797b99268f8bd92 (patch) | |
| tree | 94abb825948b826fefdfd8952c25a9f3f3690772 /activerecord/test/connections | |
| parent | 0042f4166f783085eb909d69d542b5323d8af5d6 (diff) | |
| parent | acef8feafa8a44271eb28685e180f8c28b7e4a0f (diff) | |
| download | rails-b97a3f33a36f936531e608343797b99268f8bd92.tar.gz rails-b97a3f33a36f936531e608343797b99268f8bd92.tar.bz2 rails-b97a3f33a36f936531e608343797b99268f8bd92.zip | |
Merge remote branch 'rsim/oracle_enhanced_rails3'
Diffstat (limited to 'activerecord/test/connections')
| -rw-r--r-- | activerecord/test/connections/native_oracle/connection.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/connections/native_oracle/connection.rb b/activerecord/test/connections/native_oracle/connection.rb index c8183dc0fb..bb4040058f 100644 --- a/activerecord/test/connections/native_oracle/connection.rb +++ b/activerecord/test/connections/native_oracle/connection.rb @@ -53,7 +53,7 @@ Course.establish_connection 'arunit2' # for assert_queries test helper ActiveRecord::Base.connection.class.class_eval do - IGNORED_SELECT_SQL = [/^select .*nextval/i, /^SAVEPOINT/, /^ROLLBACK TO SAVEPOINT/, /^RELEASE SAVEPOINT/, /^\s*select .* from all_tab_columns/im] + IGNORED_SELECT_SQL = [/^select .*nextval/i, /^SAVEPOINT/, /^ROLLBACK TO/, /^\s*select .* from ((all|user)_tab_columns|(all|user)_triggers|(all|user)_constraints)/im] def select_with_query_record(sql, name = nil, return_column_names = false) $queries_executed ||= [] |