github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-01-14 17:18:04 -05:00
Code Issues Packages Projects Releases Wiki Activity
10,373 Commits 34 Branches 105 Tags
2-3-github
Commit Graph

1680 Commits

Author SHA1 Message Date
Charlie Somerville
3770f13b97 replace uses of OrderedHash with just a regular hash 2013-10-15 15:20:43 -04:00
Charlie Somerville
6ba9bd8d09 fix for new behaviour of respond_to? 2013-08-08 20:37:30 -07:00
Charlie Somerville
e423b0095f fix broken tests and warnings 2013-08-07 00:46:51 -07:00
Charlie Somerville
581ed6ab6e fix AR tests 2013-08-06 19:40:44 -07:00
Charlie Somerville
117eeefb76 fix invalid YAML 2013-08-06 17:50:56 -07:00
Charlie Somerville
4299e71018 fix some AR tests on 1.9 2013-08-06 17:41:51 -07:00
Corey Donohoe
f6cf01337f apply patch for cve-2013-0277 2013-02-11 10:47:45 -08:00
Justin Collins
a6eb61b7e4 Fix SQL injection via nested hashes in conditions 2012-06-12 23:14:10 -07:00
Aaron Patterson
6b46d65597 fixing sql injection problem 2011-08-16 14:57:48 -07:00
Casey Dreier
9f7ff621bd Fixing dynamic finders on associations to properly send arguments to the find_by_* method. Closes issue #330. 
Commit fdfc8e3b9 introduced a bugfix to prevent additional values passed
to a dynamic find_or_create_by_x methods from confusing the finder.
This patch also broke the essential behavior of this method on an
association by incorrectly sending arguments to the find_by_x methods.
The finder method would always see its inputs as a single array of
values instead of individual arguments, almost guaranteeing that the
finder call would be incorrect, and that we'd always create a new
record instead.

This patch adds a splat operator to the parameter array we send along to
the dynamic finder so that it receives its inputs correctly, and
includes an additional test to ensure that repeated calls to
find_or_create_by_x only creates one new record.
 2011-04-27 21:57:24 -04:00
Michael Koziarski
84465a2cc1 Revert "In nested_attributes when association is not loaded and association record is saved then in memory record attributes should be saved" 
This reverts commit 12bbc34aca.

It caused errors when combined with attr_accessible, piggy back attributes fetched by :select, etc.  Leaving it in 3.0, but removing from 2.3
 2010-12-08 09:48:54 +13:00
Will Bryant
0fee359278 Don't add non-new records back to the target array after loading targets on associations, as that makes destroy_all destroy any created records that don't match the scope destroy_all is called on 
Signed-off-by: Michael Koziarski <michael@koziarski.com>
 2010-12-08 09:48:16 +13:00
Alexandru Catighera
1681ede605 Fix ActiveRecord calculations when grouped by multiple fields 2010-11-16 11:06:49 -08:00
toby cabot
bdfddb09d7 bug 1108: yield to block provided to find_or_create_by_x 
Starting in 2.3.8 we stopped yielding to blocks passed in to
find_or_create_by_x methods.  This patch restores that behavior and
adds a case to test it.
 2010-10-20 17:23:54 -07:00
toby cabot
fdfc8e3b9c bug 1108: fix a bug with find_or_create_by and additional values 
There was a bug with find_or_create_by_x introduced in 2.3.9 - if you
included extra parameters for the create() then those parameters would
confuse the find() so you'd never get to the create().  This patch
filters the parameters so we only pass to find() the subset that it's
interested in.  The code for the filtering was modelled on the code in
base.rb's method_missing().
 2010-10-20 17:23:54 -07:00
Michael Koziarski
96183e0f28 Revert 7d2173ec5c which introduced a security vulnerability. 
This addresses  CVE-2010-3933
 2010-10-15 08:30:34 +13:00
