aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-261-2/+188
|\
| * add :nodoc: to CollectionProxy#initializeFrancesco Rodriguez2012-05-251-1/+1
| |
| * add CollectionProxy#== documentationFrancesco Rodriguez2012-05-251-0/+24
| |
| * add CollectionProxy#count documentationFrancesco Rodriguez2012-05-251-0/+26
| |
| * add CollectionProxy#to_ary documentationFrancesco Rodriguez2012-05-251-2/+35
| |
| * add CollectionProxy#delete documentationFrancesco Rodriguez2012-05-251-1/+104
| |
* | Merge pull request #4132 from Juanmcuello/clone_structureAaron Patterson2012-05-251-0/+1
|\ \ | | | | | | Reset postgreSQL search path in db:test:clone_structure.
| * | Reset postgreSQL search path in db:test:clone_structure.Juan M. Cuello2011-12-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | This patch resets the postgres search path in the structure.sql after the structure is dumped in order to find schema_migrations table when multiples schemas are used. Fixes #945
* | | Merge pull request #5872 from evtuhovich/prepared_statement_fixAaron Patterson2012-05-251-10/+10
|\ \ \ | | | | | | | | Remove prepared statement from system query in postgresql adapter
| * | | Remove prepared statement from system query in postgresql adapterIvan Evtukhovich2012-05-121-10/+10
| | | |
* | | | Merge pull request #5244 from fotos/myqsl2_wait_timeoutRafael Mendonça França2012-05-251-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | Maximum wait_timeout on Windows is 2147483
| * | | | Maximum wait_timeout on Windows is 2147483Fotos Georgiadis2012-03-021-1/+1
| | | | |
* | | | | Merge pull request #5925 from Juanmcuello/pg_structure_dumpCarlos Antonio da Silva2012-05-241-2/+2
| | | | | | | | | | | | | | | | | | | | Quote arguments in db:structure:dump for PostgreSQL.
* | | | | Whitespaces :scissors:Rafael Mendonça França2012-05-232-7/+7
| | | | |
* | | | | PGconn doesn't accepts :checkout_timeout option.Rafael Mendonça França2012-05-231-1/+1
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | This option was added on cb6f839359bd894feb0a1105b79af72b336aa41e renaming the :wait_timeout option. Fix build http://travis-ci.org/#!/rails/rails/jobs/1413405
* | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-233-34/+463
|\ \ \ \
| * | | | copy edits in collection proxy docs [ci skip]Vijay Dev2012-05-231-25/+18
| | | | |
| * | | | Revert "Remove blank trailing comments"Vijay Dev2012-05-2321-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit fa6d921e11363e9b8c4bc10f7aed0b9faffdc33a. Reason: Not a fan of such massive changes. We usually close such changes if made to Rails master as a pull request. Following the same principle here and reverting. [ci skip]
| * | | | add CollectionProxy#length documentationFrancesco Rodriguez2012-05-221-5/+37
| | | | |
| * | | | add CollectionProxy#size documentationFrancesco Rodriguez2012-05-221-2/+25
| | | | |
| * | | | add :call-seq: to +first+ and +last+ CollectionProxy methodsFrancesco Rodriguez2012-05-221-0/+6
| | | | |
| * | | | add CollectionProxy#create! documentationFrancesco Rodriguez2012-05-221-0/+22
| | | | |
| * | | | add CollectionProxy#create documentationFrancesco Rodriguez2012-05-221-0/+33
| | | | |
| * | | | add more examples to CollectionProxy#findFrancesco Rodriguez2012-05-221-0/+9
| | | | |
| * | | | adding :call-seq: to CollectionProxy methodsFrancesco Rodriguez2012-05-221-0/+39
| | | | |
| * | | | add CollectionProxy#build documentationFrancesco Rodriguez2012-05-221-0/+31
| | | | |
| * | | | remove repeated documentation in CollectionProxy#clearFrancesco Rodriguez2012-05-221-24/+2
| | | | |
| * | | | update CollectionProxy#clear documentationFrancesco Rodriguez2012-05-211-3/+2
| | | | |
| * | | | update CollectionProxy#delete_all documentationFrancesco Rodriguez2012-05-211-2/+29
| | | | |
| * | | | add CollectionProxy#delete_all documentationFrancesco Rodriguez2012-05-211-0/+65
| | | | |
| * | | | Fix AR preloader exampleAlexey Vakhov2012-05-221-1/+1
| | | | |
| * | | | fix CollectionProxy documentation markupFrancesco Rodriguez2012-05-211-8/+8
| | | | |
| * | | | add CollectionProxy#reload documentationFrancesco Rodriguez2012-05-211-0/+18
| | | | |
| * | | | improve CollectionProxy#destroy documentationFrancesco Rodriguez2012-05-211-5/+37
| | | | |
| * | | | add CollectionProxy#destroy documentationFrancesco Rodriguez2012-05-211-1/+42
| | | | |
| * | | | update CollectionProxy#destroy_all documentationFrancesco Rodriguez2012-05-201-1/+9
| | | | |
| * | | | Remove blank trailing commentsHenrik Hodne2012-05-2021-31/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For future reference, this is the regex I used: ^\s*#\s*\n(?!\s*#). Replace with the first match, and voilà! Note that the regex matches a little bit too much, so you probably want to `git add -i .` and go through every single diff to check if it actually should be changed.
| * | | | add CollectionProxy#select documentationFrancesco Rodriguez2012-05-191-2/+55
| | | | |
| * | | | add CollectionProxy#find documentationFrancesco Rodriguez2012-05-191-0/+20
| | | | |
| * | | | Revert typoOscar Del Ben2012-05-191-1/+1
| | | | |
| * | | | TypoOscar Del Ben2012-05-191-4/+4
| | | | |
* | | | | Merge pull request #6462 from grosser/feature/licensesJosé Valim2012-05-231-0/+1
|\ \ \ \ \ | | | | | | | | | | | | Add license field to gemspecs, by Matt Griffin
| * | | | | Add license field to gemspecs, by Matt GriffinMatt Griffin2012-05-231-0/+1
| | | | | |
* | | | | | ConnectionPool wait_timeout no longer used for different types of timeouts. ↵Jonathan Rochkind2012-05-234-12/+21
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #6441 An AR ConnectionSpec `wait_timeout` is pre-patch used for three different things: * mysql2 uses it for MySQL's own wait_timeout (how long MySQL should allow an idle connection before closing it), and defaults to 2592000 seconds. * ConnectionPool uses it for "number of seconds to block and wait for a connection before giving up and raising a timeout error", default 5 seconds. * ConnectionPool uses it for the Reaper, for deciding if a 'dead' connection can be reaped. Default 5 seconds. Previously, if you want to change these from defaults, you need to change them all together. This is problematic _especially_ for the mysql2/ConnectionPool conflict, you will generally _not_ want them to be the same, as evidenced by their wildly different defaults. This has caused real problems for people #6441 #2894 But as long as we're changing this, forcing renaming the ConnectionPool key to be more specific, it made sense to seperate the two ConnectionPool uses too -- these two types of ConnectionPool timeouts ought to be able to be changed independently, you won't neccesarily want them to be the same, even though the defaults are (currently) the same.
* | | | | changed xml type datetime to dateTime, fixes #6328Angelo capilleri2012-05-232-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | XmlMini define the xml 'datatime', but according to http://www.w3.org/TR/xmlschema-2/#dateTime could be better change this to 'dateTime' with upper case letter 'T. So 'DateTime' and 'Time' are redefined from 'datetime' to 'dateTime' add the changing to the changelog
* | | | | Revert "Merge pull request #6416 from pmahoney/threadsafe-connection-pool"Rafael Mendonça França2012-05-223-202/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit d2901f0fc4270a765717ad572d559dc49a56b3a8, reversing changes made to 525839fdd8cc34d6d524f204528d5b6f36fe410c. Conflicts: activerecord/test/cases/connection_pool_test.rb Reason: This change broke the build (http://travis-ci.org/#!/rails/rails/builds/1391490) and we don't have any solution until now. I asked the author to try to fix it and open a new pull request.
* | | | | Fix the buildSantiago Pastorino2012-05-221-1/+0
| | | | |
* | | | | require active_support/lazy_load_hooks where is neededSantiago Pastorino2012-05-221-0/+1
| | | | |
* | | | | Merge pull request #6368 from Antiarchitect/store-indifferent-accessJeremy Kemper2012-05-222-10/+61
|\ \ \ \ \ | | | | | | | | | | | | Support migrating from Hash to HashWithIndifferentAccess for accessing attributes.
| * | | | | Convert Hash to HashWithIndifferentAccess in ActiveRecord::Store.Andrey Voronkov2012-05-222-10/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to make migration from 3.x apps easier, we should try to convert Hash instances to HashWithIndifferentAccess, to allow accessing values with both symbol and a string. This is follow up to changes in 3c0bf043.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 03:02:06 +0000