rsim/oracle-enhanced — pull request #206 by yahonda (2012-07-31 19:55:20+00:00)
Title: merge commits made on master branch since rails4 branch cut

This pull request merge commits made on the master to the rails4 branch after rails4 branch cut.

- git merge
```ruby
$ git checkout rails4
Switched to branch 'rails4'
$ git checkout -b rails4_merges_master
Switched to a new branch 'rails4_merges_master'
$ git merge master
Auto-merging lib/active_record/connection_adapters/oracle_enhanced_adapter.rb
Auto-merging lib/active_record/connection_adapters/oracle_enhanced_context_index.rb
Auto-merging lib/active_record/connection_adapters/oracle_enhanced_schema_definitions.rb
Auto-merging lib/active_record/connection_adapters/oracle_enhanced_schema_dumper.rb
Auto-merging lib/active_record/connection_adapters/oracle_enhanced_schema_statements.rb
Auto-merging spec/active_record/connection_adapters/oracle_enhanced_context_index_spec.rb
Auto-merging spec/active_record/connection_adapters/oracle_enhanced_schema_statements_spec.rb
Merge made by recursive.
README.md | 94 +++++++----
.../connection_adapters/oracle_enhanced_adapter.rb | 6 +-
.../connection_adapters/oracle_enhanced_column.rb | 5 +-
.../oracle_enhanced_context_index.rb | 31 ++++
.../oracle_enhanced_jdbc_connection.rb | 22 ++-
.../oracle_enhanced_oci_connection.rb | 3 +-
.../oracle_enhanced_schema_definitions.rb | 40 +++--
.../oracle_enhanced_schema_dumper.rb | 13 +-
.../oracle_enhanced_schema_statements.rb | 23 ++-
.../oracle_enhanced_structure_dump.rb | 6 +-
.../oracle_enhanced_connection_spec.rb | 22 +++
.../oracle_enhanced_context_index_spec.rb | 1 +
.../oracle_enhanced_schema_dump_spec.rb | 42 ++++-
.../oracle_enhanced_schema_statements_spec.rb | 182 +++++++++++++++++---
.../oracle_enhanced_structure_dump_spec.rb | 12 ++
15 files changed, 403 insertions(+), 99 deletions(-)
$
```

- Oracle enhanced adapter unit tests

```ruby
$ rake spec
... snip ...

Pending:
OracleEnhancedAdapter database session store should have one enhanced_write_lobs callback
# Not in this ActiveRecord version
# ./spec/active_record/connection_adapters/oracle_enhanced_adapter_spec.rb:100

Finished in 54.82 seconds
350 examples, 0 failures, 1 pending
$
```

- ActiveRecord unit tests

```ruby
$ rake test_oracle
... snip ...

Finished tests in 282.756518s, 12.2296 tests/s, 35.9178 assertions/s.

3458 tests, 10156 assertions, 0 failures, 0 errors, 24 skips
$
```

Fortunately no conflicts found and all unit tests finishes successfully.

Although I do not think not it's not the timing to merge rails4 commits into the master branch because the rails4 branch just works with rails master. but it is worth to merge commits made on the master branch into the rails4 branch.