Marcelo Giorgi
96c19ff7cc AssociationCollection#include? working properly for objects added with build method [#3472 state:resolved] 2010-09-30 10:28:25 -07:00
Marcelo Giorgi
9b78af95be Remove duplication of conditions generated for associations when used in conjunction with named_scopes [#4634 state: resolved] 2010-09-30 09:04:04 -07:00
Ryan Wallace
515917f5d8 Add test to demonstrate failure with eager loading hmt where the association has an order. 2010-09-28 09:54:32 -07:00
Étienne Barrié
bc52d81306 Fix add_index with a symbol #4891 2010-09-27 10:26:01 -07:00
Ken Collins
b64d1fe637 Conversion of a two dimensional array that is ruby 1.8.6 safe. Fix paren warnings too. 
Signed-off-by: Michael Koziarski <michael@koziarski.com>
 2010-09-03 14:38:28 +12:00
Jeff Lawson
d35a67bba3 Bug Fix -- clean up connection after stored procedure [#3151 state:resolved] for 2-3-stable 2010-08-18 08:33:47 -07:00
Jeff Lawson
7e79889d1c Bug Fix -- clean up connection after stored procedure [#3151 state:resolved] for 2-3-stable 2010-08-18 08:33:47 -07:00
Subba Rao Pasupuleti
12bbc34aca In nested_attributes when association is not loaded and association record is saved then in memory record attributes should be saved 
[#5053 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-08-03 10:56:51 +02:00
Subba Rao Pasupuleti
dec2c4f4e3 renaming test name to fix accidently override [#5076 state:resolved] 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-07-18 11:20:25 +02:00
Neeraj Singh
99cdea7cbe update_attribute and updated_attributes! are now wrapped in a transaction 
[#922 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-07-18 11:20:25 +02:00
Jacob Lewallen
8298bef72e Set destroyed=true in opt locking's destroy [#5058 state:resolved] 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-07-14 08:03:02 +02:00
Ken Collins
504f7cfbb3 Fix the #using_limitable_reflections? helper to work correctly by not examining the length of an array which contains false/true, hence always passing. 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-07-08 23:08:11 +02:00
Grant Ammons
0963774c0a fixes #2362, eager loading :through associations will join the :source model if there are :conditions 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-07-08 23:08:05 +02:00
Mislav Marohnić
2d3bc99b0d test that ActiveRecord destroy and destroy_all return destroyed records 
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
 2010-07-08 11:35:56 -07:00
Mislav Marohnić
ba9c469113 add missing require to ActiveRecord "base_test.rb" 
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
 2010-07-08 11:35:46 -07:00
James Le Cuirot
526f1e5f15 Don't remove scheduled destroys when loading an association. 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-07-01 01:07:24 +02:00
Aaron Patterson
fad166c152 AssociationCollection#create_by_*, find_or_create_by_* work properly now. [#1108 state:resolved] 
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
 2010-06-29 16:33:12 -07:00
David Trasbo
ac42e6951f Deprecate ActiveRecord::Base#class_name [#379 state:committed] 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-06-29 17:54:05 +02:00
Neeraj Singh
549b2ad77c fixes to the tests for patch #4909 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-06-23 17:34:45 +02:00
kane
09a23d2290 quote scoped columns in validates_uniqueness_of [#4909 state:resolved] 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-06-23 17:34:40 +02:00
George Montana Harkin
7d2173ec5c Fixes #2415 by creating a new instance of the Model when saving attributes to that model and the associated attributes already exist. Tests included. [#2415 state:resolved] 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-06-23 17:31:22 +02:00
Maxim Chernyak
844da12ba6 Fix eager loading of polymorphic has_one associations nested-included under polymorphic belongs_to associations. [#3233 state:resolved] 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-06-23 09:09:46 +02:00
Neeraj Singh
a9c69f3bb0 test for #1570 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-06-23 09:08:55 +02:00
Jeff Dean
da93d69bcb remove_column should raise an ArgumentError when no columns are passed [#4803 state:resolved] 
Signed-off-by: Michael Koziarski <michael@koziarski.com>
 2010-06-23 16:23:03 +12:00
Prem Sichanugrist
5ed6a8447b Change all i18n interpolations from {{...}} to %{...} 
This will silent all warning if there's a i18n version 0.4.x gem install on user's machine.

[#4913 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-06-21 01:14:36 +02:00
James Le Cuirot
08302d2feb When not overwriting unsaved updates in nested attributes, allow already-saved records to be refreshed. 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-06-20 00:33:39 +02:00
Master Lambaster
1ac00a6844 Fix test which prevents connection reset on failing and remove hardcoded connection 
[#4689 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
 2010-06-18 15:28:56 -07:00
James Le Cuirot
b41c3ba154 Don't overwrite unsaved updates when loading an association but preserve the order of the loaded records. [#4642 state:resolved] 
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
 2010-06-09 18:20:15 +05:30
Xavier Noria
ed8cabcec2 deprecates Array#random_element in favor of Array#sample, backported from Ruby 1.9, thanks to Marc-Andre Lafortune 2010-06-05 02:11:33 +02:00
Michael Koziarski
b760d699a8 Merge commit 'mislav/counter_cache_2-3-stable' into 2-3-stable 2010-05-29 14:05:31 +12:00
Aaron Patterson
a637b5f447 backporting beda2d43 for newer sqlite-ruby bindings 
Signed-off-by: Xavier Noria <fxn@hashref.com>
 2010-05-22 20:52:15 +02:00
Jeremy Kemper
9d99e610be Revert "Don't carry default value when changing column for a binary type on MySQL" 
Broke mysql tests.

This reverts commit ddadcc7cf8.

Conflicts:

	activerecord/test/cases/migration_test.rb

[#3234 state:open]
 2010-05-18 11:03:59 -07:00
Étienne Barrié
99bcce7ec1 make add_index and remove_index more resilient; new rename_index method; track database limits 
[#3452 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
 2010-05-18 10:51:36 -07:00
Ian White
a5696e36c6 Nested records (re: autosave) are now updated even when the intermediate parent record is unchanged [#4242] 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-05-18 16:10:44 +02:00