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
24,387 Commits 34 Branches 105 Tags
eabc036496c4f4dbafdcedef7ec8e857fd08641d
Commit Graph

5091 Commits

Author SHA1 Message Date
Gustavo Delfino
cdb49fc2f3 sqlite transactions now logged 
motivation: http://stackoverflow.com/questions/6892630/sqlite-transactions-not-showing-in-test-log
 2011-08-06 16:05:45 -04:30
Santiago Pastorino
1b676fc760 Revert "to_key on a destroyed model should return nil". Closes #2440 
This reverts commit c5448721b5.
 2011-08-05 19:39:19 -03:00
Xavier Noria
9e18380a32 Revert "Explicitly included hashes in sentence regarding SQL-injection-safe forms" 
Reason: The hash form is secure, and preferred over the array form if possible.

This reverts commit 6dc749596c.
 2011-08-04 16:41:31 -07:00
Vijay Dev
38bfcffc59 make the warning clear about the effect of using validates_associated on both sides on an association. 2011-08-04 16:41:27 -07:00
Pete Campbell
3c3f808764 Explicitly included hashes in sentence regarding SQL-injection-safe forms 2011-08-04 16:40:25 -07:00
artemk
b386951e42 accept option for recreate db for postgres (same as mysql now) 2011-08-04 00:34:13 +03:00
Aaron Patterson
86b7d83f1c initializing @open_transactions in the initialize method 2011-08-03 08:57:52 -07:00
Aaron Patterson
3a29cc3412 add a migrate class method and delegate to the new instance 2011-08-02 20:01:38 -07:00
Christopher Meiklejohn
74d7bfb200 Support backwards compatible interface for migration down/up with rails 3.0.x. 2011-08-02 18:55:59 -07:00
Aaron Patterson
cea06a8e3f default writing the schema file as utf-8 2011-07-29 12:28:12 -07:00
Aaron Patterson
3d6e187255 dump IO encoding value along with schema.rb so the file can be reloaded. fixes #1592 2011-07-29 12:23:37 -07:00
Jon Leighton
971a74b81f Revert "Merge pull request #2309 from smasry/master" 
This reverts commit 9d396ee819, reversing
changes made to fa2bfd832c.

Reason: the change broke the build.
 2011-07-28 13:14:11 +01:00
Samer Masry
18d307ed94 Reverse order fix when using function for ActiveRecord::QueryMethods Fixes #1697 2011-07-27 10:17:25 -07:00
Dmitriy Kiriyenko
9a298a162c Fixed failing query when performing calculation with having based on select. 2011-07-27 16:48:15 +03:00
Jon Leighton
24f0a872e6 Add a proxy_association method to association proxies, which can be called by association extensions to access information about the association. This replaces proxy_owner etc with proxy_association.owner. 2011-07-27 12:36:00 +01:00
Vishnu Atrai
cf3f1c9ba8 remove deprication warning for ruby 1.9.3-head for unused variables 2011-07-26 22:33:23 +05:30
Piotr Sarnacki
14c6fca9cd Revert "allow select to have multiple arguments" 
This reverts commit 04cc446d17.

I reverted it because apparently we want to use: select([:a, :b])
instead of select(:a, :b), but there was no tests for that form.
 2011-07-26 16:15:12 +02:00
Piotr Sarnacki
89f3d8a886 Merge pull request #2271 from slawosz/enhance_select_method_api 
allow select to have multiple arguments ie. Post.select(:id,:name,:author)
 2011-07-26 06:33:54 -07:00
Sławosz Sławiński
04cc446d17 allow select to have multiple arguments 2011-07-26 14:57:47 +02:00
Xavier Noria
703d0e05c0 Merge branch 'master' of git://github.com/lifo/docrails 2011-07-25 14:20:01 -07:00
Glenn Gillen
4605b5639d Simplify the way default DATABASE_URL works. 2011-07-25 09:08:08 -07:00
Santiago Pastorino
64affc9384 Merge pull request #2236 from cldwalker/after_initialize 
Fix after_initialize and Base.create edge case
 2011-07-25 07:20:38 -07:00
thedarkone
10863580aa Bring back the ability to provide :order for update_all. 2011-07-25 13:33:44 +02:00
Aaron Patterson
02691d3516 Merge pull request #2238 from cesario/order-with-extra-spaces 
Ordering with extra spaces was raising a SQL exception
 2011-07-24 14:40:15 -07:00
John
dd8a485170 Fixed Typo 2011-07-24 17:11:29 -04:00
Xavier Noria
4bb0a8bcbd Merge branch 'master' of git://github.com/lifo/docrails 2011-07-24 21:02:51 +02:00
Oemuer Oezkir
71d18ce48e Changed a few instances of of words in the API docs written in British English to 
American English(according to Weber)
 2011-07-24 10:21:42 +00:00
