1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
rails--rails/activerecord/test
Rafael Mendonça França ae297710dd Merge pull request #12011 from jetthoughts/11963_fix_join_with_association_scope
Collapse where constraints to the Arel::Nodes::And node

Conflicts:
	activerecord/CHANGELOG.md
2013-09-16 13:45:25 -03:00
..
active_record/connection_adapters Ensure disconnecting or reconnecting resets the transaction state 2012-09-15 00:03:04 +01:00
assets Added test to illustrate bad binary blobs. 2012-01-31 13:45:00 -06:00
cases Merge pull request #12011 from jetthoughts/11963_fix_join_with_association_scope 2013-09-16 13:45:25 -03:00
fixtures Fix broken link to Fixtures documentation on guides 2013-08-29 15:44:12 -05:00
migrations Preserve magic comments and content encoding of copied migrations. 2013-03-09 15:38:02 +09:00
models Merge pull request #12011 from jetthoughts/11963_fix_join_with_association_scope 2013-09-16 13:45:25 -03:00
schema Use the proper encoding comment on the file 2013-08-06 10:37:50 -03:00
support Revert "Fix annoy warning, when executing testcase." 2012-11-30 12:07:55 +04:00
.gitignore Refactor Active Record test connection setup. Please see the RUNNING_UNIT_TESTS file for details, but essentially you can now configure things in test/config.yml. You can also run tests directly via the command line, e.g. ruby path/to/test.rb (no rake needed, uses default db connection from test/config.yml). This will help us fix the CI by enabling us to isolate the different Rails versions to different databases. 2011-06-04 23:47:03 +01:00
config.example.yml Simulated & actual (manual/skipped) PostgreSQL auto-reconnection tests. 2012-07-16 09:55:20 -07:00
config.rb