aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | push SQL generation inside the schema creation objectAaron Patterson2013-03-224-12/+20
| | | | | |
| * | | | | mostly decouple TableDefinition from the database connectionAaron Patterson2013-03-223-5/+5
| | | | | |
| * | | | | remove to_sql from TableDefinitionAaron Patterson2013-03-223-9/+5
| | | | | |
| * | | | | decouple column definition from the database connectionAaron Patterson2013-03-223-11/+11
| | | | | |
| * | | | | stop depending on sql_type in pgAaron Patterson2013-03-221-6/+8
| | | | | |
| * | | | | remove knowledge of SQL from the column definition objectAaron Patterson2013-03-223-24/+47
| | | | | |
* | | | | | squelch an unused variable warningAaron Patterson2013-03-221-0/+1
|/ / / / /
* | | | | Merge pull request #9866 from choudhuryanupam/fix_connection_testCarlos Antonio da Silva2013-03-221-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Removed unused loop variable
| * | | | | Removed unused loop variableAnupam Choudhury2013-03-221-1/+1
| | |_|/ / | |/| | |
* | | | | Merge pull request #9867 from choudhuryanupam/fix_mysql2_active_schema_testCarlos Antonio da Silva2013-03-221-2/+1
|\ \ \ \ \ | | | | | | | | | | | | Removed unnecessary block
| * | | | | Removed unnecessary blockAnupam Choudhury2013-03-221-2/+1
| | |_|_|/ | |/| | |
* | | | | test-case to prevent resetting associations when preloading twice.Yves Senn2013-03-221-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/associations/preloader/through_association.rb activerecord/test/cases/associations/eager_test.rb
* | | | | When we pass id to update_attributes it will try to set new id for that recordDmitry Vorotilin2013-03-224-2/+18
|/ / / /
* / / / Delete failing testJon Leighton2013-03-221-36/+0
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I don't think this is testing anything useful, and the test code is exceedingly brittle. It is broken since 34c7e73c1def1312e59ef1f334586ff2f668246e because the test code makes assumptions about the implementation of PostgreSQLAdapter#active? which are incorrect after the commit. I could fix this test but it would be even more brittle (by stubbing the underlying @connection.connect_poll) and it doesn't test any complex logic. I conclude that it's not worth it.
* | | Allows setting fixture_path to a PathnameAlexander Murmann and Can Berk Güder2013-03-212-1/+10
| | |
* | | Adding a bang to method name of raise_on_type_mismatch.wangjohn2013-03-216-8/+8
| | |
* | | Merge pull request #9847 from vipulnsward/fix_sqlite_testRafael Mendonça França2013-03-211-1/+1
|\ \ \ | |/ / |/| | Fix copy table index test; Change == to ! on false in travis.rb
| * | Fix copy table index test; Change == to ! on false in travis.rbVipul A M2013-03-211-1/+1
| | |
* | | Update other counter caches on destroyIan Young2013-03-2011-9/+45
|/ /
* | use `connect_poll` on pg so that reaping does not hurt the connectionAaron Patterson2013-03-202-3/+4
| |
* | Revert "default the reaping frequency to 10 seconds"Aaron Patterson2013-03-201-1/+1
| | | | | | | | | | | | | | mysql can't handle a parallel thread pinging the connection, so we can get wrong results or segvs This reverts commit 7cc588b684f6d1af3e7fab1edfa6715e269e41a2.
* | Merge pull request #9833 from choudhuryanupam/fix_active_schema_testCarlos Antonio da Silva2013-03-201-2/+1
|\ \ | | | | | | Removed unnecessary block
| * | Removed unnecessary blockAnupam Choudhury2013-03-201-2/+1
| | |
* | | Properly named variable inside blockAnupam Choudhury2013-03-201-2/+2
|/ / | | | | | | Closes #9824.
* | Merge pull request #9821 from vipulnsward/fix_typos_in_ARVijay Dev2013-03-205-6/+6
|\ \ | | | | | | Fix some typos in AR- CHANGELOG, tests, method doc. fixed
| * | Fix some typos in AR- CHANGELOG, tests, method doc. fixedVipul A M2013-03-205-6/+6
| | |
* | | Fix a typoRajeev N Bharshetty2013-03-201-1/+1
|/ /
* | Merge pull request #9818 from wangjohn/sort_last_to_max_in_migration_versionCarlos Antonio da Silva2013-03-191-1/+1
|\ \ | | | | | | Changed the call to .sort.last to .max when computing the migration version
| * | Changed the call to .sort.last to .max when computing the migration version. Youwangjohn2013-03-191-1/+1
| | | | | | | | | | | | | | | do not actually need to sort everything (incurs more cost than just a simple max).
* | | Commas aren't comas.Josh Adams2013-03-191-2/+2
|/ / | | | | | | Type a fixo.
* | Calling find() on an association with an inverse will now check to seewangjohn2013-03-193-2/+38
| | | | | | | | | | if the association already holds that record in memory before checking the database for the specified ids.
* | The repair_validations helper was not working correctly before becausewangjohn2013-03-191-2/+2
|/ | | | | | it only cleared the validations that created :validate callbacks. This didn't include the validates created by validates_with, so I've added a method to clear all validations.
* Revert "Merge pull request #9784 from ↵Carlos Antonio da Silva2013-03-181-4/+4
| | | | | | | | | | vipulnsward/change_from_blank_to_empty_on_string" This reverts commit 9c4c05fc82e997b722dec4068c3aa27eaee69eb8, reversing changes made to 4620bdcefd0c88905a005f191496df887877b8f3. Reason: They're not completely interchangeable, since blank? will also check for strings containing spaces.
* Merge pull request #9784 from vipulnsward/change_from_blank_to_empty_on_stringCarlos Antonio da Silva2013-03-181-4/+4
|\ | | | | Change from blank? to empty? on obvious string values to save extra calls
| * change from blank? to empty? on obvious string values to save extra method ↵Vipul A M2013-03-191-4/+4
| | | | | | | | calls
* | Fix failing tests related to where values change to stringsCarlos Antonio da Silva2013-03-181-7/+7
| | | | | | | | Introduced in 5dc2e3531babcbdc165884d1a47cbcd13455522d.
* | Revert "instruct RDoc to only parse Ruby files under lib [Fixes #9779]"Xavier Noria2013-03-181-1/+1
| | | | | | | | This reverts commit c24528fbc94dea9946a563be3bed9559583bdc57.
* | Merge pull request #9782 from vipulnsward/change_from_each_to_each_key_habtmRafael Mendonça França2013-03-182-3/+3
|\ \ | | | | | | Change from each to each_value;drop assignment in habtm
| * | 1. Change from each to each_value since we did not use keyVipul A M2013-03-192-3/+3
| |/ | | | | | | 2. drop assignment of value to sum in test
* | instruct RDoc to only parse Ruby files under lib [Fixes #9779]Xavier Noria2013-03-181-1/+1
| |
* | Merge pull request #9778 from vipulnsward/fix_typos_in_ar_v1Steve Klabnik2013-03-189-10/+10
|\ \ | | | | | | fix typos in AR. lots of them.
| * | fix typos in AR. lots of them.Vipul A M2013-03-199-10/+10
| |/
* | Merge branch 'master-sec'Aaron Patterson2013-03-182-11/+16
|\ \ | |/ |/| | | | | | | | | | | * master-sec: fix protocol checking in sanitization [CVE-2013-1857] JDOM XXE Protection [CVE-2013-1856] fix incorrect ^$ usage leading to XSS in sanitize_css [CVE-2013-1855] stop calling to_sym when building arel nodes [CVE-2013-1854]
| * stop calling to_sym when building arel nodes [CVE-2013-1854]Aaron Patterson2013-03-152-11/+16
| |
* | Merge pull request #9766 from senny/remove_ancient_todosCarlos Antonio da Silva2013-03-181-3/+0
|\ \ | | | | | | Remove ancient TODOs [ci skip]
| * | remove ancient TODOs [ci skip].Yves Senn2013-03-181-3/+0
| | |
* | | Merge pull request #9765 from tkhr/mv-tests-out-from-base_testrbCarlos Antonio da Silva2013-03-182-14/+14
|\ \ \ | | | | | | | | Move tests out from base_test.rb to inheritance_test.rb
| * | | move tests out from base_test.rbTakehiro Adachi2013-03-182-14/+14
| |/ / | | | | | | | | | | | | These tests should be in inheritance_test.rb since its testing a feature which is implemented in inheritance.rb
* | | Merge pull request #9677 from neerajdotname/update-comments-about-kotoriCarlos Antonio da Silva2013-03-181-1/+1
|\ \ \ | |/ / |/| | SQLite3 3.6.8+ supports nested transactions [ci skip]
| * | SQLite3 3.6.8+ supports nested transactions [ci skip]Neeraj Singh2013-03-181-1/+1
| | | | | | | | | | | | | | | http://www.sqlite.org/lang_savepoint.html https://github.com/rails/rails/blob/master/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb#L130-L132