Franck Verrot
77bb0b79f2 Ordering with extra spaces was raising a SQL exception 2011-07-24 08:18:04 +02:00
Les Fletcher
f956759f8a fix after_initialize edge case (close #2074 and close #2175) 
fix behavior when after_initialize is defined and a block is passed to Base.create
 2011-07-24 00:31:28 -04:00
Aaron Patterson
a14f4566dd Merge pull request #2185 from castlerock/lazy_load_abstract_adapter 
lazy load ConnectionAdapters remove require.
 2011-07-23 20:51:43 -07:00
Xavier Noria
a62f450661 Merge pull request #2086 from amatsuda/date_multiparameter_nil 
convert multiple Date parameters into a nil if any of its bits were blank
 2011-07-23 11:20:12 -07:00
Santiago Pastorino
7dadb6aa0a Merge pull request #2171 from arunagw/database-rake-1.9.2 
This conditions is required to work with database create task. 1.9.2 is h
 2011-07-23 07:58:59 -07:00
Xavier Noria
ace3723d2f Merge branch 'master' of git://github.com/lifo/docrails 2011-07-23 12:15:41 +02:00
Vijay Dev
a2778861fe Fixes typo 2011-07-22 08:41:00 -07:00
Vishnu Atrai
1efd88283e lazy load ConnectionAdapters remove require. 2011-07-22 17:49:24 +05:30
Aaron Patterson
1a0b7ea3c9 adding more tests around database uri parsing 2011-07-21 12:57:05 -07:00
Arun Agrawal
fbf4bee6ed This conditions is required to work with database create task. 1.9.2 is having a bug with "Calling return within begin still executes else". 2011-07-21 09:47:42 +05:30
Glenn Gillen
1f427b5341 Add documentation for URL connection strings. 2011-07-20 16:23:31 -07:00
Glenn Gillen
16249feaab Added test for postgres connections as URL. Fixed query param parsing. 2011-07-20 16:23:31 -07:00
Glenn Gillen
89357c8f83 Provide database connection settings as a URL. 2011-07-20 16:23:31 -07:00
Aaron Patterson
22e47279bc no need to sort the values 2011-07-20 15:52:53 -07:00
Franck Verrot
8bc314b3b7 assign_nested_attributes_for_collection_association should work with Ruby 1.9 [Closes #2106] 
Children attributes can be either String's or Symbol's, so let's check if the object responds to to_i.
 2011-07-20 15:40:01 -07:00
Aaron Patterson
09a488456a bigdecimal should be typecast to a float on sqlite3. fixes #2162 2011-07-20 14:39:01 -07:00
Vijay Dev
02cbaf0593 avoid Symbol#to_proc 2011-07-20 00:28:51 +05:30
Norman Clarke
9db2d10b11 Explicitly require Active Support dependencies 
This fixes errors when using Active Record outside of Rails. In Rails,
these files are required by other classes that are always loaded, so
this error does not happen.

Without core_ext/module/delegation, a NoMethodError is raised because
`delegate` remains undefined.

Without core_ext/class/attribute_acessors, an ArgumentError is raised because
`delegate` does not receive a value for its :to option.
 2011-07-19 09:56:02 -03:00
Elliot Winkler
0e1d617b8b ActiveRecord: Fix eager loading so that giving a blank order clause generates valid SQL 2011-07-18 14:56:37 -06:00
José Valim
da144894e9 Merge pull request #195 from bigfix/active_model_include_serialization 
ActiveModel support for the :include serialization option
 2011-07-18 06:50:43 -07:00
Prem Sichanugrist
1ccca1b9cb Refactor the code a bit to reduce the duplication 2011-07-17 18:53:15 -04:00
Prem Sichanugrist
6e6994994d Raise an ArgumentError if user passing less number of argument in the dynamic finder 
The previous behavior was unintentional, and some people was relying on it. Now the dynamic finder will always expecting the number of arguments to be equal or greater (so you can still pass the options to it.)

So if you were doing this and expecting the second argument to be nil:

    User.find_by_username_and_group("sikachu")

You'll now get `ArgumentError: wrong number of arguments (1 for 2).` You'll then have to do this:

    User.find_by_username_and_group("sikachu", nil)
 2011-07-17 18:44:03 -04:00
John Firebaugh
4860143ee4 ActiveModel support for the :include serialization option 
This commit moves support for the :include serialization option for
serializing associated objects out of ActiveRecord in into ActiveModel.
The following methods support the :include option:

  * serializable_hash
  * to_json
  * to_xml

Instances must respond to methods named by the values of the :includes
array (or keys of the :includes hash). If an association method returns
an object that is_a?(Enumerable) (which AR has_many associations do), it
is assumed to be a collection association, and its elements must respond
to :serializable_hash. Otherwise it must respond to :serializable_hash
itself.

While here, fix #858, XmlSerializer should not singularize already
singular association names.
 2011-07-17 11:34:07 -07:00