aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Refactor ActiveRecord::Inheritance.base_class logicbeerlington2012-07-263-30/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved logic from class_of_active_record_descendant(class) to the base_class method. This method was confusing because it required an argument, but that argument was 'self'. Moved base_class tests to inheritance_test.rb and added some test coverage for some untested cases.
* | | | Missed extend for eager_autoloadDmitry Vorotilin2012-07-261-0/+1
| | | |
* | | | Merge pull request #7166 from ayrton/patch-1Jon Leighton2012-07-261-13/+13
|\ \ \ \ | | | | | | | | | | Update activerecord/CHANGELOG.md
| * | | | Update activerecord/CHANGELOG.mdAyrton De Craene2012-07-261-13/+13
| | | | | | | | | | | | | | | Fixed markdown code indenting
* | | | | Merge pull request #7161 from ↵Jon Leighton2012-07-261-5/+7
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | michaelfairley/eager_load_active_record_association_helpers Eager autoload ActiveRecord association helpers
| * | | | Eager autoload ActiveRecord association helpersMichael Fairley2012-07-251-5/+7
| | | | |
* | | | | Switched update_column recommendation in changelog to update_columnsPhilip Arndt2012-07-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Related to #7164 Looks like the last one; thanks!
* | | | | Merge pull request #6654 from stevecj/postgresql-auto-reconnect-2Aaron Patterson2012-07-253-1/+76
|\ \ \ \ \ | | | | | | | | | | | | Postgresql auto reconnect 2
| * | | | | Stop being silly with formatting of method aliasing.Steve Jorgensen2012-07-161-3/+3
| | | | | |
| * | | | | Simulated & actual (manual/skipped) PostgreSQL auto-reconnection tests.Steve Jorgensen2012-07-163-0/+75
| | | | | |
| * | | | | Don't crash exception translation w/ nil result attribute.Steve Jorgensen2012-07-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Exception.result is nil when attempting a query after PostgreSQL disconnect, resulting in new exception: NoMethodError: undefined method `error_field' for nil:NilClass
* | | | | | Use string datatype for the setting attributeYasuo Honda2012-07-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | to make store works all database adapters.
* | | | | | Deprecate update_column in favor of update_columns.Rafael Mendonça França2012-07-2415-47/+85
| | | | | | | | | | | | | | | | | | | | | | | | Closes #1190
* | | | | | Use update_columns to implemente the update_columnRafael Mendonça França2012-07-242-19/+54
| | | | | |
* | | | | | New #update_columns method.Sebastian Martinez2012-07-242-0/+74
| | | | | |
* | | | | | This pull requests addresses ORA-01400 errors and also supports #6115 issue ↵Yasuo Honda2012-07-251-1/+1
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tested. Issue #6115 has been fixed and tested with the attribute `:null => false, :default => ""` However `:null => false` attribute is not necessary to test this issue, which causes many ORA-01400 errors with Oracle enhanced adapter.
* | | | | Restore connection_id on error.kennyj2012-07-232-4/+22
| |_|_|/ |/| | |
* | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-07-217-27/+108
|\ \ \ \
| * | | | improve NullRelation docs [ci skip]Vijay Dev2012-07-212-5/+4
| | | | |
| * | | | minor copy edits [ci skip]Vijay Dev2012-07-212-4/+2
| | | | |
| * | | | Fix typosOscar Del Ben2012-07-191-3/+3
| | | | |
| * | | | Add nodocs to delegation module and docs for merge!Oscar Del Ben2012-07-172-1/+2
| | | | |
| * | | | Update batches docsOscar Del Ben2012-07-171-6/+6
| | | | |
| * | | | Add nodoc to HashMerger and MergerOscar Del Ben2012-07-171-2/+2
| | | | |
| * | | | Fix typos and add nodocs to NullRelationOscar Del Ben2012-07-172-4/+4
| | | | |
| * | | | Improve docs for AR RelationOscar Del Ben2012-07-171-7/+19
| | | | |
| * | | | Add docs for Relation initialize, create and create!Oscar Del Ben2012-07-161-1/+34
| | | | |
| * | | | Don't link to edgeguides in docsOscar Del Ben2012-07-161-1/+1
| | | | |
| * | | | TypoOscar Del Ben2012-07-161-1/+0
| | | | |
| * | | | Add documentation for query_methods bang methodsOscar Del Ben2012-07-161-1/+20
| | | | |
| * | | | Add nodoc to create_with_valueOscar Del Ben2012-07-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Reason: all *_value methods are defined dynamically and so don't appear in the documentation.
| * | | | Add documentation for arel and build_arelOscar Del Ben2012-07-161-0/+2
| | | | |
| * | | | Add documentation for create_withOscar Del Ben2012-07-161-1/+19
| | | | |
* | | | | rm unnecessary testJon Leighton2012-07-203-12/+0
| | | | | | | | | | | | | | | | | | | | | | | | | interpolation is no longer a thing separate from "normal" assoc conditions.
* | | | | rm redundant testJon Leighton2012-07-202-9/+0
| | | | | | | | | | | | | | | | | | | | now everything is converted to the new style, this is not needed
* | | | | remove unused methodJon Leighton2012-07-201-4/+0
| | | | |
* | | | | we don't need this argJon Leighton2012-07-201-2/+2
| | | | |
* | | | | Remove :finder_sql, :counter_sql, :insert_sql, :delete_sql.Jon Leighton2012-07-2015-339/+48
| | | | |
* | | | | Remove obsolete line.Jon Leighton2012-07-201-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This code is broken (it should say association_scope.uniq_value rather than options[:uniq]) but the tests still pass. I think it is designed to uniq-ify associations using finder_sql. However, I am about to remove that anyway.
* | | | | Convert association macros to the new syntaxJon Leighton2012-07-2016-135/+136
| | | | |
* | | | | Avoid options ever being nilJon Leighton2012-07-202-8/+8
| | | | | | | | | | | | | | | | | | | | This fixes active_record_deprecated_finders.
* | | | | Merge pull request #7078 from kennyj/logging_query_planRafael Mendonça França2012-07-192-2/+14
|\ \ \ \ \ | | | | | | | | | | | | Log query plan when we use count_by_sql method.
| * | | | | Log query plan when we use count_by_sql method.kennyj2012-07-182-2/+14
| | | | | |
* | | | | | Create default join table name using a SymbolCarlos Antonio da Silva2012-07-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Lets stick with a symbol in join table name, it was removed in 993e1643650b7b0939437f86b7b4cda0d92b0b8f and broke the build.
* | | | | | Use attributes instead of table names in migration exampleJosé Valim2012-07-191-1/+1
| | | | | |
* | | | | | Add fkey attributes to `join_table` migration generatorAleksey Magusev2012-07-193-6/+14
| | | | | |
* | | | | | revert Default timestamps to non-nullDave Kroondyk2012-07-183-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 3dbedd2 added NOT NULL constraints to timestamps. Commit fcef728 started to revert this, but was incomplete. With this commit, 3dbedd2 should be fully reverted and timestamps will no longer default to NOT NULL.
* | | | | | Update changelog for migration generator changeJosé Valim2012-07-181-0/+7
| | | | | |
* | | | | | Merge pull request #7028 from lexmag/join_table_indexesJosé Valim2012-07-185-15/+51
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add indexes to create_join_table method
| * | | | | | Add join table migration generatorAleksey Magusev2012-07-185-15/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For instance, running rails g migration CreateMediaJoinTable artists musics:uniq will create a migration with create_join_table :artists, :musics do |t| # t.index [:artist_id, :music_id] t.index [:music_id, :artist_id], unique: true end