aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #14978 from bogdan/relation-joinRafael Mendonça França2014-05-055-2/+17
|\ | | | | | | [Regression 4.0 -> 4.1] Put back Relation#join method as a delegate to Array
| * Put back Relation#join method as a delegate to ArrayBogdan Gusiev2014-05-055-2/+17
| | | | | | | | | | | | | | | | 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
* | Get rid of unused method in AR Post test modelCarlos Antonio da Silva2014-05-051-4/+0
|/
* Arel master is 6.0.0Rafael Mendonça França2014-05-051-1/+1
|
* 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-043-1/+20
|\ | | | | | | | | | | | | 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-023-1/+20
| |
* | 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
| |
* | Revert "Merge pull request #14940 from arunagw/hbakhtiyor-test-db-namespaces-ar"Yves Senn2014-05-031-107/+95
| | | | | | | | | | This reverts commit fe9859600824268ff614cb3eb48b62c7165a1fbd, reversing changes made to add9560643ef79830febf47fa1228752d1df3502.
* | Merge pull request #14940 from arunagw/hbakhtiyor-test-db-namespaces-arYves Senn2014-05-031-95/+107
|\ \ | | | | | | Reorganize ActiveRecord's rake tasks
| * | Reorganize ActiveRecord tasks [Arun Agrawal & Abd ar-Rahman Hamidi]Arun Agrawal2014-05-031-95/+107
| | |
* | | Remove duplicated fixture additionCarlos Antonio da Silva2014-05-031-1/+1
| | |
* | | Refactor test to not care about the specific result of valid?Carlos Antonio da Silva2014-05-031-3/+4
|/ / | | | | | | | | | | Only care about its truthiness rather than asserting specific true/false values. If we need to check for the return value in particular, there will be a test for that.
* | 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-035-1/+31
|\ \ \ | | | | | | | | | | | | Fixed custom validation context bug for child associations
| * | | Fixed custom validation context bug where childEric Chahin2014-05-015-1/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | associations were not being saved. Fixes #13854. [Eric Chahin, Aaron Nelson, & Kevin Casey]
* | | | Test typecasting on instance rather than class itselfAkshay Vishnoi2014-05-031-1/+1
| | | |
* | | | Add missing require to fix test :bomb:Carlos Antonio da Silva2014-05-021-0/+1
| | | |
* | | | Move dup destroyed test to specific file that tests dup logicCarlos Antonio da Silva2014-05-022-9/+10
| |/ / |/| | | | | | | | | | | Also change other related test to use existing record rather than creating new one.
* | | push up bind params on "simple" subquery calculationsAaron Patterson2014-05-022-3/+11
| |/ |/| | | | | | | bind parameters we not being propogated to simple subquery calculation calls. This fixes it
* | Enhance a bit a few changelog entries [ci skip]Robin Dupret2014-05-021-6/+6
| |
* | Merge pull request #14896 from jetthoughts/14895_overide_strict_by_sql_modeRafael Mendonça França2014-05-014-5/+30
|\ \ | | | | | | | | | | | | | | | | | | Symbolize variables of mysql/mysql2 connection configuration Conflicts: activerecord/CHANGELOG.md
| * | Stringify variables names for mysql connectionsPaul Nikitochkin2014-04-304-5/+30
| |/ | | | | | | | | | | | | 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
* | Remove unused variableRafael Mendonça França2014-05-011-1/+1
| |
* | Merge pull request #13640 from maginatics/fix_sqlite3_ensure_masterRafael Mendonça França2014-05-013-3/+27
|\ \ | | | | | | | | | | | | | | | | | | SQLite3: Always close statements. Conflicts: activerecord/CHANGELOG.md
| * | SQLite3: Always close statements.Timur Alperovich2014-01-153-3/+27
| | | | | | | | | | | | | | | | | | SQLite3 adapter must make sure to close statements after queries. Fixes: #13631
* | | Give real privacy to class methods in AR::PredicateBuilderHector Satre2014-05-012-7/+12
| |/ |/|
* | cleanup, remove trailing whitespace. [ci skip]Yves Senn2014-04-291-1/+1
| |
* | Merge pull request #14899 from ↵Aaron Patterson2014-04-284-8/+18
|\ \ | | | | | | | | | | | | eileencodes/fix-delete-all-with-nil-dependency-to-not-produce-in-statement Fix delete all with nil (:nullify) dependency to not produce in statement
| * | add test to check that loaded and non laoded are the sameeileencodes2014-04-281-0/+13
| | | | | | | | | | | | | | | | | | | | | Test checks that SQL is the same for a loaded vs not loaded association (category.categorizations, category.categorization.delete_all vs category.cartegroization.delete_al). This was fixed for delete_all dependency but was not fixed for no (:nullify, or nil) dependency).
| * | clear shouldnt fire callbacks so remove order testeileencodes2014-04-281-3/+0
| | | | | | | | | | | | | | | | | | Since clear shouldn't fire callbacks the order doesn't matter since it was never updated. Remove the portion of this test that tests for order after clear.
| * | rewrite test to correctly test clear methodeileencodes2014-04-281-2/+2
| | | | | | | | | | | | | | | | | | | | | Clear should not call callbacks because it clear calls delete_all and then returns self. It should behave the same as delete_all. This test clarifies the goal of the test and tests the correct outcome.
| * | 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-254-2/+15
|\ \ \ | | | | | | | | Fix to use custom join table in habtm
| * | | Fix custom join_table name on habtm reflectionsKassio Borges2014-04-254-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | 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-2522-314/+416
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 ...
| * | | move AR length validation tests into separate test-case.Yves Senn2014-04-242-42/+48
| | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/test/cases/validations/association_validation_test.rb
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-01 21:15:49 +0000