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
27,074 Commits 34 Branches 105 Tags
995c076d34e87e52ec0f09697b9331cc021fce1b
Commit Graph

5505 Commits

Author SHA1 Message Date
densya203
daa266536e Fix Issue #4819 
'uninitialized constant ActiveRecord::Deprecation in Rails3.2.1'

Just a typo of 'ActiveSupport::...'
 2012-02-04 00:51:08 +09:00
Aaron Patterson
4ca633e466 Merge pull request #4809 from cfeist/feist-sqlite-binary-corruption 
Fix for SQLite binary data corrupter (to master branch)
 2012-02-02 09:16:06 -08:00
Jon Leighton
42dab646eb Merge pull request #4543 from jdelStrother/find_or_init 
Don't instantiate two objects in collection proxy / find_or_instantiate_by
 2012-02-01 23:19:25 +00:00
Jon Leighton
e1de54079b Improve deprecation message 2012-01-31 20:26:16 +00:00
Jon Leighton
85c724d59e Merge pull request #4783 from gregolsen/ids_reader_fix 
ids_reader method fixed, test added to has_many association (for PostgreSQL)
 2012-01-31 13:51:09 +00:00
Jon Leighton
b2955edcea Allow writing unknown attributes, but with a deprecation warning. Closes #4583. 2012-01-31 08:50:36 +00:00
Jon Leighton
0bfc504d9c Add workaround and deprecation if the inherited hook is not executed. Closes #4757. 2012-01-31 08:41:51 +00:00
Jon Leighton
c472843bbc Merge pull request #4763 from kennyj/fix_4754 
[MySQL] Fix GH #4754. Remove double-quote characters around PK when using sql_mode=ANSI_QUOTES
 2012-01-31 08:23:25 +00:00
