aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add nodoc to touch at no_touching.rbRafael Mendonça França2014-12-291-1/+1
| | | | | | It is already docummented at persistence.rb. [ci skip]
* Just check if the buffer exists before changing itRafael Mendonça França2014-12-292-6/+4
|
* Merge pull request #18236 from vipulnsward/dont-eval-frozenRafael Mendonça França2014-12-292-1/+12
|\ | | | | | | Fix html_safe string access modifying frozen values
| * When trying to access a character on a string buffer object via `:[]`, if ↵Vipul A M2014-12-292-1/+12
|/ | | | | | | | | | | | | | | | the object being accessed currently returns `html_safe?` as true, we used to set `@html_safe` variable as true on new object created. When doing something like x = 'Hello'.html_safe x[/a/, 1] would throw an error on ruby 2.2, since when nothign gets matched nil is returned by the code and it tries to set `@html_safe` value to true, which would error since starting 2.2 nil is frozen. This change adds a safety net to avoid setting `@html_safe = true` on frozen objects. Fixes #18235
* Merge pull request #18232 from yousuketto/doc-for-bundler-requireYves Senn2014-12-291-1/+1
|\ | | | | adjust args of Bundler.require in guides [ci skip]
| * adjust args of Bundler.require in guides [ci skip]Yosuke2014-12-291-1/+1
|/ | | | | | Arguments of Bundler.require of generator has been changed from rails4.0.4. https://github.com/rails/rails/blob/v4.0.4/railties/lib/rails/generators/rails/app/templates/config/application.rb#L16
* Merge pull request #18231 from untidy-hair/improve_a_testGuillermo Iguaran2014-12-281-1/+1
|\ | | | | Expectation comes first
| * Expectation comes firstYukio Mizuta2014-12-281-1/+1
|/
* Minor documentation edits [ci skip]Robin Dupret2014-12-286-19/+19
|
* Merge pull request #18209 from claudiob/bump-to-2-2Guillermo Iguaran2014-12-2810-12/+12
|\ | | | | Require Ruby 2.2 for Rails 5.0
| * Require Ruby 2.2 for Rails 5.0claudiob2014-12-2610-12/+12
| | | | | | | | | | Stems from [this comment](https://github.com/rails/rails/pull/18203#issuecomment-68138096) by @robin850 and by the blog post http://weblog.rubyonrails.org/2014/12/19/Rails-4-2-final
* | Merge pull request #18213 from agrobbin/moar-concernsSean Griffin2014-12-283-4/+34
|\ \ | | | | | | Actually autoload all second-level directories called `app/*/concerns`
| * | actually autoload all second-level directories called `app/*/concerns`Alex Robbin2014-12-263-4/+34
| | |
* | | docs, cleanup Active Record CHANGELOG. [ci skip]Yves Senn2014-12-281-4/+4
| | |
* | | Merge pull request #18229 from benprew/patch-2Sean Griffin2014-12-281-4/+2
|\ \ \ | | | | | | | | Update example test documentation
| * | | Update example test documentationBen Prew2014-12-281-4/+2
|/ / / | | | | | | Example does not work with session headers, should use request headers. [ci skip]
* | | Merge pull request #18226 from kamipo/fix_warning_interpreted_as_argument_prefixGuillermo Iguaran2014-12-281-1/+1
|\ \ \ | | | | | | | | Fix warning: `*' interpreted as argument prefix
| * | | Fix warning: `*' interpreted as argument prefixRyuta Kamizono2014-12-281-1/+1
|/ / /
* | | Merge pull request #18225 from DanOlson/update-without-changing-timestampsSean Griffin2014-12-275-10/+48
|\ \ \ | | | | | | | | Provide :touch option to save() to accommodate saving without updating t...
| * | | Provide :touch option to save() to accommodate saving without updating ↵Dan Olson2014-12-275-10/+48
|/ / / | | | | | | | | | timestamps. [#18202]
* | | Provide a better error message for unsupported classes in `serialize`Sean Griffin2014-12-273-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | We only support classes which provide a no-args constructor to use as a default value. We can provide a more helpful error message if we catch this when `serialize` is called, rather than letting it error when you try to assign the attribute. Fixes #18224
* | | Merge pull request #18220 from kamipo/bigint_primary_key_supportSean Griffin2014-12-276-17/+71
|\ \ \ | | | | | | | | Add bigint primary key support for MySQL.
| * | | Add bigint primary key support for MySQL.Ryuta Kamizono2014-12-285-7/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Example: create_table :foos, id: :bigint do |t| end
| * | | Support for any type primary key.Ryuta Kamizono2014-12-284-10/+35
|/ / /
* | | add autoload for `ForeignKeyDefinition`.Yves Senn2014-12-271-0/+1
| | | | | | | | | | | | /cc @sgrif
* | | reduce duplication in `ConnectionAdapters::Table` docs. [ci skip]Yves Senn2014-12-271-27/+38
| | | | | | | | | | | | | | | | | | Most of the documentation very closely mirrors the matching docs from `SchemaStatements`. I reduced duplicated copy and added links to the underlying methods for the user to follow.
* | | Add a note about non-buffering servers for AC::LiveAditya Kapoor2014-12-271-0/+5
| | | | | | | | | | | | [ci skip]
* | | Merge pull request #18221 from kamipo/refactor_table_definition_primary_keySean Griffin2014-12-271-4/+2
|\ \ \ | | | | | | | | Refactor `PostgreSQL::TableDefinition#primary_key`
| * | | Refactor `PostgreSQL::TableDefinition#primary_key`Ryuta Kamizono2014-12-271-4/+2
|/ / / | | | | | | | | | | | | Because call the `column` method and set the `options[:primary_key]` is handled at `super`, here need only treat the `options[:default]`.
* | | Inform Arel we don't need additional type casting in testsSean Griffin2014-12-263-4/+4
| | | | | | | | | | | | | | | | | | | | | Part of the larger refactoring to remove type casting from Arel. We can inform it that we already have the right type by wrapping the value in an `Arel::Nodes::Quoted`. This commit can be reverted when we have removed type casting from Arel in Rail 5.1
* | | Inform Arel we don't need additional type casting in batchesSean Griffin2014-12-261-1/+6
| | | | | | | | | | | | | | | | | | | | | Part of the larger refactoring to remove type casting from Arel. We can inform it that we already have the right type by wrapping the value in an `Arel::Nodes::Quoted`. This commit can be reverted when we have removed type casting from Arel in Rail 5.1
* | | Inform Arel that we don't need additional type casting in batchingSean Griffin2014-12-261-2/+8
| | | | | | | | | | | | | | | | | | | | | Part of the larger refactoring to remove type casting from Arel. We can inform it that we already have the right type by wrapping the value in an `Arel::Nodes::Quoted`. This commit can be reverted when we have removed type casting from Arel in Rail 5.1
* | | Go through normal `update_all` logic when updating lock columnsSean Griffin2014-12-262-19/+7
| | |
* | | Go through normal `update_all` logic when updating counter cachesSean Griffin2014-12-261-4/+3
| | | | | | | | | | | | Part of a larger refactoring to remove type casting behavior from Arel
* | | We don't need additional type casting for locking updatesSean Griffin2014-12-261-3/+11
| | | | | | | | | | | | | | | | | | | | | Part of the larger refactoring to remove type casting from Arel. We can inform it that we already have the right type by wrapping the value in an `Arel::Nodes::Quoted`. This commit can be reverted when we have removed type casting from Arel in Rail 5.1
* | | Inform Arel that we don't need type casting in testsSean Griffin2014-12-261-6/+9
| | | | | | | | | | | | | | | | | | | | | Part of the larger refactoring to remove type casting from Arel. We can inform it that we already have the right type by wrapping the value in an `Arel::Nodes::Quoted`. This commit can be reverted when we have removed type casting from Arel in Rail 5.1
* | | Go through normal where logic in `apply_join_dependency`Sean Griffin2014-12-261-1/+1
| | | | | | | | | | | | Part of the larger refactoring to remove type casting from Arel.
* | | Inform Arel that we don't need to cast a value in testsSean Griffin2014-12-261-2/+4
| | | | | | | | | | | | | | | | | | | | | Part of the larger refactoring to remove type casting from Arel. We can inform it that we already have the right type by wrapping the value in an `Arel::Nodes::Quoted`. This commit can be reverted when we have removed type casting from Arel in Rail 5.1
* | | We don't need to type cast the offset in `find_in_batches`Sean Griffin2014-12-261-1/+5
| | | | | | | | | | | | | | | | | | | | | Part of the larger refactoring to remove type casting from Arel. We can inform it that we already have the right type by wrapping the value in an `Arel::Nodes::Quoted`. This commit can be reverted when we have removed type casting from Arel in Rail 5.1
* | | Fall back to type casting from the connection adapterSean Griffin2014-12-261-2/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are several valid cases where right now we can't determine the association's class in a call to `where`. In these cases, we can fall back to casting by looking up the column from the connection adapter (which is what happens right now when we fall through to Arel) This is ugly, and since we're trying to separate the concept of a type from a column, I'd like to remove it in the future. The problem basically comes down to this: Liquid.joins(molecules: :electrons) .where("molecules.name" => "something", "electrons.name" => "something") The hash in this case will turn into: { molecules: { name: "something" }, electrons: { name: "something" }, } What we actually need is: { molecules: { name: "something", electrons: { name: "something" }, } } /cc @mrgilman
* | | Go through normal `where` logic in uniqueness validationSean Griffin2014-12-261-4/+6
| | | | | | | | | | | | | | | | | | | | | This code could use some much heavier refactoring. It looks like `build_relation` duplicates most of the logic of `Relation#where` and `PredicateBuilder` with regards to handling associations and attribute aliases
* | | We don't need to cast the value a second time in uniqueness validationsSean Griffin2014-12-261-0/+1
| | | | | | | | | | | | | | | | | | | | | Part of the larger refactoring to remove type casting from Arel. Since we've already cast the value a few lines above, we don't need to re-cast it later. We can inform Arel of this by wrapping it in an `Arel::Nodes::Quoted`, which will no longer be required in Rails 5.1
* | | We don't need to perform type casting on the STI conditionSean Griffin2014-12-261-0/+1
| | | | | | | | | | | | | | | | | | | | | We will always have the correct type for this query, so no casting is needed. We inform Arel that we already have the right type by wrapping it in an `Arel::Nodes::Quoted` (which we will no longer need to do in Rails 5.1)
* | | Go through normal `where` logic when preloading associationsSean Griffin2014-12-265-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will allow eager type casting to take place as needed. There doesn't seem to be any particular reason that the `in` statement was forced for single values, and the commit message where it was introduced gives no context. See https://github.com/rails/rails/commit/d90b4e2615e8048fdeffc6dffe3246704adee01f
* | | Eagerly cast array values passed to the predicate builderSean Griffin2014-12-262-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | Part of a larger refactoring to remove type casting from Arel. /cc @mrgilman [Sean Griffin & Melanie Gilman]
* | | Eagerly cast range values in the predicate builderSean Griffin2014-12-262-1/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | A custom object is required for this, as you cannot build a range object out of `Arel::Nodes::Quoted` objects. Depends on the changes introduced in https://github.com/rails/arel/commit/cf03bd45e39def057a2f63e42a3391b7d750dece /cc @mrgilman
* | | Perform casting of single values within the predicate builderSean Griffin2014-12-266-7/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As part of the larger refactoring to remove type casting from Arel, we need to do the casting of values eagerly. The predicate builder is the closest place that knows about the Active Record class, and can therefore have the type information. /cc @mrgilman [Sean Griffin & Melanie Gilman]
* | | Remove `klass` and `arel_table` as a dependency of `PredicateBuilder`Sean Griffin2014-12-268-31/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This class cares far too much about the internals of other parts of Active Record. This is an attempt to break out a meaningful object which represents the needs of the predicate builder. I'm not fully satisfied with the name, but the general concept is an object which represents a table, the associations to/from that table, and the types associated with it. Many of these exist at the `ActiveRecord::Base` class level, not as properties of the table itself, hence the need for another object. Currently it provides these by holding a reference to the class, but that will likely change in the future. This allows the predicate builder to remain wholy concerned with building predicates. /cc @mrgilman
* | | Fix new warning in ruby 2.2Sean Griffin2014-12-261-2/+2
| | |
* | | Refactor association handling in `PredicateBuilder`Sean Griffin2014-12-262-21/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I'm attempting to remove `klass` as a dependency of the predicate builder, in favor of an object that better represents what we're using it for. The only part of this which doesn't fit nicely into that picture is the check for an association being polymorphic. Since I'm not yet sure what that is going to look like, I've moved this logic into another class in an attempt to separate things that will change from things that won't.