Rafael Mendonça França d29399061e Merge pull request #10713 from senny/10693_fix_primary_key_option_on_has_many ...

Fix the `:primary_key` option for `has_many` associations.
Conflicts:
	activerecord/CHANGELOG.md
	activerecord/lib/active_record/associations/has_many_association.rb

2013-05-23 18:45:12 -03:00

..

active_record/connection_adapters

pushing caching and visitors down to the connection

2011-11-19 20:19:53 -08:00

assets

Merge pull request #4809 from cfeist/feist-sqlite-binary-corruption

2012-02-02 09:16:06 -08:00

cases

Merge pull request #10713 from senny/10693_fix_primary_key_option_on_has_many

2013-05-23 18:45:12 -03:00

fixtures

Fix deleting from a HABTM join table upon destroying an object of a model with optimistic locking enabled. Fixes #5332.

2012-11-13 10:36:24 -08:00

migrations

recognize migrations, in folders containing numbers and 'rb'.

2012-12-13 11:40:02 +01:00

models

Merge pull request #10713 from senny/10693_fix_primary_key_option_on_has_many

2013-05-23 18:45:12 -03:00

schema

Correctly parse bigint defaults in PostgreSQL, Backpost #10098.

2013-04-11 10:11:18 +02:00

support

Add require 'pathname' as it has not already been required in some circumstances

2011-06-17 14:55:34 +01: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

Backport PostgreSQL auto-reconnect test coverage

2012-09-13 14:57:59 -07:00

config.rb

Merge branch 'ar-test-cleanup' of git://git.geeksomnia.com/rails

2008-01-21 17:20:51 +00:00