aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* glob_param is never used, so rmAaron Patterson2014-05-233-10/+8
| | | | | | this also changes the constructor. We don't need to pass more options than "defaults" (whatever defaults are, ugh. probably another hash of stupid stuff).
* Merge pull request #15285 from ↵Rafael Mendonça França2014-05-232-9/+5
|\ | | | | | | | | sergey-alekseev/remove-active-record-where-duplicated-condition Remove duplicated parameter check on #where!
| * Remove duplicated parameter check on #where!Sergey Alekseev2014-05-232-9/+5
| | | | | | | | | | | | | | | | | | | | It seems that #where! is not designed to be used as a chained where. See initial implementation at 8c2c60511beaad05a218e73c4918ab89fb1804f0. So, no need to check twice. We should not test #where! https://github.com/rails/rails/pull/15285#discussion_r13018316
* | Merge pull request #15283 from oismail91/improve_doc_for_select_tagRafael Mendonça França2014-05-231-2/+2
|\ \ | | | | | | update select_tag docs for customizing id
| * | update docs to include html id for select_tagOmar Ismail2014-05-231-2/+2
| |/
* | Merge pull request #15277 from sgrif/sg-schema-cache-refactorRafael Mendonça França2014-05-231-31/+11
|\ \ | |/ |/| Simplify the code in schema cache
| * Simplify the code in schema cacheSean Griffin2014-05-231-31/+11
| | | | | | | | | | The use of default procs was unnessecary, made the code confusing to follow, and made marshalling needlessly complex.
* | Merge pull request #15261 from hbin/missing_parametersRafael Mendonça França2014-05-231-1/+5
|\ \ | | | | | | Bring the missing parameters back.
| * | Bring the missing parameters back.Bin Huang2014-05-231-1/+5
| | |
* | | use Proc.new to automatically do parameter checking for usAaron Patterson2014-05-231-3/+1
| | |
* | | Merge pull request #15282 from sgrif/sg-remove-column-primaryRafael Mendonça França2014-05-237-52/+10
|\ \ \ | | | | | | | | Remove `Column#primary`
| * | | Remove `Column#primary`Sean Griffin2014-05-237-52/+10
| | |/ | |/| | | | | | | | | | | | | | | | | | | It appears to have been used at some point in the past, but is no longer used in any meaningful way. Whether a column is considered primary is a property of the model, not the schema/column. This also removes the need for yet another layer of caching of the model's schema, and we can leave that to the schema cache.
* | | Merge pull request #15276 from kuldeepaggarwal/fix-array-toRafael Mendonça França2014-05-232-1/+5
|\ \ \ | | | | | | | | Array#to now accept negative position also.
| * | | revert 96525d63Kuldeep Aggarwal2014-05-232-1/+5
| | | | | | | | | | | | | | | | `Array#to` is working for negative position
* | | | Merge pull request #15265 from danielmbarlow/masterRafael Mendonça França2014-05-231-2/+3
|\ \ \ \ | | | | | | | | | | Added force_reload to Auto-generated methods doc
| * | | | Added force_reload to Auto-generated methods docdanielmbarlow2014-05-231-2/+3
| | | | | | | | | | | | | | | Should make it a little easier to find the information. Also added note to look below for the definition of the generated methods.
* | | | | Merge pull request #15280 from sgrif/sg-postgres-defaultsRafael Mendonça França2014-05-233-76/+78
|\ \ \ \ \ | | | | | | | | | | | | Move parsing of PG sql strings for defaults out of column
| * | | | | Move parsing of PG sql strings for defaults out of columnSean Griffin2014-05-233-76/+78
| | |_|/ / | |/| | |
* | | | | Merge pull request #15275 from kuldeepaggarwal/add-testRafael Mendonça França2014-05-232-0/+4
|\ \ \ \ \ | | | | | | | | | | | | add test cases for negative position in Array#from
| * | | | | add test cases for negative position in Array#fromKuldeep Aggarwal2014-05-232-0/+4
| | |/ / / | |/| | |
* | | | | there is no formatter on the router object, so rmAaron Patterson2014-05-231-1/+0
| | | | |
* | | | | Merge pull request #15271 from sgrif/sg-remove-duplicated-setupRafael Mendonça França2014-05-231-4/+3
|\ \ \ \ \ | | | | | | | | | | | | Remove duplicated setup in test
| * | | | | Remove duplicated setup in testSean Griffin2014-05-231-4/+3
| | |/ / / | |/| | |
* | | | | Merge pull request #15273 from DNNX/formatter-refactoring-4Rafael Mendonça França2014-05-231-5/+0
|\ \ \ \ \ | | | | | | | | | | | | Remove AD::Journey::Formatter#verify_required_parts!
| * | | | | Remove AD::Journey::Formatter#verify_required_parts!Viktar Basharymau2014-05-231-5/+0
| | |/ / / | |/| | | | | | | | | | | | | | | | | | Nobody uses this private method, maybe it is a leftover from some old refactoring. Let's delete it.
* | | | | decouple the router object from the request classAaron Patterson2014-05-233-21/+10
| | | | |
* | | | | pass the correct custom request to the recognize methodAaron Patterson2014-05-233-17/+12
| | | | |
* | | | | switch to the `serve` method so we can remove the request class (eventually)Aaron Patterson2014-05-232-8/+6
| | | | |
* | | | | pull request allocation up one frameAaron Patterson2014-05-231-1/+3
| | | | |
* | | | | extract request allocation from the main app serving routineAaron Patterson2014-05-232-2/+5
| | | | |
* | | | | Merge pull request #15279 from akshay-vishnoi/remove#===Rafael Mendonça França2014-05-231-2/+1
|\ \ \ \ \ | | | | | | | | | | | | [ci skip] Remove Duration#=== when we drop support for 2.0.0-p353
| * | | | | [ci skip] Remove Duration#=== when we drop support for 2.0.0-p353Akshay Vishnoi2014-05-231-2/+1
| | |_|/ / | |/| | |
* | | | | Merge pull request #15281 from sgrif/sg-inline-point-type-castRafael Mendonça França2014-05-232-8/+4
|\ \ \ \ \ | | | | | | | | | | | | Inline type cast method for PG points
| * | | | | Inline type cast method for PG pointsSean Griffin2014-05-232-8/+4
| | |_|/ / | |/| | |
* | | | | Merge pull request #15274 from sgrif/sg-move-type-testsRafael Mendonça França2014-05-232-159/+159
|\ \ \ \ \ | | | | | | | | | | | | Change typecasting unit tests to test type objects directly
| * | | | | Change typecasting unit tests to test type objects directlySean Griffin2014-05-232-159/+159
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | There's no longer type casting behavior of any kind inside of `Column` for the general case. These tests can be made clearer by testing the type objects directly.
* | | | | use the accessors on the request object rather than touching envAaron Patterson2014-05-231-2/+2
| | | | |
* | | | | find_routes only use the request, so stop passing envAaron Patterson2014-05-231-3/+3
| | | | |
* | | | | remove NullRequest and just always pass a request classAaron Patterson2014-05-232-29/+8
| | | | |
* | | | | use the request object since we have itAaron Patterson2014-05-233-14/+15
| |/ / / |/| | | | | | | | | | | | | | | stop hardcoding hash keys and use the accessors provided on the request object.
* | | | Remove warning remeving the method before redefiningRafael Mendonça França2014-05-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to test if the same method defined more than once only register one subscriber for it. We can safelly remove because the method body is the same and Subscriber use method_added hook for register the subscriber.
* | | | Merge pull request #15240 from chancancode/fix_attribute_methodsAaron Patterson2014-05-236-0/+31
|\ \ \ \ | |_|/ / |/| | | Fixed serialization for records with an attribute named `format`.
| * | | Avoid slowing down AR object initializationGodfrey Chan2014-05-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2d73f5a forces AR to enter the `define_attribute_methods` method whenever it instantiate a record from the `init_with` entry point. This is a potential performance hotspot, because `init_with` is called from all `find*` family methods, and `define_attribute_methods` is slow because it tries to acquire a lock on the mutex everytime it is entered. By using [DCL](http://en.wikipedia.org/wiki/Double-checked_locking), we can avoid grabbing the lock most of the time when the attribute methods are already defined (the common case). This is made possible by the fact that reading an instance variable is an atomic operation in Ruby. Credit goes to Aaron Patterson for pointing me to DCL and filling me in on the atomicity guarantees in Ruby. [*Godfrey Chan*, *Aaron Patterson*]
| * | | Fixed serialization for records with an attribute named `format`.Godfrey Chan2014-05-225-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * * * This bug can be triggered when serializing record R (the instance) of type C (the class), provided that the following conditions are met: 1. The name of one or more columns/attributes on C/R matches an existing private method on C (e.g. those defined by `Kernel`, such as `format`). 2. The attribute methods have not yet been generated on C. In this case, the matching private methods will be called by the serialization code (with no arguments) and their return values will be serialized instead. If the method requires one or more arguments, it will result in an `ArgumentError`. This regression is introduced in d1316bb. * * * Attribute methods (e.g. `#name` and `#format`, assuming the class has columns named `name` and `format` in its database table) are lazily defined. Instead of defining them when a the class is defined (e.g. in the `inherited` hook on `ActiveRecord::Base`), this operation is deferred until they are first accessed. The reason behind this is that is defining those methods requires knowing what columns are defined on the database table, which usually requires a round-trip to the database. Deferring their definition until the last-possible moment helps reducing unnessary work, especially in development mode where classes are redefined and throw away between requests. Typically, when an attribute is first accessed (e.g. `a_book.format`), it will fire the `method_missing` hook on the class, which triggers the definition of the attribute methods. This even works for methods like `format`, because calling a private method with an explicit receiver will also trigger that hook. Unfortunately, `read_attribute_for_serialization` is simply an alias to `send`, which does not respect method visibility. As a result, when serializing a record with those conflicting attributes, the `method_missing` is not fired, and as a result the attribute methods are not defined one would expected. Before d1316bb, this is negated by the fact that calling the `run_callbacks` method will also trigger a call to `respond_to?`, which is another trigger point for the class to define its attribute methods. Therefore, when Active Record tries to run the `after_find` callbacks, it will also define all the attribute methods thus masking the problem. * * * The proper fix for this problem is probably to restrict `read_attribute_for_serialization` to call public methods only (i.e. alias `read_attribute_for_serialization` to `public_send` instead of `send`). This however would be quite risky to change in a patch release and would probably require a full deprecation cycle. Another approach would be to override `read_attribute_for_serialization` inside Active Record to force the definition of attribute methods: def read_attribute_for_serialization(attribute) self.class.define_attribute_methods send(attribute) end Unfortunately, this is quite likely going to cause a performance degradation. This patch therefore restores the behaviour from the 4-0-stable branch by explicitly forcing the class to define its attribute methods in a similar spot (when records are initialized). This should not cause any extra roundtrips to the database because the `@columns` should already be cached on the class. Fixes #15188.
* | | | Merge pull request #15251 from peeyushsingla/masterYves Senn2014-05-231-2/+4
|\ \ \ \ | |_|_|/ |/| | | Reorder query in active record query of rails guide [ci skip]
| * | | resolved reorder issue in rails active record guidepeeyush2014-05-231-2/+4
|/ / /
* | | stop using PARAMETERS_KEY, and use the accessor on the request objectAaron Patterson2014-05-223-7/+9
| | | | | | | | | | | | this decouples our code from the env hash a bit.
* | | pass the instantiated request to the find_routes methodAaron Patterson2014-05-221-5/+7
| | |
* | | just return path parametersAaron Patterson2014-05-221-2/+1
| | |
* | | use symbol keys for path_parametersAaron Patterson2014-05-226-16/+16
|/ /