aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Use github url for homepage of log4r [ci skip]Zachary Scott2014-05-281-1/+1
|/ / /
* | | Merge pull request #15392 from arthurnn/move_open_transactionsRafael Mendonça França2014-05-282-4/+4
|\ \ \ | | | | | | | | Keep closer to other methods that touch @transaction
| * | | Keep closer to other methods that touch @transactionArthur Neves2014-05-282-4/+4
| | | |
* | | | Maintain column order when overriding existing columnsSean Griffin2014-05-282-3/+13
|/ / / | | | | | | | | | | | | | | | Working towards re-implementing serialized attributes to use the properties API exposed the need for this, as serializing a column shouldn't change the order of the columns.
* | | Merge pull request #15389 from sgrif/sg-property-inheritanceRafael Mendonça França2014-05-282-5/+26
|\ \ \ | | | | | | | | Ensure custom properties work correctly with inheritance
| * | | Ensure custom properties work correctly with inheritanceSean Griffin2014-05-282-5/+26
| | | |
* | | | Merge pull request #15370 from sgrif/sg-type-namespaceRafael Mendonça França2014-05-2841-643/+592
|\ \ \ \ | | | | | | | | | | Move types to the top level `ActiveRecord` namespace
| * | | | Move types to the top level `ActiveRecord` namespaceSean Griffin2014-05-2741-643/+592
| | | | | | | | | | | | | | | | | | | | | | | | | `ActiveRecord::ConnectionAdapters::Type::Value` => `ActiveRecord::Type::Value`
* | | | | Formatting of content from b1db615 [ci skip]Zachary Scott2014-05-281-3/+7
| | | | |
* | | | | Merge pull request #15380 from Gaurav2728/gaurav-transaction_isolation_errorZachary Scott2014-05-281-0/+3
|\ \ \ \ \ | |_|/ / / |/| | | | Initial doc for TransactionIsolationError [ci skip]
| * | | | Initial doc for TransactionIsolationError [ci skip]Gaurav Sharma2014-05-281-0/+3
| | | | |
* | | | | Merge pull request #15387 from sgrif/sg-remove-column-coderSantiago Pastorino2014-05-282-34/+1
|\ \ \ \ \ | |/ / / / |/| | | | Remove unused `Column#coder`
| * | | | Remove unused `Column#coder`Sean Griffin2014-05-282-34/+1
| |/ / / | | | | | | | | | | | | | | | | It appears this property was added, but never actually used. It would be broken if it were, as it only type casts one way.
* / / / pg, keep `hstore` and `json` attributes as `Hash` in @attributes.Yves Senn2014-05-285-2/+39
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The solution presented in this patch is not efficient. We should replace it in the near future. The following needs to be worked out: * Is `@attributes` storing the Ruby or SQL representation? * `cacheable_column?` is broken but `hstore` and `json` rely on that behavior Refs #15369. /cc @sgrif @rafaelfranca
* | | Merge pull request #15374 from sgrif/sg-private-propertiesRafael Mendonça França2014-05-2712-30/+12
|\ \ \ | | | | | | | | Remove AR Properties from the public API
| * | | Remove AR Properties from the public APISean Griffin2014-05-2712-30/+12
| | | | | | | | | | | | | | | | | | | | Making this part of the public API was premature, let's make it private again while I continue to work on the surrounding code.
* | | | Add CHANGELOG entry for #15269 [ci skip]Rafael Mendonça França2014-05-271-0/+4
| | | |
* | | | Merge pull request #15269 from arunagw/aa-fixes-8930Rafael Mendonça França2014-05-271-1/+1
|\ \ \ \ | | | | | | | | | | rake railties:install:migrations respects the order of railties
| * | | | rake railties:install:migrations respects the order of railtiesArun Agrawal2014-05-271-1/+1
| | | | | | | | | | | | | | | | | | | | This PR fixes #8930 and some stuff from #8985
* | | | | Add test case for clear mappingsAkshay Vishnoi2014-05-281-0/+10
| | | | |
* | | | | Test Case - Change method nameAkshay Vishnoi2014-05-281-1/+1
| | | | |
* | | | | Merge pull request #15371 from sgrif/sg-silence-deprecation-warningRafael Mendonça França2014-05-271-0/+3
|\ \ \ \ \ | | | | | | | | | | | | Silence deprecation warning in test
| * | | | | Silence deprecation warning in testSean Griffin2014-05-271-0/+3
| | |/ / / | |/| | | | | | | | | | | | | Missed a case that only occured for mysql/mysql2
* | | | | Merge pull request #14834 from al2o3cr/issue14155Aaron Patterson2014-05-273-2/+31
|\ \ \ \ \ | |/ / / / |/| | | | Correctly alias table names when joining more than once
| * | | | WIP: pass existing joins to construct_join_dependencyMatt Jones2014-05-163-2/+31
| | | | |
* | | | | Merge pull request #15295 from sgrif/sg-deprecate-decimalsRafael Mendonça França2014-05-277-2/+29
|\ \ \ \ \ | | | | | | | | | | | | Deprecate decimal columns being automatically treated as integers
| * | | | | Deprecate decimal columns being automatically treated as integersSean Griffin2014-05-277-2/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With ActiveRecord::Properties, we now have a reasonable path for users to continue to keep this behavior if they want it. This is an edge case that has added a lot of complexity to the code base.
* | | | | | Merge pull request #15358 from arthurnn/redefine_habtm_fixRafael Mendonça França2014-05-273-25/+46
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix redefine a has_and_belongs_to_many inside inherited class
| * | | | | | Fix redefine a has_and_belongs_to_many inside inherited classArthur Neves2014-05-273-25/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After ad7b5efb55bcc2e0ccd3e7f22a81e984df8676d1, which changed how has_an_belongs_to_many used to work, we start raising an error when redefining the same has_an_belongs_to_many association. This commits fix that regression. [Fixes #14983]
* | | | | | | Merge pull request #15359 from kuldeepaggarwal/f-remove-unwanted_to_symYves Senn2014-05-271-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | remove unwanted `to_sym` call.
| * | | | | | remove unwanted `to_sym` call.Kuldeep Aggarwal2014-05-261-1/+1
| | | | | | |
* | | | | | | Fix syntax error from 5eae77cZachary Scott2014-05-261-1/+1
| | | | | | |
* | | | | | | Move test to the proper fileRafael Mendonça França2014-05-262-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | All preload tests are in the eager_test file
* | | | | | | Add test case for b13d260Rafael Mendonça França2014-05-261-0/+9
| | | | | | |
* | | | | | | Merge pull request #15301 from zzak/issue_15212Rafael Mendonça França2014-05-261-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Skip if the association was already loaded.
| * | | | | | | Skip if the association was already loaded.Zachary Scott2014-05-241-0/+1
| | | | | | | |
* | | | | | | | Merge pull request #15353 from sgrif/sg-mysql-conditionRafael Mendonça França2014-05-261-2/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Remove unnecessary branch from quoting in Mysql
| * | | | | | | | Remove unnecessary branch from quoting in MysqlSean Griffin2014-05-261-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is already the behavior for `BigDecimal` in the abstract adapter.
* | | | | | | | | Typo in AR CHANGELOG [ci skip]Zachary Scott2014-05-261-1/+1
| |_|_|/ / / / / |/| | | | | | |
* | | | | | | | Add a public API to allow users to specify column typesSean Griffin2014-05-2617-22/+194
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As a result of all of the refactoring that's been done, it's now possible for us to define a public API to allow users to specify behavior. This is an initial implementation so that I can work off of it in smaller pieces for additional features/refactorings. The current behavior will continue to stay the same, though I'd like to refactor towards the automatic schema detection being built off of this API, and add the ability to opt out of automatic schema detection. Use cases: - We can deprecate a lot of the edge cases around types, now that there is an alternate path for users who wish to maintain the same behavior. - I intend to refactor serialized columns to be built on top of this API. - Gem and library maintainers are able to interact with `ActiveRecord` at a slightly lower level in a more stable way. - Interesting ability to reverse the work flow of adding to the schema. Model can become the single source of truth for the structure. We can compare that to what the database says the schema is, diff them, and generate a migration.
* | | | | | | Allow empty arrays in where predicatesSean Griffin2014-05-261-0/+2
| | | | | | |
* | | | | | | Merge pull request #15351 from sgrif/sg-allowed-typesRafael Mendonça França2014-05-261-4/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Extract types which don't require additional typecasting to a method
| * | | | | | | Extract types which don't require additional typecasting to a methodSean Griffin2014-05-261-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Database specific adapters shouldn't need to override `type_cast` to define types which are already in an acceptable state.
* | | | | | | | Merge pull request #15300 from arthurnn/refactor_reflectionsRafael Mendonça França2014-05-2616-34/+85
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Refactor reflections
| * | | | | | | | Refactoring .reflections public method.Arthur Neves2014-05-264-9/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now the internal reflections will hold a reference to its public representation, so when the outside world calls `Account.reflection` we can build a list of public reflections.
| * | | | | | | | Use .to_s on _reflections lookupArthur Neves2014-05-242-2/+2
| | | | | | | | |
| * | | | | | | | Merge pull request #15210 from arthurnn/fix_hbtm_reflectionArthur Neves2014-05-2416-30/+62
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix habtm reflection Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/counter_cache.rb activerecord/lib/active_record/reflection.rb activerecord/test/cases/reflection_test.rb
* | | | | | | | Refactor the handling of arrays in where predicatesSean Griffin2014-05-261-11/+14
| |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simplifies the code slightly, isolates non-nil non-range values into a single array, which will make it easier to do things like apply type casting to them in the future.
* | | | | | | Refactor the type casting of booleans in MySQLSean Griffin2014-05-262-13/+18
| | | | | | |
* | | | | | | Merge pull request #15336 from sgrif/sg-quotingMatthew Draper2014-05-275-54/+33
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Remove checks against `column.type` in abstract adapter quoting