aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
* Relation#from to accept other Relation objectsRadoslav Stankov2012-05-175-7/+51
| | | | Record.from("(#{sub_query.to_sql})") -> Record.from(sub_query) Record.from("(#{sub_query.to_sql}) a") -> Record.from(sub_query, :a)
* assuming there is only one column, we can simplify the type cast loopAaron Patterson2012-05-161-7/+6
|
* MySQL returns "SUM(DISTINCT(credit_limit))" as the column name unlessAaron Patterson2012-05-162-5/+16
| | | | | an alias is provided. Without the alias, the column cannot be found and properly typecast.
* Merge pull request #6136 from mhfs/sqlbypass_fixesAaron Patterson2012-05-162-5/+15
|\ | | | | Bring SqlByPassTest to light and fix broken tests
| * Rename test file so that the test suite matches it, implement `persisted?` ↵Marcelo Silveira2012-05-162-5/+15
| | | | | | | | for SqlBypass as expected by tests and convert session_id to string before using on queries to get correct quotes on postgresql (avoid casting error).
* | Merge pull request #6349 from erichmenge/patch-raise-type-errorsAaron Patterson2012-05-164-7/+34
|\ \ | | | | | | Integer limit out of range should be allowed to raise. Closes #6272
| * | Integer limit out of range should be allowed to raise. Closes #6272Erich Menge2012-05-164-7/+34
| |/
* | Merge pull request #6336 from erichmenge/patch-pluck-fragmentCarlos Antonio da Silva2012-05-162-8/+6
|\ \ | | | | | | Fixes issue where SQL fragments prevented type casting based on column
| * | Fixes issue where SQL fragments prevented type casting based on column type.Erich Menge2012-05-162-8/+6
| |/
* | Remove unneeded testsPiotr Sarnacki2012-05-161-12/+0
| |
* | Merge pull request #6347 from avakhov/ar-changelog-misprintVijay Dev2012-05-151-1/+1
|\ \ | | | | | | Fix misprint in AR changelog
| * | Fix misprint in AR changelogAlexey Vakhov2012-05-161-1/+1
| | |
* | | Merge pull request #6344 from erichmenge/patch_sqlite_time_typePiotr Sarnacki2012-05-154-4/+16
|\ \ \ | |/ / |/| | SQLite3 doesn't actually support the 'time' type.
| * | SQLite3 doesn't actually support the 'time' type.Erich Menge2012-05-154-4/+16
| |/
* / Remove useless check of adapterOscar Del Ben2012-05-151-4/+0
|/
* Remove unnecessary calls to primary_key on sqlite3_adapterCarlos Galdino2012-05-151-1/+1
|
* Merge pull request #6325 from kennyj/fix_5832-3Carlos Antonio da Silva2012-05-151-5/+1
|\ | | | | Remove unnecessary assertions.
| * Remove unnecessary assertions. We should only test the before_seq isn't same ↵kennyj2012-05-161-5/+1
| | | | | | | | to the after_seq when using sequencer.
* | Expand and improve #pluck docsJeremy Kemper2012-05-151-6/+27
| |
* | Restore support for Model.pluck('sql fragment')Jeremy Kemper2012-05-152-1/+10
| |
* | corrected some misspellingAngelo capilleri2012-05-151-3/+3
|/
* Remove extra `end` in arel_table docs. [ci skip]Carlos Antonio da Silva2012-05-151-8/+6
| | | | Introduced in 7ecfe3d30ccfaee8dcca4ee649cc006c090bdfb4
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-151-0/+8
|\ | | | | | | | | Conflicts: actionpack/lib/action_view/helpers/asset_tag_helper.rb
| * Add documentation for arel_tableOscar Del Ben2012-05-141-0/+8
| |
* | Set the primary key during #copy_table if necessary. Fixes [#2312]Sean Scally2012-05-142-1/+13
| |
* | MySQL doesn't allow default values for blobs.Rafael Mendonça França2012-05-131-2/+2
| |
* | Copy edit [ci skip]Rafael Mendonça França2012-05-132-3/+5
| |
* | Merge pull request #5807 from Antiarchitect/store-improvementRafael Mendonça França2012-05-135-6/+55
|\ \ | | | | | | Custom coders support for ActiveRecord::Store.
| * | Custom coders support for ActiveRecord::Store. JSON, YAML, Marshal can be ↵Andrey Voronkov2012-05-095-6/+55
| | | | | | | | | | | | used out of the box.
* | | fix todo: use minitest skip instead of return nilFrancesco Rodriguez2012-05-131-9/+8
| | |
* | | Merge pull request #6193 from mhfs/fix_oracle_specRafael Mendonça França2012-05-121-1/+1
|\ \ \ | | | | | | | | Fix failing AR test on Oracle
| * | | Fix failing test on Oracle. Having a duplicated column specified in aMarcelo Silveira2012-05-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | select with order on the same column makes Oracle complain about "column ambiguously defined" when an order is defined on such column (introduced by default order on `first`) (fixes #6147).
* | | | fixes a nodoc which swallowed the documentation for the rest of the methods ↵Vijay Dev2012-05-121-2/+1
| | | | | | | | | | | | | | | | [ci skip]
* | | | Merge pull request #6285 from ↵Vijay Dev2012-05-121-1/+1
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | acapilleri/missplelling_error_in_abstract_mysql_adapter missplelling error in abstract_mysql_adapter
| * | | missplelling error in abstract_mysql_adapterAngelo Capilleri2012-05-121-1/+1
| | | |
* | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-123-6/+28
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: activesupport/lib/active_support/callbacks.rb
| * | | | copy edits [ci skip]Vijay Dev2012-05-121-4/+1
| | | | |
| * | | | Better document the difference between #clone and #dup.Erich Menge2012-05-111-1/+26
| | | | | | | | | | | | | | | | | | | | | | | | | Add #nodoc to initialize_dup and use :method: to document the #dup method. Relates to issue #6235
| * | | | better wordingHrvoje Šimić2012-05-111-4/+4
| | | | |
| * | | | missing 'with'Hrvoje Šimić2012-05-111-1/+1
| | |_|/ | |/| |
* | | | s/wether/whether [ci skip]Vijay Dev2012-05-121-1/+1
| | | |
* | | | mispelling errors in render_text_test.rb and sqlite_specific_schemaangelo giovanni capilleri2012-05-121-1/+1
| | | |
* | | | Remove #=== quirkJon Leighton2012-05-113-17/+0
| | | | | | | | | | | | | | | | Makes it consistent with Relation. Can't see a use for this.
* | | | Lazy load I18nSantiago Pastorino2012-05-111-2/+3
| | | |
* | | | this stuff can all be handled by RelationJon Leighton2012-05-111-38/+0
| | | |
* | | | extract deprecated codeJon Leighton2012-05-111-8/+1
| | | |
* | | | set_owner_attributes is covered by the scopingJon Leighton2012-05-111-4/+3
| | | |
* | | | CollectionProxy < RelationJon Leighton2012-05-1111-60/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This helps bring the interfaces of CollectionProxy and Relation closer together, and reduces the delegation backflips we need to perform. For example, first_or_create is defined thus: class ActiveRecord::Relation def first_or_create(...) first || create(...) end end If CollectionProxy < Relation, then post.comments.first_or_create will hit the association's #create method which will actually add the new record to the association, just as post.comments.create would. With the previous delegation, post.comments.first_or_create expands to post.comments.scoped.first_or_create, where post.comments.scoped has no knowledge of the association.
* | | | Return false for exists? with new records - fixes #6199.Andrew White2012-05-103-2/+3
| | | |
* | | | remove unnecessary 'examples' noise [ci skip]Vijay Dev2012-05-112-28/+18
| | | |