aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into adequaterecordAaron Patterson2014-01-1626-100/+168
|\
| * Merge branch 'ca-touch-commit-callbacks'Carlos Antonio da Silva2014-01-166-11/+80
| |\
| | * Make AR::Base#touch fire the after_commit and after_rollback callbacksHarry Brundage2014-01-165-2/+71
| | * Fix test for cache_key + touchedCarlos Antonio da Silva2014-01-161-9/+9
| |/
| * Revert "methods are defined right after the module_eval, so we don't need to do"Piotr Sarnacki2014-01-161-2/+2
| * Revert "Don't remove trailing slash from PATH_INFO for mounted apps"Piotr Sarnacki2014-01-163-18/+1
| * Add failing test for #13369Piotr Sarnacki2014-01-161-0/+18
| * Merge branch 'fix_order_dependent_tests_in_active_record_suite'Yves Senn2014-01-168-43/+45
| |\
| | * reset column information after fiddling with `Encoding.default_internal`Yves Senn2014-01-161-0/+1
| | * we have `with_env_tz` as global test helper. Remove duplicate.Yves Senn2014-01-162-14/+0
| | * isolate class attribute assignment in `migration_test.rb`Yves Senn2014-01-161-22/+33
| | * use `teardown` for cleanup, not `setup`.Yves Senn2014-01-161-5/+2
| | * tests without transactional fixtures need to cleanup afterwards.Yves Senn2014-01-161-0/+7
| | * no need to `return skip` in tests. `skip` is enough.Yves Senn2014-01-164-4/+4
| |/
| * methods are defined right after the module_eval, so we don't need to doAaron Patterson2014-01-151-2/+2
| * Get rid of unused TransactionError constantCarlos Antonio da Silva2014-01-151-3/+0
| * Avoid converting :on option to array twice when defining commit/rollback call...Carlos Antonio da Silva2014-01-151-3/+2
| * Unify changelog entries about single quotes [ci skip]Carlos Antonio da Silva2014-01-151-5/+1
| * Merge pull request #13713 from chulkilee/use-single-quotesCarlos Antonio da Silva2014-01-158-20/+24
| |\
| | * Use single quotes in generated filesChulki Lee2014-01-148-20/+24
* | | use a params hash so we know what bind parameters are usedAaron Patterson2014-01-153-25/+65
* | | use edge arelAaron Patterson2014-01-151-0/+1
* | | some databases do not have bind params (mysql2) so take that in to accountAaron Patterson2014-01-141-2/+6
* | | fix exception translationAaron Patterson2014-01-142-3/+4
* | | Merge branch 'master' into set_bindsAaron Patterson2014-01-142-15/+2
|\| |
| * | rm dup codeAaron Patterson2014-01-141-13/+0
* | | test bind value equalityAaron Patterson2014-01-141-2/+2
* | | translate exceptions on prepared statement failureAaron Patterson2014-01-142-6/+13
* | | reorder bind indexes if joins produced bind valuesAaron Patterson2014-01-141-0/+9
* | | expliticly make STI column a bind valueAaron Patterson2014-01-141-4/+9
* | | Merge branch 'master' into set_bindsAaron Patterson2014-01-142-8/+7
|\| |
| * | directly create the ARel ASTAaron Patterson2014-01-141-6/+4
| * | Updated comment to mention the enum mapping class method [ci skip]Godfrey Chan2014-01-141-2/+3
* | | take in to account existing bind parameters when building the bind listAaron Patterson2014-01-141-21/+20
* | | match against bind valuesAaron Patterson2014-01-141-2/+2
* | | comment out the sqlite3 debug code (for now)Aaron Patterson2014-01-141-0/+7
* | | fix statement cache executionAaron Patterson2014-01-141-7/+6
* | | fix cache class interfaceAaron Patterson2014-01-142-22/+26
* | | unscoping a where should remove bind valuesAaron Patterson2014-01-141-0/+2
* | | remove dead codeAaron Patterson2014-01-141-2/+0
* | | Merge branch 'master' into set_bindsAaron Patterson2014-01-140-0/+0
|\| |
| * | "string" isn't a valid column type for ActiveRecordAaron Patterson2014-01-141-1/+1
| |/
* | drop the dual encodings tableAaron Patterson2014-01-141-2/+2
* | where needs to bring the bind params when creating a new relationAaron Patterson2014-01-141-0/+3
* | `where` makes bind values, so stop manually creating themAaron Patterson2014-01-141-11/+3
* | switch to arrays for bind removal testAaron Patterson2014-01-141-4/+2
* | `where` creates binds, so do not create them manuallyAaron Patterson2014-01-141-2/+1
* | we should not be copying these. fixes test_find_all_using_where_with_relation...Aaron Patterson2014-01-141-4/+0
* | Merge branch 'master' into set_bindsAaron Patterson2014-01-1419-59/+163
|\|
| * don't establish a new connection when testing with `sqlite3_mem`.Yves Senn2014-01-141-15/+21