aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Expand)AuthorAgeFilesLines
* 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
| * 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
* | rm redundant testJon Leighton2012-07-202-9/+0
* | 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
* | Convert association macros to the new syntaxJon Leighton2012-07-2016-135/+136
* | Avoid options ever being nilJon Leighton2012-07-202-8/+8
* | 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.kennyj2012-07-182-2/+14
* | | Create default join table name using a SymbolCarlos Antonio da Silva2012-07-191-1/+1
* | | 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
* | | 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 join table migration generatorAleksey Magusev2012-07-185-15/+51
* | | | AR::Integration must be included after AM::ConversionJohn Firebaugh2012-07-172-1/+7
| |/ / |/| |
* | | Merge pull request #7076 from kennyj/fix_class_evalAaron Patterson2012-07-172-3/+3
|\ \ \
| * | | Fix class_eval without __FILE__ and __LINE__.kennyj2012-07-182-3/+3
* | | | Fixes "Cannot visit ..." with validates_uniqueness_ofbeerlington2012-07-172-1/+17
|/ / /
* | / 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-152-1/+15
* | | 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-132-4/+134
* | | fixing tests to deal with data differences between prepared statements and no...Aaron Patterson2012-07-133-3/+8
* | | 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