github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity
11,617 Commits 34 Branches 105 Tags
fa007e591d1ebf6df3fc8af4777c06e8a3d84eb3
Commit Graph

3181 Commits

Author SHA1 Message Date
Jeremy Kemper
78790e47b8 Revert "Revert "Assert primary key does not exist in habtm when the association is defined, instead of doing that everytime a record is inserted."" 
This reverts commit 2b82708b0e.

[#3128 state:resolved]

Conflicts:

	activerecord/lib/active_record/associations.rb
	activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
 2009-11-23 10:42:32 -08:00
Gabe da Silveira
ea290e77e6 Insert generated association members in the same order they are specified when assigning to a has_many :through using the generated *_ids method 
[#3491 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
 2009-11-17 22:25:40 -08:00
Jeremy Kemper
fb61fbd352 Revert "Ensure Model#destroy respects optimistic locking" 
[#1966 state:open]

This reverts commit 0d922885fb.

Conflicts:

	activerecord/lib/active_record/locking/optimistic.rb
 2009-11-17 15:35:35 -08:00
Jeremy Kemper
7601d482bd Ruby 1.9: skip pg locking test for 1.9.1 also 2009-11-15 10:28:58 -08:00
Jeremy Kemper
364a8f3902 No need to check for generated method, just redispatch 2009-11-14 01:51:52 -08:00
Jeremy Kemper
6ebb061b18 Ruby 1.9.2: use recursive flatten 2009-11-14 01:50:47 -08:00
Jeremy Kemper
f0f4dffd3b Skip pg locking test due to connection checkout deadlock detection 2009-11-14 01:22:36 -08:00
Jeremy Kemper
92253829de Ruby 1.9.2: fix flatten_deeper to preserve nils 2009-11-14 01:12:49 -08:00
Jeremy Kemper
7b3d85db4c Revert "Split arel_table into method to get a relation and another to memoize the default relation." 
This reverts commit bd51790895.
 2009-11-13 15:30:51 -08:00
Jeremy Kemper
bd51790895 Split arel_table into method to get a relation and another to memoize the default relation. 2009-11-13 10:53:19 -08:00
Jeremy Kemper
0da71980cd Missing customers fixture 2009-11-13 10:38:23 -08:00
Jeremy Kemper
fbbf0086ca Ruby 1.9.2: avoid #flatten 2009-11-13 09:52:53 -08:00
Jeremy Kemper
fca32eb6c5 Update AR logger subscriber for Notifications subscriber args change 2009-11-11 01:43:58 -08:00
Jeremy Kemper
bbb3e5a858 Unify test:isolated across components and run by default at toplevel 2009-11-10 16:50:15 -08:00
Jeremy Kemper
a4aa95ba0c Bump AR.gemspec Arel dep too 2009-11-10 15:13:38 -08:00
Jeremy Kemper
5fa497abf5 Ruby 1.9: fix Relation respond_to? and method_missing 2009-11-10 11:00:50 -08:00
Jeremy Kemper
77478f21af Resolve deadlock in pooled connections test 2009-11-10 11:00:29 -08:00
Matt Jones
d625312fe1 delete correct records for a has_many with :primary_key and :dependent => :delete_all 
Signed-off-by: Michael Koziarski <michael@koziarski.com>
 2009-11-10 18:41:37 +13:00
Joshua Peek
11e798ae0f Avoid adding component lib/ to load path multiple times 2009-11-09 23:28:36 -06:00
Jeremy Kemper
703d31c20a Clarify failed assertion 2009-11-09 17:01:57 -08:00
Xavier Noria
329e7f4441 Integer#even? and Integer#odd? are not needed for Ruby >= 1.8.7 2009-11-09 22:16:51 +01:00
Xavier Noria
f8e713f488 Object#tap is not needed for Ruby >= 1.8.7 2009-11-09 22:16:51 +01:00
Xavier Noria
1979e9c855 Symbol#to_proc is not needed for Ruby >= 1.8.7 2009-11-09 22:16:51 +01:00
Eloy Duran
f125a34501 Define autosave association callbacks when using accepts_nested_attributes_for. 
This way we don't define all the validation methods for all associations by
default, but only when needed.

[#3355 state:resolved]
 2009-11-07 00:42:42 +01:00
Jeremy Kemper
e93c2da141 Arel::In -> Arel::Predicates::In 2009-11-02 17:50:12 -08:00
José Valim
e714b499cc Move validator, human_name and human_attribute_name to ActiveModel, remove deprecated error messages and add i18n_scope and lookup_ancestors. 
Signed-off-by: Carl Lerche <carllerche@mac.com>
 2009-10-20 17:52:32 -07:00
Yehuda Katz + Carl Lerche
4f6d6f7031 Have all the tests running off a single Gemfile 2009-10-20 16:34:44 -07:00
Jeremy Kemper
2767036392 Use bundled env for tests only 2009-10-19 19:00:48 -07:00
Jeremy Kemper
66c4f28bd6 Bump arel requirement to 0.1.1 2009-10-19 18:33:38 -07:00
Eric Chapweske
2831996483 Fixed: #without_typecast should only disable typecasting on the duplicated attributes [#3387 state:resolved] 
Signed-off-by: Joshua Peek <josh@joshpeek.com>
 2009-10-18 10:22:22 -05:00
Eric Chapweske
f936a1f100 Refactoring attributes/types [#3348 state:resolved] 
Signed-off-by: Joshua Peek <josh@joshpeek.com>
 2009-10-17 12:37:15 -05:00
Joshua Peek
4cebd41d9e Fix Rails root in sqlite adapter 2009-10-16 19:08:09 -05:00
Joshua Peek
6094e65169 We won't be publishing tars and zips anymore 2009-10-16 13:56:59 -05:00
Nick Sieger
471a394215 Modify connection pool callbacks to be compatible w/ new style 
Signed-off-by: Yehuda Katz <wycats@gmail.com>
 2009-10-16 10:34:52 -07:00
José Valim
2d7abe245e Renamed Orchestra to Notifications once again [#3321 state:resolved] 2009-10-15 18:51:51 -03:00
José Valim
a15e02d44a Unify benchmark APIs. 2009-10-15 18:19:25 -03:00
José Valim
af0d1fa892 Update Orchestra instrumentations and move part of logging to Orchestra. 2009-10-15 18:18:44 -03:00
José Valim
8b340ab2f6 Revert "Rename Orchestra to Notifications [#3321 state:resolved]" 
This reverts commit 8cbf825425.
 2009-10-15 18:06:15 -03:00
Jeremy Kemper
c09a5ffea7 Merge branch 'arel' 2009-10-14 19:32:09 -07:00
Jeremy Kemper
6be5f45019 Fix env path 2009-10-14 19:30:06 -07:00
Jeremy Kemper
9c52f96acb Include bundled env in toplevel require, if present 2009-10-14 19:15:33 -07:00
Jeremy Kemper
df55781458 No more toplevel arel sibling 2009-10-14 19:05:06 -07:00
Joshua Peek
8cbf825425 Rename Orchestra to Notifications [#3321 state:resolved] 2009-10-14 19:50:36 -05:00
Jeremy Kemper
4cbd3f050b Move from git submodule to gem bundle 2009-10-14 17:19:24 -07:00
Michael Koziarski
d5d242660c Avoid warning spam by flipping to the new callbacks mechanism. These callbacks are actually never called by rails itself, merely there for plugins 2009-10-15 11:21:53 +13:00
Emilio Tagua
06ad817f92 Use ActiveSupport::Callbacks instead of 
ActiveSupport::DeprecatedCallbacks.
 2009-10-13 15:15:00 -03:00
Emilio Tagua
991d1bc200 Merge commit 'rails/master' 2009-10-13 15:06:43 -03:00
Joshua Peek
21e7b84621 Callbacks, DeprecatedCallbacks = NewCallbacks, Callbacks 2009-10-12 22:15:43 -05:00
Pratik Naik
68d416a58f Add a :limit option to specify the maximum number of records that can be processed by accepts_nested_attributes_for 2009-10-09 16:08:11 +01:00
Pratik Naik
e94caf0788 Store entire options hash in the class var rather than just the reject_if proc for the nested attributes 2009-10-09 15:47:10 +01:00