aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | | | | | | | | Fix insertion of records for hmt association with scope, fix #3548Ivan Antropov2013-11-176-4/+32
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge pull request #14694 from heironimus/callback_guideRafael Mendonça França2014-04-101-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add after_commit/after_rollback to callback list
| | * | | | | | | | | | | | | | Add after_commit/after_rollback to callback listKyle Heironimus2014-04-101-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding after_commit/after_rollback to list of callbacks in order helps explain the callback order as well as making it consistent with the API docs at http://api.rubyonrails.org/classes/ActiveRecord/Callbacks.html
| * | | | | | | | | | | | | | | Merge pull request #14695 from akshay-vishnoi/doc_changesRafael Mendonça França2014-04-101-14/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | / / / / / / / / / / / | | | |_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | [ci skip] Remove false documentation
| | * | | | | | | | | | | | | [ci skip] Remove false documentationAkshay Vishnoi2014-04-111-14/+1
| |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Remove warning of unused variableRafael Mendonça França2014-04-101-1/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'rm-uuid-fixtures'Rafael Mendonça França2014-04-1013-10/+149
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | No need to call sendRafael Mendonça França2014-04-101-1/+1
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge branch 'master' into rm-uuid-fixturesRafael Mendonça França2014-04-1079-287/+783
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/CHANGELOG.md activesupport/CHANGELOG.md
| * | | | | | | | | | | | | | Require action_controller before any other action_controller fileRafael Mendonça França2014-04-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will load properly the loading hooks. Closes rails/sass-rails#205
| * | | | | | | | | | | | | | Merge pull request #11656 from emre-basala/xml_mini_testRafael Mendonça França2014-04-101-1/+58
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add tests to ActiveSupport:XmlMini to_tag method
| | * | | | | | | | | | | | | | Add tests to ActiveSupport:XmlMini to_tag methodemre-basala2013-08-071-1/+58
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge pull request #14677 from JuanitoFatas/update-initialization-code-snippetsRafael Mendonça França2014-04-101-53/+102
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | [ci skip] Update code snippets to latest master (initialization.md).
| | * | | | | | | | | | | | | | [ci skip] Update code snippets to latest master (initialization.md).Juanito Fatas2014-04-101-53/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also update the `server.run` example (Replace Mongrel with Puma).
| * | | | | | | | | | | | | | | Merge pull request #14679 from pbharadiya/masterYves Senn2014-04-101-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct factual error for page not found [ci skip]
| | * | | | | | | | | | | | | | | Correct factual error for page not foundParth Bharadiya2014-04-101-1/+1
| |/ / / / / / / / / / / / / / /
| * / / / / / / / / / / / / / / +EOLAkira Matsuda2014-04-101-1/+1
| |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Merge pull request #11411 from dscataglini/masterAaron Patterson2014-04-091-6/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Active support callback's before/after/around filters are not correctly making their singleton methods private
| | * | | | | | | | | | | | | | private method doesn't work for singleton methods defined this wayDiego Scataglini2013-07-121-6/+12
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Only call uniq on the conditional that actually needs itCarlos Antonio da Silva2014-04-091-1/+1
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Remove extra collect callCarlos Antonio da Silva2014-04-091-1/+1
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge pull request #14675 from ↵Aaron Patterson2014-04-092-7/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | laurocaetano/make_reflection_caches_works_with_string_keys Make reflection and aggregate_reflection caches work with string keys.
| | * | | | | | | | | | | | | | | Make sure the reflection test is passing a String to the reflectionLauro Caetano2014-04-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cache.
| | * | | | | | | | | | | | | | | Make the aggregate_reflections cache work with strings as its keys.Lauro Caetano2014-04-091-2/+2
| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | No need to call `to_sym` on reflection name, since the cache now worksLauro Caetano2014-04-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with strings with string keys. Related #14668.
| | * | | | | | | | | | | | | | | Make the reflections cache work with strings as its keys.Lauro Caetano2014-04-091-2/+2
| |/ / / / / / / / / / / / / / /
| | | | * | | | | | | | | | | | Merge pull request #12016 from roderickvd/uuid_fixesRafael Mendonça França2014-04-0413-10/+149
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generate stable fixture UUIDs on PostgreSQL Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/fixtures.rb activerecord/test/cases/adapters/postgresql/uuid_test.rb activesupport/CHANGELOG.md
| | | | | * | | | | | | | | | | | Auto-generate stable fixture UUIDs on PostgreSQL.Roderick van Domburg2014-01-0714-17/+154
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #11524
* | | | | | | | | | | | | | | | | use an array for bind params to simplify substitutionAaron Patterson2014-04-123-19/+19
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | propogate bind values collected in arel to SQL generationAaron Patterson2014-04-113-1/+12
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | decouple the factory method from the constructing modelAaron Patterson2014-04-103-10/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The factory method only requires the constructing model to get the connection object. Since the model is available when calling the factory method, we can just pass the appropriate connection in.
* | | | | | | | | | | | | | | | | remove intelligence from StatementCache#initializeAaron Patterson2014-04-103-16/+18
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | stop caching the class on the statement cache objectAaron Patterson2014-04-103-15/+15
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | fix ivar names and add reader methodsAaron Patterson2014-04-101-7/+6
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | eagerly build the cacheable query builderAaron Patterson2014-04-101-13/+7
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | eagerly build the bind mapAaron Patterson2014-04-101-8/+5
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | eagerly build the relation objectAaron Patterson2014-04-101-8/+2
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | remove dead codeAaron Patterson2014-04-101-7/+0
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | speed up parameter substitutionAaron Patterson2014-04-091-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | store the offsets of the bind values, then only index to bind value locations before joining the array
* | | | | | | | | | | | | | | | | tests still pass when caching unprepared statementsAaron Patterson2014-04-091-1/+0
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | oops! Fix Gemfile. :bomb:Aaron Patterson2014-04-091-1/+2
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'master' into adequaterecordAaron Patterson2014-04-093-3/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: add services: memcache to travis The `source` option for `has_many => through` should accept String values.
| * | | | | | | | | | | | | | | | Merge pull request #14671 from arthurnn/travis_memcacheRafael Mendonça França2014-04-091-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add services: memcache to travis
| | * | | | | | | | | | | | | | | | add services: memcache to travisArthur Neves2014-04-091-0/+1
| |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | Merge pull request #14668 from laurocaetano/source_option_with_string_valueAaron Patterson2014-04-092-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The :source option for has_many => through should accept String values.
| | * | | | | | | | | | | | | | | | The `source` option for `has_many => through` should accept StringLauro Caetano2014-04-092-3/+3
| |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | values. With the changes introduced by 16b70fddd4dc7e7fb7be108add88bae6e3c2509b it was expecting the value to be a Symbol, while it could be also a String value.
* | | | | | | | | | | | | | | | | remove the bind visitor since the collector handles substituting bind valuesAaron Patterson2014-04-092-9/+5
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | push the collectors up to the abstract adapterAaron Patterson2014-04-093-40/+22
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | sqlite3 tests passing againAaron Patterson2014-04-091-7/+8
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | mysql tests are passing againAaron Patterson2014-04-091-1/+7
| | | | | | | | | | | | | | | | |