aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | 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
| | | | | | | |
* | | | | | | | all tests passing on mysql2Aaron Patterson2014-04-092-4/+3
| | | | | | | |
* | | | | | | | working against arel/collector branchAaron Patterson2014-04-094-19/+12
| | | | | | | |
* | | | | | | | fix bind collecting for mysqlAaron Patterson2014-04-093-4/+22
| | | | | | | |
* | | | | | | | add a bind collector, remove the bind visitorAaron Patterson2014-04-093-15/+24
| | | | | | | |
* | | | | | | | remove the bind substitution visitor. to_sql should never return bind valuesAaron Patterson2014-04-093-12/+7
| | | | | | | |
* | | | | | | | use the compile method so we do not have to specify the collectors in this caseAaron Patterson2014-04-092-4/+2
| | | | | | | |
* | | | | | | | Merge branch 'master' into adequaterecordAaron Patterson2014-04-0933-164/+377
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (26 commits) Avoid URI parsing Add missing require so requiring `active_support/cache` works again. depend_on_asset is not required anymore on sprockets-rails 2.1.2 upgrading section for 4.1 is no longer WIP. [ci skip] Expand explanation of how to set secrets.yml. [ci skip] Guides: minor typo fixed [ci skip] Fixed problem where `1.day.eql?(1.day)` is false new CHANGELOGs entries are in the top [ci skip] Updates the maintenance policy with new Rails versions Dont abbreviate that which needs no abbreviation Dont encourage aliases now that we have variants Use short-form for the scaffold render calls and drop the needless test Drop in @jeremy's new database.yml template text Don't deprecate after all Less ambition, more deprecation Ensure we correctly and immediately load all ENV entries Give a deprecation message even when the lookup fails Rearrange the config merger some more entry is always a Hash Check env_url only once ... Conflicts: Gemfile
| * | | | | | | Merge pull request #14665 from andrielfn/avoid-uri-parsingRafael Mendonça França2014-04-092-5/+15
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Avoid URI parsing
| | * | | | | | | Avoid URI parsingAndriel Nuernberg2014-04-092-5/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This parsing is unecessary once the Request object already has the needed information.
| * | | | | | | | Merge pull request #14667 from lucasmazza/require-per-thread-registryRafael Mendonça França2014-04-091-0/+1
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Add missing require so requiring `active_support/cache` works again.
| | * | | | | | | | Add missing require so requiring `active_support/cache` works again.Lucas Mazza2014-04-091-0/+1
| | |/ / / / / / /
| * / / / / / / / depend_on_asset is not required anymore on sprockets-rails 2.1.2Rafael Mendonça França2014-04-093-25/+11
| |/ / / / / / /
| * | | | | | | Merge pull request #14654 from Alamoz/secret_keyRafael Mendonça França2014-04-091-4/+7
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Expand explanation of how to set secrets.yml.
| | * | | | | | | Expand explanation of how to set secrets.yml. [ci skip]Adrien Lamothe2014-04-081-4/+7
| | | | | | | | |
| * | | | | | | | upgrading section for 4.1 is no longer WIP. [ci skip]Yves Senn2014-04-091-2/+0
| | | | | | | | |
| * | | | | | | | Merge pull request #14653 from vdmgolub/patch-1Arun Agrawal2014-04-091-1/+1
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Guides: minor typo fixed in Asset Pipeline guide
| | * | | | | | | | Guides: minor typo fixed [ci skip]Vadim Golub2014-04-091-1/+1
| | |/ / / / / / /
| * | | | | | | | Merge pull request #14652 from Emily/duration_eqlsGuillermo Iguaran2014-04-083-0/+45
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | Fixed problem where `1.day.eql?(1.day)` is false
| | * | | | | | | Fixed problem where `1.day.eql?(1.day)` is falseEmily Dobervich2014-04-083-0/+45
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes: 1.second.eql?(1.second) #=> false The new `eql?` requires that `other` is an `ActiveSupport::Duration`. This requirement makes `ActiveSupport::Duration`'s behavior consistent with other numeric types in Ruby. 1.eql?(1.0) #=> false 1.0.eql?(1) #=> false 1.second.eql?(1) #=> false (was true) 1.eql?(1.second) #=> false { 1 => "foo", 1.0 => "bar" } #=> { 1 => "foo", 1.0 => "bar" } { 1 => "foo", 1.second => "bar" } # now => { 1 => "foo", 1.second => "bar" } # was => { 1 => "bar" } And though the behavior here hasn't changed, for reference: 1 == 1.0 #=> true 1.0 == 1 #=> true 1 == 1.second #=> true 1.second == 1 #=> true
| * | | | | | | new CHANGELOGs entries are in the top [ci skip]Rafael Mendonça França2014-04-081-4/+4
| | | | | | | |
| * | | | | | | Merge pull request #14647 from matiaskorhonen/updates-maintenance-policyRafael Mendonça França2014-04-082-3/+7
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Updates the maintenance policy with new Rails versions