aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* fix multiple hash preloads. Fixes #14994Aaron Patterson2014-05-202-6/+14
|
* Merge pull request #15199 from sgrif/sg-types-mysqlRafael Mendonça França2014-05-201-69/+11
|\ | | | | Use general types for mysql fields
| * Use general types for mysql fieldsSean Griffin2014-05-201-69/+11
|/
* Merge pull request #15198 from sgrif/sg-delegate-type-cast-mysqlYves Senn2014-05-206-53/+72
|\ | | | | Delegate type_cast to injected type object in mysql
| * Delegate type_cast to injected type object in mysqlSean Griffin2014-05-206-53/+72
|/
* Merge pull request #15197 from sgrif/sg-delegate-type-cast-sqlite3Yves Senn2014-05-2011-7/+83
|\ | | | | Delegate `#type_cast` to injected type objects on SQLite3
| * Delegate `#type_cast` to injected type objects on SQLite3Sean Griffin2014-05-2011-7/+83
| |
* | Merge pull request #14965 from eric-chahin/issue_14824Matthew Draper2014-05-203-1/+33
|\ \ | |/ |/| | | Fixed the inferred table name of a HABTM auxiliar
| * Fixed the inferred table name for HABTM within a schemaEric Chahin2014-05-203-1/+33
|/ | | | Fixes #14824.
* Merge pull request #15192 from simi/guides-binstubsYves Senn2014-05-2016-108/+108
|\ | | | | Use generated binstubs in guides examples. [ci skip]
| * Use generated binstubs in guides examples.Josef Šimánek2014-05-2016-108/+108
|/ | | | [ci skip]
* fix `rake test_sqlite3_mem`.Yves Senn2014-05-201-0/+1
| | | | | | | | | | | | | | | | | | | | While running Sqlite3 memory tests I encountered the following error: ``` Finished in 69.416366s, 58.0267 runs/s, 162.3681 assertions/s. 1) Error: ActiveRecord::Migration::ChangeSchemaTest#test_add_column_with_timestamp_type: NoMethodError: undefined method `type' for nil:NilClass /Users/senny/Projects/rails/activerecord/test/cases/migration/change_schema_test.rb:244:in `test_add_column_with_timestamp_type' 4028 runs, 11271 assertions, 0 failures, 1 errors, 1 skips ``` This was because the table `testings` was used in multiple test-cases. This resulted in a wrongly cached schema on `ActiveRecord::Base.schema_chae`. /cc @zuhao
* docs, `instantiate` expects `String` keys. [Rafal Piekarski & Yves Senn]Yves Senn2014-05-202-4/+15
| | | | | Closes #15122 Closes #15107
* Merge pull request #15182 from zuhao/refactor_actionpack_respond_with_test_2Yves Senn2014-05-201-4/+10
|\ | | | | Un-define :to_json for Customer class after stubbing.
| * Add using_resouce_with_json to controller.Zuhao Wan2014-05-201-4/+10
| |
* | Merge pull request #15178 from zuhao/refactor_actionpack_respond_with_testYves Senn2014-05-202-0/+35
|\ \ | | | | | | Deregister csv renderer after test to prevent leak.
| * | Add ActionController::Renderers.remove.Zuhao Wan2014-05-202-0/+35
| | |
* | | make the AST go from left to right, rather than right to leftAaron Patterson2014-05-192-45/+48
| | |
* | | fix escaping in generationAaron Patterson2014-05-191-1/+7
| | |
* | | Revert "Rewrite journey routes formatter for performance"Aaron Patterson2014-05-192-28/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 5c224de9e110763ec7a0f01f5b604bcf81f40bfb. Conflicts: actionpack/lib/action_dispatch/journey/visitors.rb 5c224de9e110763ec7a0f01f5b604bcf81f40bfb introduced a bug in the formatter. This commit includes a regression test.
* | | Merge pull request #15184 from sgrif/sg-remove-timestamp-typeRafael Mendonça França2014-05-1918-47/+52
|\ \ \ | | | | | | | | Remove :timestamp column type
| * | | Remove :timestamp column typeSean Griffin2014-05-1918-47/+52
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `:timestamp` type for columns is unused. All database adapters treat them as the same database type. All code in `ActiveRecord` which changes its behavior based on the column's type acts the same in both cases. However, when the type is passed to code that checks for the `:datetime` type, but not `:timestamp` (such as XML serialization), the result is unexpected behavior. Existing schema definitions will continue to work, and the `timestamp` type is transparently aliased to `datetime`.
* | | Merge pull request #15155 from dskang/digestRafael Mendonça França2014-05-197-23/+47
|\ \ \ | | | | | | | | Default config.assets.digests to true in development
| * | | Default config.assets.digests to true in developmentDan Kang2014-05-177-23/+47
| |/ /
* | | Fixing test order issuesRafael Mendonça França2014-05-191-2/+8
| | |
* | | Merge pull request #10798 from ↵Rafael Mendonça França2014-05-193-1/+65
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jcxplorer/fix-enable_extension-with-table_name_prefix Fix migrations that use enable_extension with table_name_prefix/suffix Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/migration.rb
| * | | Fix migrations with enable_extensionJoao Carlos2013-05-293-1/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When using ActiveRecord::Base.table_name_prefix and/or table_name_suffix, extension names got the same treatment as table names when running migrations. This led to migrations that tried to call, for example, enable_extension("prefix_hstore") on the connection.
* | | | Merge pull request #15158 from sgrif/sg-delegate-typeYves Senn2014-05-1929-117/+570
|\ \ \ \ | |_|_|/ |/| | | Delegate `Column#type` to the injected type object
| * | | Delegate `Column#type` to the injected type objectSean Griffin2014-05-1929-117/+570
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The decision to wrap type registrations in a proc was made for two reasons. 1. Some cases need to make an additional decision based on the type (e.g. a `Decimal` with a 0 scale) 2. Aliased types are automatically updated if they type they point to is updated later. If a user or another adapter decides to change the object used for `decimal` columns, `numeric`, and `number` will automatically point to the new type, without having to track what types are aliased explicitly. Everything else here should be pretty straightforward. PostgreSQL ranges had to change slightly, since the `simplified_type` method is gone.
* | | test, inline `DeveloperWithAggregate`, which is used by a single test.Yves Senn2014-05-192-7/+7
| | |
* | | Merge pull request #15168 from ↵Rafael Mendonça França2014-05-191-0/+2
|\ \ \ | | | | | | | | | | | | | | | | eileencodes/return-early-on-delete-and-destroy-methods Return early on delete and destroy methods
| * | | early return on delete and destroy methodseileencodes2014-05-181-0/+2
| | |/ | |/| | | | | | | | | | | | | When delete or destroy is called on all records nothing is deleted or destroyed. Intead of running through the code and still not deleteing anything, we should early return
* | | Merge pull request #14126 from schuetzm/index_option_for_columnRafael Mendonça França2014-05-193-6/+28
|\ \ \ | | | | | | | | Make `:index` in migrations work with all column types
| * | | Make `:index` in migrations work with all column typesMarc Schütz2014-05-183-6/+28
| |/ /
* | | Merge pull request #15160 from sgrif/sg-destructured-eachRafael Mendonça França2014-05-191-4/+4
|\ \ \ | | | | | | | | Use destructured arguments when looping through pairs
| * | | Use destructured arguments when looping through pairsSean Griffin2014-05-171-4/+4
| | | | | | | | | | | | | | | | Minor refactoring of looping behavior for aggregation
* | | | pg, re-introduce `PostgreSQL::Utils` to unify schema/table extraction.Yves Senn2014-05-196-39/+51
| | | | | | | | | | | | | | | | Partial revert of c0bfc3f412834ffe8327a15ae3a46602cc28e425
* | | | pg, add missing nodocs for extracted modules.Yves Senn2014-05-195-10/+10
| | | |
* | | | Merge pull request #14962 from arunagw/aa-fix-rake-activerecordYves Senn2014-05-194-78/+81
|\ \ \ \ | | | | | | | | | | Reorganize ActiveRecord tasks [Arun Agrawal & Abd ar-Rahman Hamidi]
| * | | | Reorganize ActiveRecord tasks [Arun Agrawal & Abd ar-Rahman Hamidi]Arun Agrawal2014-05-164-78/+81
| | | | |
* | | | | pg guide, move introductory sentences into main content. [ci skip]Yves Senn2014-05-191-7/+7
| | | | | | | | | | | | | | | | | | | | This is a reaction to https://github.com/rails/rails/commit/7ca75f3789e316b6f3dc1f8000ec4f85c8ba32ea#commitcomment-6303828
* | | | | Merge pull request #15156 from sgrif/sg-postgres-timestampsYves Senn2014-05-181-6/+3
|\ \ \ \ \ | | | | | | | | | | | | PostgreSQL timestamps should always be datetimes
| * | | | | PostgreSQL timestamps are always datetimesSean Griffin2014-05-171-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current behavior is that they are treated as `datetime` normally, but if they are part of an array, they are treated as `timestamp`. The only place that seems to be impacted by this is schema dumping, which shouldn't matter since `t.datetime` and `t.timestamp` are equivalent in the `PostgreSQL` adapter, anyway.
* | | | | | Feature detect based on Ruby version.Aaron Patterson2014-05-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I didn't want to do this, FNM_EXTGLOB is defined on 2.1.x, but Dir.glob returns the wrong value on Ruby less than 2.2.0. Checking for a case-insensitive FS seems too hard, so just check Ruby version Checking for a case-insensitive FS seems too hard, so just check Ruby version.
* | | | | | A tiny pass through the PostgreSQL guide [ci skip]Robin Dupret2014-05-181-3/+4
| | | | | |
* | | | | | copy edits[ci skip]Vijay Dev2014-05-181-7/+6
| | | | | |
* | | | | | Merge pull request #15157 from msgehard/remove_cruft_in_has_secure_passwordYves Senn2014-05-181-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove cruft now that strong_parameters is default [ci skip]
| * | | | | | Let others know why this code is hereMike Gehard2014-05-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | Merge pull request #15169 from Gaurav2728/gaurav-ecosystemYves Senn2014-05-181-1/+0
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | remove ecosystem link that is broken [ci skip]
| * | | | | | remove ecosystem link that is brokenGaurav Sharma2014-05-181-1/+0
|/ / / / / /