aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #15248 from sgrif/sg-additional-type-map-argsRafael Mendonça França2014-05-225-12/+29
|\ | | | | Allow additional arguments to be used during type map lookups
| * Allow additional arguments to be used during type map lookupsSean Griffin2014-05-225-12/+29
| | | | | | | | | | | | | | | | Determining things like precision and scale in postgresql will require the given blocks to take additional arguments besides the OID. - Adds the ability to handle additional arguments to `TypeMap` - Passes the column type to blocks when looking up PG types
* | pg test, extract tsvector tests into `postgresql/full_text_test.rb`Yves Senn2014-05-222-27/+31
| |
* | pg test, move timestamp tests over to `postgresql/timestamp_test.rb`.Yves Senn2014-05-222-43/+53
| |
* | pg test, extract network address type tests into separate file.Yves Senn2014-05-223-51/+79
| |
* | pg test, remove unused code.Yves Senn2014-05-221-3/+0
|/
* Merge pull request #14803 from kuldeepaggarwal/null_relation_sum_fixMatthew Draper2014-05-223-3/+66
|\ | | | | | | Fixed a problem where `sum` used with a `group` was not returning a Hash.
| * Fixed a problem where `sum`, `size`, `average`, `minimum` and `maximum` usedKuldeep Aggarwal2014-05-153-3/+66
| | | | | | | | with a grouping was not returning a Hash.
* | Merge pull request #15237 from sgrif/sg-move-extract-scaleRafael Mendonça França2014-05-214-8/+7
|\ \ | | | | | | Move extract_scale to decimal type
| * | Move extract_scale to decimal typeSean Griffin2014-05-214-8/+7
| | | | | | | | | | | | | | | | | | The only type that has a scale is decimal. There's a special case where decimal columns with 0 scale are type cast to integers if the scale is not specified. Appears to only affect schema dumping.
* | | Merge pull request #15218 from sgrif/sg-move-oid-typesRafael Mendonça França2014-05-2123-353/+532
|\ \ \ | | | | | | | | Move PG OID types to their own files
| * | | Move PG OID types to their own filesSean Griffin2014-05-2123-353/+532
| | | | | | | | | | | | | | | | | | | | | | | | | | | | As we promote these classes to first class concepts, these classes are starting to gain enough behavior to warrant being moved into their own files. Many of them will become quite large as we move additional behavior to the type objects.
* | | | Rename `oid_type` to `cast_type` to make PG columns consistentSean Griffin2014-05-212-15/+5
| |/ / |/| |
* | | Merge pull request #15219 from sgrif/sg-missing-nodocRafael Mendonça França2014-05-211-3/+3
|\ \ \ | | | | | | | | Add missing nodoc
| * | | Add missing nodocs to MySQL adapterSean Griffin2014-05-211-3/+3
| |/ /
* | | Merge pull request #14613 from Sirupsen/fix-serialize-update-columnRafael Mendonça França2014-05-214-14/+51
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix serialized field returning serialized data after update_column Conflicts: activerecord/CHANGELOG.md
| * | | Fix serialized field returning serialized data after update_columnSimon Eskildsen2014-04-054-14/+51
| | | |
* | | | Revert "Merge pull request #14544 from jefflai2/named_scope_sti"Rafael Mendonça França2014-05-218-42/+5
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 9a1abedcdeecd9464668695d4f9c1d55a2fd9332, reversing changes made to c72d6c91a7c0c2dc81cc857a1d6db496e84e0065. Conflicts: activerecord/CHANGELOG.md activerecord/test/models/comment.rb This change break integration with activerecord-deprecated_finders so I'm reverting until we find a way to make it work with this gem.
* | | build fix, use lambda syntax that ruby 1.9.3 understands.Yves Senn2014-05-211-1/+1
| | |
* | | push `extract_scale` to the `Type`.Yves Senn2014-05-214-7/+9
| | | | | | | | | | | | | | | | | | | | | - `extract_precision`, `extract_limit`, and `extract_default` probably need to follow. - would be good to remove the delegation `Column#extract_scale`. /cc @sgrif
* | | pg, extract money tests into separate file.Yves Senn2014-05-212-35/+55
| | | | | | | | | | | | | | | - Added assertions about the column. Specifically scale. - Move record insertion from setup into test method.
* | | Merge pull request #14855 from laurocaetano/fix_polymorphic_with_string_keyYves Senn2014-05-215-4/+50
|\ \ \ | | | | | | | | | | | | Fix polymorphic eager load with foreign_key as String.
| * | | Fix polymorphic eager load with foreign_key as String.Lauro Caetano2014-05-205-2/+42
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | The foreign_key could be `String` and just doing `owners_map[owner_key]` could return `nil`. To prevent this bug, we should `to_s` both keys if their types are different. Fixes #14734.
* | | Merge pull request #14544 from jefflai2/named_scope_stiRafael Mendonça França2014-05-208-5/+42
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fixes Issue #13466. Conflicts: activerecord/CHANGELOG.md
| * | | Fixes Issue #13466.Jefferson Lai2014-04-238-5/+42
| | | | | | | | | | | | | | | | | | | | | | | | Changed the call to a scope block to be evaluated with instance_eval. The result is that ScopeRegistry can use the actual class instead of base_class when caching scopes so queries made by classes with a common ancestor won't leak scopes.
* | | | Merge pull request #15205 from sgrif/sg-delegate-klassRafael Mendonça França2014-05-209-14/+33
|\ \ \ \ | | | | | | | | | | Delegate `klass` to the injected type object
| * | | | Delegate `klass` to the injected type objectSean Griffin2014-05-209-14/+33
| | | | |
* | | | | Merge pull request #14979 from brocktimus/masterRafael Mendonça França2014-05-203-1/+16
|\ \ \ \ \ | | | | | | | | | | | | Making belongs_to: touch behaviour be consistent with save updating updated_at
| * | | | | Prevented belongs_to: touch propagating up if there are no changes being savedBrock Trappitt2014-05-213-1/+16
| |/ / / /
* / / / / Revert "Revert "Merge pull request #8313 from ↵Rafael Mendonça França2014-05-203-8/+22
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | alan/only_save_changed_has_one_objects"" This reverts commit e94e6c27af495a2460c811bb506459f1428dec6b. Conflicts: activerecord/CHANGELOG.md The original commit was reverted only to be safe since #14407 were reported. We don't have any proof we added a regression with the original commit so reverting it now will give us more problem. Closes #14407
* | | | Delegate `type_cast_for_write` to injected type objectSean Griffin2014-05-204-30/+14
| | | |
* | | | Merge pull request #15207 from sgrif/sg-inline-column-helpersRafael Mendonça França2014-05-2010-120/+77
|\ \ \ \ | | | | | | | | | | Inline typecasting helpers from Column to the appropriate types
| * | | | Inline typecasting helpers from Column to the appropriate typesSean Griffin2014-05-2010-120/+77
| | | | |
* | | | | Merge pull request #15206 from sgrif/sg-type-map-postgresqlRafael Mendonça França2014-05-203-45/+31
|\ \ \ \ \ | | | | | | | | | | | | Use the generic type map for PostgreSQL OID registrations
| * | | | | Use the generic type map for PostgreSQL OID registrationsSean Griffin2014-05-203-45/+31
| |/ / / /
* / / / / Delegate predicate methods to injected type object on ColumnSean Griffin2014-05-2012-24/+44
|/ / / /
* | | | Use the generic type map object for mysql field lookupsSean Griffin2014-05-204-23/+39
| | | |
* | | | Merge pull request #15203 from sgrif/sg-delegate-type-castRafael Mendonça França2014-05-207-75/+7
|\ \ \ \ | | | | | | | | | | Replace `type_cast` case statement with delegation
| * | | | Replace `type_cast` case statement with delegationSean Griffin2014-05-207-75/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All subclasses of column were now delegating `type_cast` to their injected type object. We can remove the overriding methods, and generalize it on the `Column` class itself. This also enabled us to remove several column classes completely, as they no longer had any meaningful behavior of their own.
* | | | | Merge pull request #15201 from sgrif/sg-types-postgresqlRafael Mendonça França2014-05-204-151/+85
|\ \ \ \ \ | | | | | | | | | | | | Have Postgres OID types inherit from general types
| * | | | | Have Postgres OID types inherit from general typesSean Griffin2014-05-204-151/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using general types where possible. Several more can go away once infinity gets figured out.
* | | | | | fix multiple hash preloads. Fixes #14994Aaron Patterson2014-05-202-6/+14
| | | | | |
* | | | | | Use general types for mysql fieldsSean Griffin2014-05-201-69/+11
| |/ / / / |/| | | |
* | | | | 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
| | | | |
* | | | | Fixed the inferred table name for HABTM within a schemaEric Chahin2014-05-203-1/+33
|/ / / / | | | | | | | | | | | | Fixes #14824.
* | | | 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
* | | | 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`.