aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
Commit message (Expand)AuthorAgeFilesLines
* No need to override for just calling superAkira Matsuda2011-05-292-8/+0
* stop using boolean expressions because of the side effectsAaron Patterson2011-05-271-1/+4
* Merge pull request #1365 from gnufied/sqlite3Aaron Patterson2011-05-272-2/+2
|\
| * delegate connection and column_hash calls directly to modelHemant Kumar2011-05-281-1/+1
| * close statment only if its not closedHemant Kumar2011-05-281-1/+1
* | Merge pull request #1229 from workmad3/masterAaron Patterson2011-05-271-2/+4
|\ \ | |/ |/|
| * Using .try to test for the existence of a method option in a nil-resistent ma...David Workman2011-05-231-5/+2
| * Neatened up the invert_add_index method as per suggestonDavid Workman2011-05-231-2/+3
| * Simple fix for correctly inverting an add_index migration when a name has bee...David Workman2011-05-231-2/+6
* | work around bug in the sqlite3 bindings. fixes #1289Aaron Patterson2011-05-271-0/+1
* | Merge pull request #1323 from fx/association_primary_keyJon Leighton2011-05-261-1/+1
|\ \
| * | use association_primary_key in AssociationScope#add_constraintsMarian Rudzynski2011-05-261-1/+1
* | | Merge pull request #1318 from TheEmpty/masterJon Leighton2011-05-262-10/+0
|\ \ \
| * | | Removes the restriction on primary key when joining in a habtm && test that i...Mohammad El-Abid2011-05-262-10/+0
| |/ /
* / / Don't merge base opts into includes when serializing ARsJohn Mileham2011-05-261-6/+2
|/ /
* | Merge branch 'master' of github.com:rails/railsXavier Noria2011-05-258-127/+4
|\ \
| * \ Merge pull request #1285 from joshk/remove_active_record_deprecationsAaron Patterson2011-05-258-127/+4
| |\ \
| | * | removed deprecated methods, and related tests, from ActiveRecordJosh Kalderimis2011-05-258-127/+4
* | | | Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-05-2528-82/+86
|\ \ \ \ | |/ / / |/| | |
| * | | Remove extra white spaces on ActiveRecord docs.Sebastian Martinez2011-05-2325-51/+51
| * | | has_many :dependent => :restrict raises an exception but is not documented ap...Aditya Sanghi2011-05-221-2/+4
| * | | Add more doc to #update_column.Sebastian Martinez2011-05-201-0/+2
| * | | Changing examples: use 'each' instead of 'for in'Guillermo Iguaran2011-05-191-4/+4
| * | | Remove extra white-spaces.Sebastian Martinez2011-05-191-24/+24
| * | | Closes GH #1032John Paul Ashenfelter2011-05-191-1/+1
* | | | Fix the AR::Base#inspect method [closes #1294]Franck Verrot2011-05-251-6/+10
* | | | Database.rake file fixed for load_generatorsArun Agrawal2011-05-251-2/+1
| |/ / |/| |
* | | Everyone receives app as argument for consistency.José Valim2011-05-251-2/+2
* | | Fix infinite recursion where a lazy default scope references a scope. Fixes #...Jon Leighton2011-05-252-4/+13
* | | Merge pull request #1254 from pixeltrix/ignore-includes-in-through-scopeJon Leighton2011-05-241-1/+1
|\ \ \
| * | | Ignore :includes on through associationsAndrew White2011-05-241-1/+1
* | | | Ensure that the surrounding code in Relation#to_a respects the default_scope ...Jon Leighton2011-05-241-17/+24
* | | | rescue record invalid exceptions and return false from the save method. fixes...Aaron Patterson2011-05-241-1/+5
* | | | properly reference yml alias nodesdmathieu2011-05-242-3/+3
|/ / /
* | | Remove extra white-space on some exception messages.Sebastian Martinez2011-05-236-7/+7
* | | fixing 1.8 support for new fixture testsAaron Patterson2011-05-231-1/+4
* | | removing CSV fixture supportAaron Patterson2011-05-231-52/+10
* | | fixture file will validate fixture formatAaron Patterson2011-05-231-1/+8
* | | return an empty array for empty yaml filesAaron Patterson2011-05-231-1/+3
* | | use top level file constant for join, etcAaron Patterson2011-05-231-4/+4
* | | adding AR::Fixtures::File class to wrap a fixture fileAaron Patterson2011-05-232-0/+44
* | | Removed AS core_ext/kernel/requires as it's not used and is bad practice.Josh Kalderimis2011-05-233-3/+0
| |/ |/|
* | Merge pull request #1228 from fcheung/db_time_fix2José Valim2011-05-231-1/+3
|\ \
| * | Take into account time spent in AR even if a redirect occurs or if it is afte...Frederick Cheung2011-05-231-1/+3
* | | Merge pull request #1184 from gnufied/masterAaron Patterson2011-05-231-0/+1
|\ \ \
| * | | fix connection not established error while running rake taskBhavin Kamani2011-05-211-0/+1
* | | | Revert "Take into account time spent in AR even if a redirect occurs or if it...David Heinemeier Hansson2011-05-221-5/+3
* | | | Fix problem with loading polymorphic associations which have been defined in ...Jon Leighton2011-05-223-13/+26
* | | | Take into account time spent in AR even if a redirect occurs or if it is afte...Frederick Cheung2011-05-221-3/+5
| |/ / |/| |
* | | Bump versions for rc1David Heinemeier Hansson2011-05-211-1/+1