rails4: merges commits done at master branch into rails4 branch #251

Merged
merged 23 commits into from Nov 20, 2012

Projects

None yet

7 participants

@yahonda
Collaborator
yahonda commented Nov 20, 2012

This pull request merges several commits which had been done at master branch, into rails4 branch.

Conflict resolutions

  • 1 lib/active_record/connection_adapters/oracle_enhanced_base_ext.rb

This file has been removed in rails4 branch at

  • 9369d15 "Initial support for ActiveRecord 4. Dropping support for older versions."

Several changes done with 3fad716c0132af0e833b2da26738642500326408 are
merged to lib/active_record/connection_adapters/oracle_enhanced_model.rb

  • 2 lib/active_record/connection_adapters/oracle_enhanced_schema_statements.rb

These two commits at master branch conflict with 166bcb2

Two commits at master branch

  • 305283a "Remove_column should raise an ArgumentError when no columns are passed"
  • 38e7b72 "Fix broken column remove inside a change_table block."

A commit at rails4 branch

  • 166bcb2 "Support refactored remove_column"
  • 3 spec/active_record/connection_adapters/oracle_enhanced_schema_dump_spec.rb

This commit done at master branch conflict with rails4.

  • e35a4a0 "Fix pending specs on Oracle 10g properly"
@yahonda
Collaborator
yahonda commented on c6ea8d9 Nov 6, 2012

Thanks!

ebeigarts and others added some commits Nov 13, 2012
@ebeigarts ebeigarts Release 1.4.2.rc1 c80560a
@yahonda yahonda Remove_column should raise an ArgumentError when no columns are passed 305283a
@yahonda yahonda Address 2 failues since numeric_changes_from_zero_to_string? method i…
…mplemented at Rails.
9b65f00
@yahonda yahonda Address test_integer_zero_to_integer_zero_not_marked_as_changed failure
See rails issue #7237.
8d838f4
@yahonda yahonda Merge pull request #246 from yahonda/remove_column_should_have_columns
Remove_column should raise an ArgumentError when no columns are passed
6fd6f20
@yahonda yahonda Merge pull request #247 from yahonda/numeric_column_changes_v142
Address numeric column changes failures
2ba2b90
@kennyj @yahonda kennyj Fix rails issue 6819. a5b4dbf
@yahonda yahonda Address 2 failures since c460117 merged. 2781f04
@yahonda yahonda Merge pull request #248 from yahonda/rails6819_v142
Address schema dumper test failure
dd4eafa
@yahonda yahonda Merge branch 'master' into rails4_merges_master
Conflicts:
	lib/active_record/connection_adapters/oracle_enhanced_base_ext.rb
	lib/active_record/connection_adapters/oracle_enhanced_schema_statements.rb
	spec/active_record/connection_adapters/oracle_enhanced_schema_dump_spec.rb

Conflict resolutions

  #1 lib/active_record/connection_adapters/oracle_enhanced_base_ext.rb

  This file has been removed in rails4 branch at 9369d15
  "Initial support for ActiveRecord 4. Dropping support for older versions."

  Several changes done with 3fad716c0132af0e833b2da26738642500326408 are
  merged to `lib/active_record/connection_adapters/oracle_enhanced_model.rb`

  #2 lib/active_record/connection_adapters/oracle_enhanced_schema_statements.rb

  These two commits at master branch conflict with 166bcb2

  -- Two commits at master branch
  305283a
  "Remove_column should raise an ArgumentError when no columns are passed"

  38e7b72
  "Fix broken column remove inside a change_table block."

  -- A commit at rails4 branch
  166bcb2
  "Support refactored remove_column"

  #3 spec/active_record/connection_adapters/oracle_enhanced_schema_dump_spec.rb

  This commit done at master branch conflict with rails4.
  e35a4a0
  "Fix pending specs on Oracle 10g properly"
3ae8245
@yahonda
Collaborator
yahonda commented Nov 20, 2012

This pull request/commits has been created as follows.

  • checkout current rails4 branch
    git checkout rails4
  • create a topic branch to merge
    git checkout -b rails4_merges_master
  • merges master branch commits into rails4_merges_master branch
    git merge master
  • push rails4_merges_master to origin at github
    git push origin rails4_merges_master

This pull request works except for #250 and rails/rails#7334. Second one already exist before this merge.

@yahonda yahonda merged commit c23332f into rsim:rails4 Nov 20, 2012
@yahonda yahonda deleted the yahonda:rails4_merges_master branch Jan 27, 2013
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment