aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Expand)AuthorAgeFilesLines
* Fixed grammarFred Wu2014-05-061-1/+1
* refactor and clean up delete_all methodeileencodes2014-05-051-9/+1
* Add support for module-level table_suffix in modelsJenner LaFave2014-05-054-1/+63
* Improve CHANGELOG entry [ci skip]Rafael Mendonça França2014-05-051-3/+3
* Merge pull request #14978 from bogdan/relation-joinRafael Mendonça França2014-05-055-2/+17
|\
| * Put back Relation#join method as a delegate to ArrayBogdan Gusiev2014-05-055-2/+17
* | 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
* 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.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
* | 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
* | Merge pull request #14940 from arunagw/hbakhtiyor-test-db-namespaces-arYves Senn2014-05-031-95/+107
|\ \
| * | 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
|/ /
* | Merge pull request #14952 from gregmolnar/schema_loadYves Senn2014-05-031-1/+1
|\ \
| * | 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
* | | Merge pull request #14924 from eric-chahin/issue_13854Matthew Draper2014-05-035-1/+31
|\ \ \
| * | | Fixed custom validation context bug where childEric Chahin2014-05-015-1/+31
* | | | 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
| |/ / |/| |
* | | push up bind params on "simple" subquery calculationsAaron Patterson2014-05-022-3/+11
| |/ |/|
* | 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
|\ \
| * | Stringify variables names for mysql connectionsPaul Nikitochkin2014-04-304-5/+30
| |/
* | 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.Timur Alperovich2014-01-153-3/+27
* | | 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 eileencodes/fix-delete-all-with-nil-dependency...Aaron Patterson2014-04-284-8/+18
|\ \
| * | add test to check that loaded and non laoded are the sameeileencodes2014-04-281-0/+13
| * | clear shouldnt fire callbacks so remove order testeileencodes2014-04-281-3/+0
| * | rewrite test to correctly test clear methodeileencodes2014-04-281-2/+2
| * | flip conditional in delete_all to handle nullify bettereileencodes2014-04-281-3/+3
* | | Merge pull request #14139 from anilmaurya/masterYves Senn2014-04-281-0/+6
|\ \ \ | |/ / |/| |
| * | [ci skip] updating active_record/associations to demonstrate where conflict w...anilmaurya2014-04-291-0/+6
* | | simplify the delete all w/ dependency methodeileencodes2014-04-281-3/+3
* | | remove unnecessary code from delete methodeileencodes2014-04-281-10/+2
* | | write a new method to be accessed from delete_alleileencodes2014-04-281-1/+9