aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #6654 from stevecj/postgresql-auto-reconnect-2Aaron Patterson2012-07-251-1/+2
|\
| * Simulated & actual (manual/skipped) PostgreSQL auto-reconnection tests.Steve Jorgensen2012-07-161-0/+1
| * Don't crash exception translation w/ nil result attribute.Steve Jorgensen2012-07-161-1/+1
* | Deprecate update_column in favor of update_columns.Rafael Mendonça França2012-07-242-4/+9
* | Use update_columns to implemente the update_columnRafael Mendonça França2012-07-241-17/+18
* | New #update_columns method.Sebastian Martinez2012-07-241-0/+17
* | Restore connection_id on error.kennyj2012-07-231-4/+10
* | 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
| * | Add documentation for arel and build_arelOscar Del Ben2012-07-161-0/+2
| * | Add documentation for create_withOscar Del Ben2012-07-161-1/+19
* | | 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-208-142/+35
* | | Remove obsolete line.Jon Leighton2012-07-201-1/+0
* | | Convert association macros to the new syntaxJon Leighton2012-07-201-1/+1
* | | Avoid options ever being nilJon Leighton2012-07-202-8/+8
* | | Merge pull request #7078 from kennyj/logging_query_planRafael Mendonça França2012-07-191-2/+4
|\ \ \
| * | | Log query plan when we use count_by_sql method.kennyj2012-07-181-2/+4
* | | | Create default join table name using a SymbolCarlos Antonio da Silva2012-07-191-1/+1
* | | | Add fkey attributes to `join_table` migration generatorAleksey Magusev2012-07-192-4/+4
* | | | revert Default timestamps to non-nullDave Kroondyk2012-07-181-1/+1
* | | | Merge pull request #7028 from lexmag/join_table_indexesJosé Valim2012-07-182-6/+7
|\ \ \ \
| * | | | Add join table migration generatorAleksey Magusev2012-07-182-6/+7
* | | | | AR::Integration must be included after AM::ConversionJohn Firebaugh2012-07-171-1/+1
| |/ / / |/| | |
* | | | Fixes "Cannot visit ..." with validates_uniqueness_ofbeerlington2012-07-171-1/+1
| |_|/ |/| |
* | | Fix activerecord model to_ary method comment 'see also' linkKang Wen2012-07-161-1/+1
| |/ |/|
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-07-152-3/+40
|\ \
| * | session_id column is string in defaultkennyj2012-07-151-1/+1
| * | Add docs for having, lock and readonlyOscar Del Ben2012-07-071-0/+12
| * | Add doc for joins and improve includes docOscar Del Ben2012-07-071-2/+17
| * | Add docs for eager_laod and preloadOscar Del Ben2012-07-071-0/+10
| |/
* | Fix SqlBypass.data_column= problem. SqlBypass.find_by_session_id method didn'...kennyj2012-07-151-1/+1
* | Avoid to call send(store_attribute) twice.kennyj2012-07-151-6/+8
* | teaching the mysql adapter how to typecast strings returned from the databaseAaron Patterson2012-07-131-2/+132
* | Fixing texts; down to three failing tests.Jeremy Cole2012-07-132-15/+24
* | Only use prepared statements when bind variables are presentJeremy Cole2012-07-131-34/+40
* | fix association :extend optionJon Leighton2012-07-134-13/+20