Xavier Noria
413790559c query cache instrumentation should included the bindings in the payload [closes #4750] 2012-01-30 13:48:05 -08:00
Jon Leighton
1c5bd8a33d Merge pull request #4715 from pwim/find-create-multi-args 
Fix regression from Rails 3.1
 2012-01-27 09:31:48 +00:00
Xavier Noria
67b8fbca92 updating RAILS_VERSION 2012-01-26 14:54:02 -08:00
Xavier Noria
24834606c2 disable automatic explain if there is no logger [closes #4671] 2012-01-26 02:51:18 -08:00
Sergey Nartimov
36d7af34d6 call to_s on value passed to table_name= 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2012-01-26 08:19:45 +01:00
Jon Leighton
fab664a8e9 Fix another race condition. 
From 2c667f69aa2daac5ee6c29ca9679616e2a71532a.

Thanks @pwnall for the heads-up.

Conflicts:

	activerecord/lib/active_record/core.rb
 2012-01-20 18:31:41 +00:00
David Heinemeier Hansson
f36dcaf488 Preparing for 3.2.0 release 2012-01-20 17:44:32 +01:00
Aaron Patterson
4c5b73fef8 Merge pull request #4531 from exviva/pessimistic_with_lock 
Add ActiveRecord::Base#with_lock
 2012-01-19 09:39:20 -08:00
Vijay Dev
c8b584f576 select doesn't take multiple arguments - fixes #4539 [ci skip] 
Didn't cherry pick the master commit because this one already had some
of the fixes made in master.
 2012-01-19 21:58:19 +05:30
Aaron Patterson
57f73a6bcf Merge pull request #4487 from sarenji/fix-reset-counters 
Fix bug where reset_counters resets the wrong counter cache.
 2012-01-17 10:23:56 -08:00
Jon Leighton
70b762d1a7 Fix race condition 💣 2012-01-13 22:58:26 +00:00
Piotr Sarnacki
0d1df723c7 Fix table_name in ActiveRecord with more than one abstract ancestors 
When subclassing abstract_class table_name should be always computed
based on class name, no matter if superclass is subclassing base
or another abstract_class. So:

class FirstAbstract < ActiveRecord::Base
  self.abstract_class = true
end
class SecondAbstract < FirstAbstract
  self.abstract_class = true
end

class Post < SecondAbstract
  self.table_name #=> 'posts' (not 'second_abstracts')
end
 2012-01-12 20:53:01 +01:00
Vijay Dev
e6b59432ea fixes in api docs 2012-01-13 00:42:33 +05:30
Santiago Pastorino
fc74a51c3f on and ON are type casted to a true boolean column 2012-01-11 23:26:32 -02:00
Matt Jones
d0915ac2f9 add documentation explaining reorder behavior 2012-01-11 20:24:22 +05:30
Santiago Pastorino
bb78804a5e Merge pull request #4408 from tomstuart/read-and-write-attribute-aliases 
#[] and #[]= are no longer interchangeable with #read_attribute and #write_attribute
 2012-01-11 12:10:59 -02:00
Aaron Patterson
77785c7806 FFFFFFFFUUUUUUUUUUUUUUUUUUUUUUUUU 💣 2012-01-10 13:24:15 -08:00
Aaron Patterson
5e04884bce deprecate the subdirectories parameter to migrations 
Conflicts:

	activerecord/lib/active_record/migration.rb
 2012-01-10 13:19:11 -08:00
Santiago Pastorino
d268ef2f65 Bump to rc2 2012-01-04 18:59:41 -02:00
Aaron Patterson
d22592a05b Merge pull request #4282 from edgecase/order_after_reorder 
correctly handle order calls after a reorder
 2012-01-04 10:13:22 -08:00
kennyj
6012970fea Fix GH #4285. Remove options when we record calling creat_table 2012-01-04 14:54:38 +09:00
Sergey Nartimov
5f09414f85 deprecate ActiveSupport::Base64 
extend and define ::Base64 if needed
 2012-01-03 00:57:03 +03:00
Jo Liss
d8a43e2650 Document that index names are made up of all columns, not just the first. 
index_name has been using the following expression

    "index_#{table_name}_on_#{Array.wrap(options[:column]) * '_and_'}"

since at least 2006 (bc7f2315), and that's how they come out in my DB.

Please check that this is correct before merging into master, perhaps
I'm misunderstanding the section I changed.
 2011-12-29 23:39:06 +05:30
Uģis Ozols
bea4f9aa3f Remove unnecessary comma. 2011-12-29 23:39:06 +05:30
Aaron Patterson
f423bdc10b Merge pull request #4216 from edgecase/master_fix_reorder_with_limited_ids 
allow reorder to affect eager loading correctly
 2011-12-28 17:04:23 -08:00
Xavier Noria
7a80ac0162 app code in general wants Time.current, not Time.now 2011-12-28 23:47:31 +01:00
Marcos Tapajós
7767159a15 Remove empty line. 2011-12-28 12:57:20 -02:00
Marcos Tapajós
b3490d82ba Closes #4208 2011-12-27 20:31:29 -02:00
Tsutomu Kuroda
38bc917bb5 Reconnect to the first database after db:create 
Otherwise, the schema and seed will be loaded onto the
test database.
 2011-12-25 13:15:32 +09:00
José Valim
557014d45a Tidy up migration types. 2011-12-24 10:52:45 +01:00
Dmitrii Samoilov
7f5b51686c added ability to specify from cli when generating a model/migration whether particular property should be an index like this 'rails g model person name:string:index profile:string' 2011-12-24 10:52:45 +01:00
Jon Leighton
0a2e37975d Fix situation where id method didn't get defined causing postgres to fail 2011-12-23 21:12:37 +00:00
Jon Leighton
9d9440f686 Doh, remove debugging line 2011-12-23 18:25:30 +00:00
Jon Leighton
7bb754eaed Fix #4046. 2011-12-23 18:22:44 +00:00
Jon Leighton
96c38eca23 Fix build when IM=true 2011-12-23 12:00:37 +05:30
Jon Leighton
e46e4915ff Make ActiveRecord::Relation#pluck work with serialized attributes 2011-12-22 19:24:16 +00:00
Jon Leighton
7edade337e Make read_attribute code path accessible at the class level 2011-12-22 19:24:16 +00:00
Jakub Kuźma
2d07c60b68 added failing tests for has_many, has_one and belongs_to associations with strict mass assignment sanitizer, fixed build_record to not merge creation_attributes, removed failing nested attributes tests (that feature was broken anyway) #4051 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2011-12-21 21:17:06 +01:00
Hendy Tanata
e149d5059b Improve doc for ActiveRecord::Base.unscoped. 2011-12-20 22:27:32 +05:30
David Heinemeier Hansson
9d6e52b55e Party like its R-C-UNO! 2011-12-19 18:34:57 -06:00
Juan M. Cuello
626c881863 Fix database tasks in test namespace. 
This is mostly the same as 876bade599
that was reverted due to test failures, but now with a correction.
 2011-12-19 18:20:17 -03:00
José Valim
3c1884e7dd Revert "Merge pull request #4030 from Juanmcuello/database_tasks" 
This reverts commit a0edfb4d20, reversing
changes made to 4012fcff22.
 2011-12-19 19:31:36 +01:00