aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
Commit message (Collapse)AuthorAgeFilesLines
* Allow ActiveRecord::Relation merges to maintain context of joined associationsJared Armstrong2012-05-043-5/+35
|
* Fix issue with private kernel methods and collection associations. Closes #2508Carlos Antonio da Silva2012-05-021-2/+2
| | | | | | | | Change CollectionProxy#method_missing to use scoped.public_send, to avoid a problem described in issue #2508 when trying to use class methods with names like "open", that clash with private kernel methods. Also changed the dynamic matcher instantiator to send straight to scoped, to avoid another roundtrip to method_missing.
* Use arel nodes instead of raw sqlMarcelo Silveira2012-05-022-4/+7
|
* Use Array#first instead of Array#[0]Marcelo Silveira2012-05-021-5/+5
|
* Introducing `take` as a replacement to the old behavior of `first`Marcelo Silveira2012-05-022-1/+28
|
* Document `last`, check for primary key on default order and use quoted table ↵Marcelo Silveira2012-05-021-2/+5
| | | | and column names
* Made `first` finder consistent among database engines by adding aMarcelo Silveira2012-05-021-2/+18
| | | | default order clause (fixes #5103)
* Refactored remove_columnEdgars Beigarts2012-05-023-4/+2
|
* Merge pull request #6089 from frodsan/delete_all_limitAaron Patterson2012-05-011-0/+2
|\ | | | | delete_all raise an error if a limit is provided - fixes #4979
| * delete_all raise an error if a limit is provided - fixes #4979Francesco Rodriguez2012-04-301-0/+2
| |
* | Merge pull request #6092 from ↵Aaron Patterson2012-05-011-1/+1
|\ \ | | | | | | | | | | | | jsanders/issue_4001_error_typecasting_non_integer_castable Don't type cast values that don't respond to to_i to 1
| * | Don't type cast values that don't respond to to_i to 1James Sanders & Jason Noble2012-04-301-1/+1
| |/
* | more edits [ci skip]Vijay Dev2012-05-011-1/+1
| |
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-012-10/+11
|\ \
| * | add ActiveRecord::RecordInvalid to exceptionsHrvoje Šimić2012-04-301-9/+10
| | | | | | | | | | | | sort the exception names alphabetically
| * | More using <tt>x</tt> instead of +x+ when the latter renders improperly.Mark Rushakoff2012-04-271-1/+1
| | |
* | | return value of block is returnedAaron Patterson2012-04-301-2/+5
| | |
* | | only yield to finder block if something is foundAaron Patterson2012-04-301-1/+1
| | |
* | | Fix PR #6091Andrew White2012-04-301-1/+1
| | | | | | | | | | | | | | | | | | 1. ActiveRecord::Base is not ActiveRecord::Relation 2. The order of records from an SQL query is uncertain without an ORDER clause 3. Run your own tests when submitting a pull request
* | | Add ActiveRecord::Base#idstwinturbo2012-04-301-0/+10
| |/ |/|
* | Merge pull request #6074 from mark-rushakoff/unused-variablesJeremy Kemper2012-04-291-5/+3
|\ \ | | | | | | Remove some unused variable assignments
| * | Remove unused assignmentsMark Rushakoff2012-04-291-5/+3
| |/
* | Removed extraneous .present? check for AR::Base#reloadJeremy Friesen2012-04-291-1/+1
| |
* | Removed deprecation warning for #find as a result of AR::Base#reloadJeremy Friesen2012-04-291-1/+7
|/ | | | | Cleaned up "DEPRECATION WARNING: Passing options to #find is deprecated. Please build a scope and then call #find on it."
* Merge pull request #5698 from dougcole/support_postgresql_partitioningAaron Patterson2012-04-273-9/+44
|\ | | | | Support postgresql partitioning by making INSERT RETURNING optional
| * refactor configuration of insert_returningDoug Cole2012-04-071-14/+4
| |
| * pick better names and add a little documentationDoug Cole2012-04-011-8/+16
| |
| * refactorDoug Cole2012-03-311-13/+8
| |
| * update mysql for new exec_insert signatureDoug Cole2012-03-311-1/+1
| |
| * add use_returning as a postgresql connection configDoug Cole2012-03-312-6/+48
| |
* | Revert "Merge pull request #5995 from kennyj/fix_5847-3"José Valim2012-04-271-5/+0
| | | | | | | | | | | | | | | | Active Record should be lazy loaded and this pull request forced Active Record to always be loaded after initialization. This reverts commit 8cd14c0bc9f9429f03d1181912355d2f48b98157, reversing changes made to 2f0c8c52e66f1a2a3d1c00efc207f227124e96c2.
* | allow AssociationProxy#scoped to take options so that API is the same as ↵Jon Leighton2012-04-271-2/+6
| | | | | | | | Base#scoped
* | %s/find(:\(first\|last\|all\), \([^()]*\))/scoped(\2).\1/gcI amongst other ↵Jon Leighton2012-04-271-1/+1
| | | | | | | | things
* | fix tests for SQLite3AdapterAndrey Deryabin2012-04-271-1/+0
| |
* | renamed class SQLiteColumn to SQLite3ColumnAndrey Deryabin2012-04-271-3/+3
| |
* | removed tail of old sqlite versionsAndrey Deryabin2012-04-271-9/+9
| |
* | fix SQLite3Adapter docAndrey Deryabin2012-04-271-2/+2
| |
* | Upgrade sqlite3 version to 1.3.6Andrey Deryabin2012-04-271-1/+1
| |
* | merged sqlite and sqlite3 adaptersAndrey Deryabin2012-04-272-546/+538
| |
* | EXPLAIN only for sqlite3Andrey Deryabin2012-04-262-24/+25
| |
* | Merge pull request #5995 from kennyj/fix_5847-3Jon Leighton2012-04-261-0/+5
|\ \ | | | | | | Fix #5847 and #4045. Load AR::Base before loading an application model.
| * | Fix #5847 and #4045. Load AR::Base before loading an application model.kennyj2012-04-261-0/+5
| | |
* | | remove deprecate #update_all usageJon Leighton2012-04-262-3/+3
|/ /
* | Merge pull request #5973 from academia-edu/masterAaron Patterson2012-04-251-2/+1
|\ \ | | | | | | Always quote hstore keys and values
| * | Restore .to_s to escape_hstoreRyan Fitzgerald2012-04-241-1/+1
| | |
| * | Always quote hstore keys and valuesRyan Fitzgerald2012-04-241-2/+1
| | | | | | | | | | | | | | | | | | | | | escape_hstore uses quotation marks around keys and values only if it seems necessary. However, it currently breaks in the presence of some non-ASCII characters. Instead of trying to guess exactly which characters are safe, it seems better to always use quotes.
* | | Merge remote-tracking branch 'jmbejar/define_array_methods_collection_proxy'Jon Leighton2012-04-251-0/+13
|\ \ \
| * | | Define array methods in ActiveRecord::Associations::CollectionProxyJorge Bejar2012-04-181-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | if they are not defined or delegated. In this way, we have a performance boost invoking some array methods which are not defined in CollectionAssociation.
* | | | Merge remote-tracking branch 'kennyj/fix_5563'Jon Leighton2012-04-254-4/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/test/cases/associations/belongs_to_associations_test.rb
| * | | | Fix #5563. Should reflect the most recent change to either of association / id.kennyj2012-04-131-1/+2
| | | | |