aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Expand)AuthorAgeFilesLines
* Update test data which doesn't reflect expected usageSean Griffin2014-06-122-11/+11
* Merge pull request #15394 from morgoth/fix-automatic-maintaining-test-schema-...Yves Senn2014-06-123-1/+14
|\
| * Fixed automatic maintaining test schema to properly handle sql structure sche...Wojciech Wnętrzak2014-06-123-1/+12
* | Merge pull request #15647 from sgrif/sg-unused-requireYves Senn2014-06-121-2/+0
|\ \
| * | Remove unused requireSean Griffin2014-06-111-2/+0
* | | Pluck should work with columns of the same name from different tablesSean Griffin2014-06-113-3/+15
|/ /
* | Merge pull request #15582 from sgrif/sg-timestampsRafael Mendonça França2014-06-111-3/+5
|\ \
| * | Refactor determination of max updated timestampSean Griffin2014-06-091-3/+5
* | | Merge pull request #15630 from eileencodes/refactor-join-keys-on-add_constraintsMatthew Draper2014-06-122-12/+20
|\ \ \
| * | | begin refactoring add_constraints by moving join keyseileencodes2014-06-102-12/+20
* | | | Merge pull request #15429 from sgrif/sg-rm-cached-attributesRafael Mendonça França2014-06-113-73/+24
|\ \ \ \
| * | | | rm cached attributesSean Griffin2014-06-113-73/+24
| |/ / /
* | | | Add has_one? docs [skip ci]Arthur Neves2014-06-111-0/+1
* | | | Merge pull request #15637 from akshay-vishnoi/delete-deprecated-methodSantiago Pastorino2014-06-111-4/+0
|\ \ \ \
| * | | | Remove deprecation warningAkshay Vishnoi2014-06-111-4/+0
| |/ / /
* | | | Merge pull request #15638 from sgrif/sg-column-typesRafael Mendonça França2014-06-111-6/+10
|\ \ \ \
| * | | | Ensure `column_types` returns a type object, and not a columnSean Griffin2014-06-111-6/+10
| |/ / /
* / / / Remove YAML serialization workaround for columnsSean Griffin2014-06-111-6/+2
|/ / /
* | | Merge pull request #15621 from sgrif/sg-column-type-decorationsRafael Mendonça França2014-06-102-2/+1
|\ \ \
| * | | No need to decorate columns twiceSean Griffin2014-06-102-2/+1
* | | | remove deprecation call while initializing `ClassCache` objectKuldeep Aggarwal2014-06-112-13/+1
* | | | Remove deprecated method ActiveRecord::Base.quoted_locking_columnAkshay Vishnoi2014-06-103-10/+4
|/ / /
* | | Merge pull request #15610 from sgrif/silence-warningsRafael Mendonça França2014-06-102-3/+3
|\ \ \
| * | | Silence warnings in tests.Sean Griffin2014-06-102-3/+3
* | | | Keep the types of virtual columns after yaml serializationSean Griffin2014-06-104-3/+32
|/ / /
* | | Merge pull request #15607 from sgrif/sg-array-type-castRafael Mendonça França2014-06-103-34/+28
|\ \ \
| * | | Inline PG array type casting helperSean Griffin2014-06-103-34/+28
* | | | test, fix typo, `create_index` does not exist.Yves Senn2014-06-101-1/+1
* | | | ActiveRecord::FinderMethods.find passes proc parameter #15382James Yang2014-06-103-1/+19
* | | | Use HasAndBelongsToMany instead of HABTMArthur Neves2014-06-092-2/+2
* | | | reuse available collection? check instead of macroeileencodes2014-06-093-5/+5
* | | | Merge pull request #15596 from eileencodes/add-has_one-method-and-reuseRafael Mendonça França2014-06-095-5/+9
|\ \ \ \
| * | | | add has_one? method and reuse instead of checking macroeileencodes2014-06-095-5/+9
* | | | | Merge pull request #15595 from eileencodes/abstract-away-habtm-macroAaron Patterson2014-06-092-2/+9
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Abstract away use of HABTM macroeileencodes2014-06-092-2/+9
* | | | | Timestamp values should be present on callbacksRafael Mendonça França2014-06-094-23/+15
| |/ / / |/| | |
* | | | Rename `type_cast` to `type_cast_from_database`Sean Griffin2014-06-0926-132/+135
* | | | Merge pull request #15586 from sgrif/sg-identity-typeRafael Mendonça França2014-06-091-1/+1
|\ \ \ \
| * | | | Use an actual identity type in AR::Result#identity_typeSean Griffin2014-06-091-1/+1
| | |/ / | |/| |
* | | | Merge pull request #15587 from sgrif/sg-remove-workaroundRafael Mendonça França2014-06-091-15/+8
|\ \ \ \
| * | | | Remove workaround for non-lazy serialize in testsSean Griffin2014-06-091-15/+8
| |/ / /
* | | | Merge pull request #15591 from sgrif/sg-rm-write-attributeRafael Mendonça França2014-06-0915-64/+64
|\ \ \ \
| * | | | Make `_before_type_cast` actually be before type castSean Griffin2014-06-0915-64/+64
| |/ / /
* | / / Do not try to set the foreign_key again on has_many throughRafael Mendonça França2014-06-091-1/+1
| |/ / |/| |
* | | Remove a long gone :order option from has_one's valid_options.thedarkone2014-06-091-1/+1
|/ /
* | fix test cases after #15558 merge to master.Kuldeep Aggarwal2014-06-071-3/+3
* | Merge pull request #15558 from sgrif/sg-rename-propertyRafael Mendonça França2014-06-077-25/+25
|\ \
| * | Rename `property` to `attribute`Sean Griffin2014-06-078-26/+26
* | | Merge pull request #15546 from sgrif/sg-lazy-decoratorsRafael Mendonça França2014-06-077-16/+179
|\ \ \
| * | | Don't query the database schema when calling `serialize`Sean Griffin2014-06-077-16/+179