aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-12-293-11/+4
|\
| * typoJo Liss2011-12-281-1/+1
| |
| * Document that index names are made up of all columns, not just the first.Jo Liss2011-12-271-9/+2
| | | | | | | | | | | | | | | | | | | | | | 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.
| * Remove unnecessary comma.Uģis Ozols2011-12-261-1/+1
| |
* | Deprecate implicit eager loading. Closes #950.Jon Leighton2011-12-296-5/+19
| |
* | Merge pull request #4216 from edgecase/master_fix_reorder_with_limited_idsAaron Patterson2011-12-281-1/+1
|\ \ | | | | | | allow reorder to affect eager loading correctly
| * | allow reorder to affect eager loading correctlyMatt Jones + Scott Walker2011-12-281-1/+1
| | |
* | | app code in general wants Time.current, not Time.nowXavier Noria2011-12-281-3/+3
| | |
* | | Merge pull request #4222 from amatsuda/ar_predicate_builder_refactorAaron Patterson2011-12-281-35/+37
|\ \ \ | | | | | | | | refactor AR::PredicateBuilder.build_from_hash
| * | | refactor AR::PredicateBuilder.build_from_hashAkira Matsuda2011-12-291-35/+37
| | | |
* | | | Delete some stray linesJon Leighton2011-12-282-3/+0
|/ / /
* | | Avoid deprecation warningJon Leighton2011-12-281-1/+1
| | |
* | | Support establishing connection on ActiveRecord::Model.Jon Leighton2011-12-2815-216/+219
| | | | | | | | | | | | | | | This is the 'top level' connection, inherited by any models that include ActiveRecord::Model or inherit from ActiveRecord::Base.
* | | Support configuration on ActiveRecord::Model.Jon Leighton2011-12-2818-180/+190
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem: We need to be able to specify configuration in a way that can be inherited to models that include ActiveRecord::Model. So it is no longer sufficient to put 'top level' config on ActiveRecord::Base, but we do want configuration specified on ActiveRecord::Base and descendants to continue to work. So we need something like class_attribute that can be defined on a module but that is inherited when ActiveRecord::Model is included. The solution: added ActiveModel::Configuration module which provides a config_attribute macro. It's a bit specific hence I am not putting this in Active Support or making it a 'public API' at present.
* | | Merge pull request #4213 from amatsuda/ar_where_array_of_nil_and_a_valueJon Leighton2011-12-281-2/+5
|\ \ \ | |/ / |/| | AR#where with an Array of 2 elements including a nil
| * | where(foo: [1, nil]) becomes "WHERE foo = 1 OR foo IS NULL"Akira Matsuda2011-12-281-1/+4
| | | | | | | | | | | | was "WHERE foo IN (1) OR foo IS NULL" before
| * | no need to compact an already compacted ArrayAkira Matsuda2011-12-281-1/+1
| | |
* | | Merge pull request #4153 from ↵Jon Leighton2011-12-281-2/+2
|\ \ \ | |/ / |/| | | | | | | | alexeymuranov/my_fix_for_prefix_suffix_fixtures_test Fix a fixtures test case with table prefix/suffix
| * | Use the correct table name from fixtureAlexey Muranov2011-12-281-2/+2
| |/ | | | | | | Fixed a bug in fixtures.rb where the table name was incorrectly inferred from the fixture path which was ambiguously called "table_name" but was also used as the fixture name. Now, the "correct" table name is taken from an instance variable.
* / Revert "This conditions is required to work with database create task. 1.9.2 ↵Arun Agrawal2011-12-271-2/+1
|/ | | | | | | is having a bug with "Calling return within begin still executes else". " No need to worry about 1.9.2 with master This reverts commit fbf4bee6ed3682b361d6fbeca8e185e665e26b81.
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-12-251-3/+3
|\
| * Clarify what persisted? returns.Uģis Ozols2011-12-251-2/+2
| |
| * Remove extra 'be'.Uģis Ozols2011-12-251-1/+1
| |
* | remove checks for encodings availabilitySergey Nartimov2011-12-252-47/+43
| |
* | Intercept sends in Model::DeprecationProxyJon Leighton2011-12-241-0/+2
| |
* | deprecate String#encoding_aware? and remove its usageSergey Nartimov2011-12-241-17/+9
| |
* | Fix position of load hook so that Base has been defined and included Model ↵Jon Leighton2011-12-242-3/+6
| | | | | | | | before it runs
* | Add some doc for ActiveRecord::ModelJon Leighton2011-12-241-0/+7
| |
* | Add deprecation for the change to the active_record load hookJon Leighton2011-12-241-1/+24
| |
* | Support nested AR::ModelsJon Leighton2011-12-241-1/+1
| |
* | auto_explain_threshold_in_seconds should be a global config option so it can ↵Jon Leighton2011-12-241-8/+3
| | | | | | | | be shared between AR::Base and AR::Model
* | Don't include anything else if AR::Model has already been includedJon Leighton2011-12-241-0/+2
| |
* | Make PredicateBuilder recognise AR::ModelJon Leighton2011-12-241-2/+2
| |
* | Ensure attribute methods are included after all the AR stuffJon Leighton2011-12-242-2/+2
| |
* | Fix #exists? for AR::ModelJon Leighton2011-12-241-1/+1
| |
* | Make generated_feature_methods work with ActiveRecord::ModelJon Leighton2011-12-241-4/+9
| |
* | Fixtures support for ActiveRecord::ModelJon Leighton2011-12-241-1/+1
| |
* | Deal with global config better between AR::Base and AR::ModelJon Leighton2011-12-248-83/+110
| |
* | Extract common logic into a methodJon Leighton2011-12-245-28/+30
| |
* | I herd you like modules.Jon Leighton2011-12-2411-70/+99
| |
* | Start work towards making AR include-able.Jon Leighton2011-12-243-369/+388
| |
* | Merge pull request #4149 from castlerock/remove_1.8_stuffJosé Valim2011-12-241-7/+0
|\ \ | | | | | | remove ruby 1.8 stuff method skip to support ruby 1.8 series
| * | remove ruby 1.8 stuff skip hack from ARVishnu Atrai2011-12-231-7/+0
| | |
* | | Fix situation where id method didn't get defined causing postgres to failJon Leighton2011-12-231-4/+3
| |/ |/|
* | Doh, remove debugging lineJon Leighton2011-12-231-1/+0
| |
* | Fix #4046.Jon Leighton2011-12-232-46/+36
|/
* Reconnect to the first database after db:createTsutomu Kuroda2011-12-231-0/+1
| | | | | Otherwise, the schema and seed will be loaded onto the test database.
* Fix build when IM=trueJon Leighton2011-12-221-4/+3
|
* Delete unnecessary line that was necessary before I changed the code and it ↵Jon Leighton2011-12-221-1/+0
| | | | became no longer necessary.
* removes some unnecessary selfsXavier Noria2011-12-201-3/+3
|
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 22:42:11 +0000