Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix wrong commits. I had mistakes. #6880

Merged
merged 2 commits into from
Jun 27, 2012

Conversation

kennyj
Copy link
Contributor

@kennyj kennyj commented Jun 27, 2012

sorry, I had some mistakes.
I think they are individual commits, but if we should squash these, I'll update.

@@ -157,7 +157,7 @@ def test_db_test_prepare_when_using_sql_format
add_to_config "config.active_record.schema_format = :sql"
output = Dir.chdir(app_path) do
`rails generate scaffold user username:string;
bundle exec rake db:migrate db:test:clone 2>&1 --trace`
bundle exec rake db:migrate db:test:prepare 2>&1 --trace`

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And this was passing? :)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes.
db:test:prepare => db:test:load => db:test:load_structure
db:test:clone => db:test:clone_structure => db:test:load_structure

Both tasks called db:test:load_structure.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah ok, got it, thanks.

@carlosantoniodasilva
Copy link
Member

I think they could be one commit yeah, but no worries. Thanks!

carlosantoniodasilva added a commit that referenced this pull request Jun 27, 2012
Fix wrong testcase for db:test:prepare, and wrong environment in AR rake task.
@carlosantoniodasilva carlosantoniodasilva merged commit 565d54d into rails:master Jun 27, 2012
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants