aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
Commit message (Collapse)AuthorAgeFilesLines
* set a constant for the "anonymous" habtm model fixes #15022Aaron Patterson2014-05-081-0/+5
| | | | | I wanted the middle model to be anonymous, but we have to give it a name for marshal support. :'(
* Fixed HABTM's CollectionAssociation sizeFred Wu2014-05-081-1/+1
| | | | | HABTM should fall back to using the normal CollectionAssociation's size calculation if the collection is not cached or loaded. This addresses both #14913 and #14914 for master.
* Dup the changed_attributes otherwise we could lose themArthur Neves2014-05-071-1/+1
|
* Return a non zero code when db has never been setup on statusPaul B2014-05-071-2/+1
|
* Keep track of dirty attrs after after rollback.Arthur Neves2014-05-072-2/+1
| | | | [related #13166]
* Merge pull request #13166 from bogdan/transaction-magicRafael Mendonça França2014-05-072-1/+6
|\ | | | | | | [Regression 3.2 -> 4.0] Fix bugs with changed attributes tracking when transaction gets rollback
| * Fix bugs with changed attributes tracking when transaction gets rollbackBogdan Gusiev2013-12-042-1/+6
| |
* | Follow-up to #14990 [ci skip]Jon Atack2014-05-071-10/+9
| | | | | | | | | | | | | | | | Rewrite to avoid 'we'/'you', add missing period, and keep lines at 80 chars. Cheers :) Improve readability with help from @senny [ci skip]
* | Merge pull request #14982 from eric-chahin/GBV_refactorRafael Mendonça França2014-05-062-8/+6
|\ \ | | | | | | Refactored AssociationScope#get_bind_values
| * | Refactor AssociationScope#get_bind_valuesEric Chahin2014-05-052-8/+6
| | | | | | | | | | | | Added #join_id_for(owner) to reflection to avoid accessing the source_macro
* | | Fixed grammarFred Wu2014-05-061-1/+1
| | |
* | | refactor and clean up delete_all methodeileencodes2014-05-051-9/+1
| | | | | | | | | | | | | | | | | | | | | | | | Now that delete_all with destroy or delete_all dependency behave the same we no longer need this conditional. This means we can remove the new delete_all_with_dependency method I added and go straight to delete_records from delete_all, passing :all and the dependent directly.
* | | Add support for module-level table_suffix in modelsJenner LaFave2014-05-051-1/+10
|/ / | | | | | | | | This makes table_name_suffix work the same as table_name_prefix when using namespaced models. Pretty much the same as 67d1cec.
* | Put back Relation#join method as a delegate to ArrayBogdan Gusiev2014-05-051-1/+1
| | | | | | | | | | | | | | | | This is a regression 4.0 -> 4.1 fix. In 4.1.0 Relation#join is delegated to Arel#SelectManager. In 4.0 series it is delegated to Array#join This patch puts back the behaviour of 4.0
* | Invert the if/else clauseRafael Mendonça França2014-05-041-1/+1
| | | | | | | | The case where the value is present is more common
* | Merge pull request #14946 from jcoleman/fix-null-binary-column-logging-exceptionRafael Mendonça França2014-05-041-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Fix exception when logging SQL w/ nil binary value. Conflicts: activerecord/CHANGELOG.md
| * | Fix exception when logging SQL w/ nil binary value.James Coleman2014-05-021-1/+1
| | |
* | | Convert column name to string only onceKuldeep Aggarwal2014-05-041-1/+2
| | |
* | | Use the reader attribute rather than the instance var when possibleCarlos Antonio da Silva2014-05-041-2/+2
| | |
* | | Simplify building options hash in rename column method for mysqlCarlos Antonio da Silva2014-05-041-5/+6
| | |
* | | Get rid of conditional since column_for handles raising nowCarlos Antonio da Silva2014-05-041-7/+4
| | | | | | | | | | | | | | | column_for will raise in case column is not found for the given table, so there is no need to handle that here.
* | | Simplify unless conditional with ORCarlos Antonio da Silva2014-05-041-4/+2
| | |
* | | Convert column name to string only onceCarlos Antonio da Silva2014-05-041-1/+2
| | |
* | | refactor, move `column_for` to `AbstractAdapter` for better reuse.Yves Senn2014-05-044-17/+11
| | |
* | | Merge pull request #14952 from gregmolnar/schema_loadYves Senn2014-05-031-1/+1
|\ \ \ | | | | | | | | make `db:structure:load` listed with `rake -T`
| * | | make `db:structure:load` listed with `rake -T`Greg Molnar2014-05-021-1/+1
| | | |
* | | | docs, restructure newly added part to `includes`. [ci skip]Yves Senn2014-05-031-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | This is a follow up to #14139. /cc @carlosantoniodasilva
* | | | Merge pull request #14924 from eric-chahin/issue_13854Matthew Draper2014-05-031-1/+2
|\ \ \ \ | |/ / / |/| | | | | | | Fixed custom validation context bug for child associations
| * | | Fixed custom validation context bug where childEric Chahin2014-05-011-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | associations were not being saved. Fixes #13854. [Eric Chahin, Aaron Nelson, & Kevin Casey]
* | | | push up bind params on "simple" subquery calculationsAaron Patterson2014-05-021-2/+4
| |/ / |/| | | | | | | | | | | bind parameters we not being propogated to simple subquery calculation calls. This fixes it
* | | Merge pull request #14896 from jetthoughts/14895_overide_strict_by_sql_modeRafael Mendonça França2014-05-011-5/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Symbolize variables of mysql/mysql2 connection configuration Conflicts: activerecord/CHANGELOG.md
| * | | Stringify variables names for mysql connectionsPaul Nikitochkin2014-04-301-5/+5
| |/ / | | | | | | | | | | | | | | | | | | For mysql2/mysql adapters, `sql_mode` variable name set in `database.yml` as string, was ignored and `sql_mode` was set to use strict mode. Fixes #14895
* | | Merge pull request #13640 from maginatics/fix_sqlite3_ensure_masterRafael Mendonça França2014-05-011-3/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | SQLite3: Always close statements. Conflicts: activerecord/CHANGELOG.md
| * | | SQLite3: Always close statements.Timur Alperovich2014-01-151-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | SQLite3 adapter must make sure to close statements after queries. Fixes: #13631
* | | | Give real privacy to class methods in AR::PredicateBuilderHector Satre2014-05-011-7/+8
| |/ / |/| |
* | | cleanup, remove trailing whitespace. [ci skip]Yves Senn2014-04-291-1/+1
| | |
* | | Merge pull request #14899 from ↵Aaron Patterson2014-04-281-3/+3
|\ \ \ | | | | | | | | | | | | | | | | eileencodes/fix-delete-all-with-nil-dependency-to-not-produce-in-statement Fix delete all with nil (:nullify) dependency to not produce in statement
| * | | flip conditional in delete_all to handle nullify bettereileencodes2014-04-281-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Nullify (or nil dependency) was doing the same thing delete_all was doing in issue #14546, creating a large IN statement if the association was loaded. Loaded and not loaded associations should behave the same. The IN statement is also not great because it's inefficient.
* | | | Merge pull request #14139 from anilmaurya/masterYves Senn2014-04-281-0/+6
|\ \ \ \ | |/ / / |/| | | [ci skip] updating active_record/associations to demonstrate where conflict with eager loading.
| * | | [ci skip] updating active_record/associations to demonstrate where conflict ↵anilmaurya2014-04-291-0/+6
| | | | | | | | | | | | | | | | with eager loading.
* | | | simplify the delete all w/ dependency methodeileencodes2014-04-281-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | After reviewing this code I realized the conditional that was there previously was basically saying if the dependency is not delete all. This is a better, cleaner, and clearer way to write this method.
* | | | remove unnecessary code from delete methodeileencodes2014-04-281-10/+2
| | | | | | | | | | | | | | | | | | | | Now that we have a new method delete_all_with_dependency this coupled conditional is no longer needed.
* | | | write a new method to be accessed from delete_alleileencodes2014-04-281-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | The delete method is very coupled with delete all even though only a portion of the conditionals apply. Decoupling this will make the code easier to understand and manipulate.
* | | | Merge pull request #14853 from kassio/kb-fix-custom-join-table-habtmYves Senn2014-04-252-2/+2
|\ \ \ \ | | | | | | | | | | Fix to use custom join table in habtm
| * | | | Fix custom join_table name on habtm reflectionsKassio Borges2014-04-252-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When used a custom join_table name on a habtm, rails was not saving it on Reflections. This causes a problem when rails loads fixtures, because it uses the reflections to set database with fixtures.
* | | | | Merge branch 'master' into adequaterecordAaron Patterson2014-04-259-16/+33
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (28 commits) move AR length validation tests into separate test-case. No need for trailing slash on migration path. reset `@arel` when modifying a Relation in place. PostgreSQL Timestamps always map to `:datetime`. [ci skip] Improve formatting and yml Fix a typo in the doc of forty_two AR FinderMethod Improve readability of contributing to rails guide. [ci skip] Precompile the image we're referencing, too. `ActiveRecord::Base.no_touching` no longer triggers callbacks or start empty transactions. Fixed an issue with migrating legacy json cookies. Correct comment [ci skip] Perfer to define methods instead of calling test Fix syntax error Add CHANGELOG entry for #14757 [ci skip] Fix run-on sentences and improve grammar [skip ci] Add test for using ActionView::Helpers::FormHelper.label with block and html select! renamed to avoid name collision Array#select! Rearrange deck chairs on the titanic. Organize connection handling test cases. Change favicon_link_tag helper mimetype from image/vnd.microsoft.icon to image/x-icon. ActionController::Renderers documentation fix ...
| * | | | reset `@arel` when modifying a Relation in place.Yves Senn2014-04-242-1/+13
| | | | | | | | | | | | | | | | | | | | /cc @tenderlove
| * | | | PostgreSQL Timestamps always map to `:datetime`.Jefferson Lai2014-04-241-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The PG Adapter should use `:datetime` consistently instead of mapping mispellings to `:timestamp`. See #14513
| * | | | Fix a typo in the doc of forty_two AR FinderMethodEric Bouchut2014-04-241-1/+1
| | | | |
| * | | | `ActiveRecord::Base.no_touching` no longer triggers callbacks or start empty ↵Lucas Mazza2014-04-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | transactions. Closes #14841.
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-18 09:31:34 +0000