aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
Commit message (Collapse)AuthorAgeFilesLines
* allow select to have multiple argumentsSławosz Sławiński2011-08-131-3/+6
|
* Revert "Explicitly included hashes in sentence regarding SQL-injection-safe ↵Xavier Noria2011-08-131-3/+3
| | | | | | | | forms" Reason: The hash form is secure, and preferred over the array form if possible. This reverts commit 6dc749596c328c44c80f898d5fa860fff6cab783.
* make the warning clear about the effect of using validates_associated on ↵Vijay Dev2011-08-131-9/+1
| | | | both sides on an association.
* Explicitly included hashes in sentence regarding SQL-injection-safe formsPete Campbell2011-07-281-3/+3
|
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-07-251-1/+1
|\
| * Fixed TypoJohn2011-07-241-1/+1
| |
* | Simplify the way default DATABASE_URL works.Glenn Gillen2011-07-251-1/+1
| |
* | Merge pull request #2236 from cldwalker/after_initializeSantiago Pastorino2011-07-251-2/+1
|\ \ | | | | | | Fix after_initialize and Base.create edge case
| * | fix after_initialize edge case (close #2074 and close #2175)Les Fletcher2011-07-241-2/+1
| | | | | | | | | | | | fix behavior when after_initialize is defined and a block is passed to Base.create
* | | Bring back the ability to provide :order for update_all.thedarkone2011-07-251-9/+5
| | |
* | | Merge pull request #2238 from cesario/order-with-extra-spacesAaron Patterson2011-07-241-0/+1
|\ \ \ | |_|/ |/| | Ordering with extra spaces was raising a SQL exception
| * | Ordering with extra spaces was raising a SQL exceptionFranck Verrot2011-07-241-0/+1
| |/
* | Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-07-241-1/+1
|\ \ | |/ |/|
| * Changed a few instances of of words in the API docs written in British ↵Oemuer Oezkir2011-07-241-1/+1
| | | | | | | | | | | | English to American English(according to Weber)
* | Merge pull request #2185 from castlerock/lazy_load_abstract_adapterAaron Patterson2011-07-232-3/+2
|\ \ | | | | | | lazy load ConnectionAdapters remove require.
| * | lazy load ConnectionAdapters remove require.Vishnu Atrai2011-07-222-3/+2
| | |
* | | Merge pull request #2086 from amatsuda/date_multiparameter_nilXavier Noria2011-07-231-3/+6
|\ \ \ | | | | | | | | convert multiple Date parameters into a nil if any of its bits were blank
| * | | convert multiple Date parameters into a nil if any of its bits were blankAkira Matsuda2011-07-151-3/+6
| | | |
* | | | Merge pull request #2171 from arunagw/database-rake-1.9.2Santiago Pastorino2011-07-231-1/+2
|\ \ \ \ | |_|_|/ |/| | | This conditions is required to work with database create task. 1.9.2 is h
| * | | This conditions is required to work with database create task. 1.9.2 is ↵Arun Agrawal2011-07-211-1/+2
| | | | | | | | | | | | | | | | having a bug with "Calling return within begin still executes else".
* | | | Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-07-231-1/+1
|\ \ \ \
| * | | | use simpler words in docsVijay Dev2011-07-101-1/+1
| | | | |
* | | | | Fixes typoVijay Dev2011-07-221-1/+1
| |_|_|/ |/| | |
* | | | adding more tests around database uri parsingAaron Patterson2011-07-211-5/+3
| | | |
* | | | Add documentation for URL connection strings.Glenn Gillen2011-07-201-0/+6
| | | |
* | | | Added test for postgres connections as URL. Fixed query param parsing.Glenn Gillen2011-07-201-1/+1
| | | |
* | | | Provide database connection settings as a URL.Glenn Gillen2011-07-201-0/+22
| | | |
* | | | no need to sort the valuesAaron Patterson2011-07-201-1/+1
| | | |
* | | | assign_nested_attributes_for_collection_association should work with Ruby ↵Franck Verrot2011-07-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | bigdecimal should be typecast to a float on sqlite3. fixes #2162Aaron Patterson2011-07-201-0/+5
| |/ / |/| |
* | | avoid Symbol#to_procVijay Dev2011-07-201-1/+1
| | |
* | | Explicitly require Active Support dependenciesNorman Clarke2011-07-191-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | ActiveRecord: Fix eager loading so that giving a blank order clause ↵Elliot Winkler2011-07-181-1/+1
| | | | | | | | | | | | generates valid SQL
* | | Merge pull request #195 from bigfix/active_model_include_serializationJosé Valim2011-07-182-81/+1
|\ \ \ | | | | | | | | ActiveModel support for the :include serialization option
| * | | ActiveModel support for the :include serialization optionJohn Firebaugh2011-07-172-81/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | We already have the record; no need to retrieve it againJohn Firebaugh2011-07-171-2/+2
| | |/ | |/|
* | | Refactor the code a bit to reduce the duplicationPrem Sichanugrist2011-07-171-17/+8
| | |
* | | Raise an ArgumentError if user passing less number of argument in the ↵Prem Sichanugrist2011-07-171-0/+10
|/ / | | | | | | | | | | | | | | | | | | | | | | | | 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)
* | Merge pull request #2063 from elight/masterSantiago Pastorino2011-07-141-1/+2
|\ \ | | | | | | Patch for https://github.com/rails/rails/issues/2059
| * | Fix and unit test for https://github.com/rails/rails/issues/2059Evan Light2011-07-141-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cache key was incorrectly using timezone-dependent record#updated_at when it should be using a timezone-independent value to generate the cache key Minor refactoring to cache_key timezone test Closes #2059 Adds a test to validate the format of the cache_key for nil and present updated_at values Correctly handles updated_at == nil
* | | Merge pull request #1807 from caius/find_in_batches_id_bugSantiago Pastorino2011-07-141-2/+5
|\ \ \ | |/ / |/| | Bugfix by stopping find_in_batches using the records after yielding.
| * | Stop find_in_batches using the records after yielding.Caius Durling2011-06-211-2/+5
| | | | | | | | | | | | | | | | | | Currently if the code that calls .find_in_batches modifies the yielded array in place then .find_in_batches can enter an infinite loop searching with ruby object ids in the database instead of the primary key of records in the database. This happens because it naively assumes the yielded array hasn't been modified before calling #id on the last object in the array. And ruby (1.8 at least) alias' #id to #object_id so an integer is still returned no matter what the last object is. By moving finding the #id of the last object before yielding the array it means the calling code can do whatever it wants to the array in terms of modifying it in place, and .find_in_batches doesn't care.
* | | Merge pull request #2042 from SAP-Oxygen/master-sqlbypass-patchSantiago Pastorino2011-07-121-7/+13
|\ \ \ | | | | | | | | Fix for SqlBypass session store (for master)
| * | | Fix for SqlBypass session storeJoseph Wong2011-07-121-7/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Two issues fixed: 1) connection_pool is not defined - needed by SessionStore#drop_table! and create_table! since c94651f 2) initialization of connection to the default of AR::Base.connection only occurred at the singleton level - the instance level method defined by cattr_accessor did not have this logic
* | | | Fixed session ID fixation for ActiveRecord::SessionStoreJoseph Wong2011-07-121-2/+6
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I have found that Rails will take an invalid session ID specified by the client and materialize a session based on that session ID. This means that it is possible, among other things, for a client to use an arbitrarily weak session ID or for a client to resurrect a previous used session ID. In other words, we cannot guarantee that all session IDs are generated by the server and that they are (statistically) unique through time. The fix is to always generate a new session ID in #get_session if an existing session cannot be found under the incoming session ID. Also added new tests that make sure that an invalid session ID is never materialized into a new session, regardless of whether it comes in via a cookie or a URL parameter (when :cookie_only => false).
* | | Fix exception if old and new targets are both nil. Fixes #1471.Jon Leighton2011-07-121-1/+1
| | |
* | | Merge pull request #1823 from gnarg/masterSantiago Pastorino2011-07-101-2/+2
|\ \ \ | | | | | | | | Log instrumentation name for exists? queries
| * | | Log instrumentation name for exists? queriesJon Guymon2011-06-221-2/+2
| | | |
* | | | to_key on a destroyed model should return nilSantiago Pastorino2011-07-091-1/+1
| | | |
* | | | fix AR having() not to raise NoMethodError when the given argument does not ↵Akira Matsuda2011-07-091-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | respond to empty? having raises NoMethodError: undefined method `empty?' when a Fixnum or Date/Time were passed via varargs
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-02 18:16:01 +0000