aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
* No need to pass options which is never usedAkira Matsuda2011-05-291-2/+2
|
* No need to override for just calling superAkira Matsuda2011-05-292-8/+0
|
* Disable IdentityMap by default for ActiveRecord testingAkira Matsuda2011-05-281-2/+2
| | | | because enabling IM by default will possibly hide some bugs on 3.1 default behavior
* 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
|\ | | | | close statment only if its not closed
| * 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-272-2/+16
|\ \ | |/ |/| Fix for Issue #1205
| * Added a test to check for correct behaviour with no options in add_index ↵David Workman2011-05-241-0/+6
| | | | | | | | command recorder
| * Using .try to test for the existence of a method option in a nil-resistent ↵David Workman2011-05-231-5/+2
| | | | | | | | manner. Inlined the determination of the options hash for reversing using a ternary operator. Shortens the method in a way that keeps the code neat
| * 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 ↵David Workman2011-05-232-2/+12
| | | | | | | | been provided
* | work around bug in the sqlite3 bindings. fixes #1289Aaron Patterson2011-05-271-0/+1
| |
* | fixing test for mysql2Aaron Patterson2011-05-271-5/+2
| |
* | adding a test for #1322Aaron Patterson2011-05-261-0/+15
| |
* | Merge pull request #1323 from fx/association_primary_keyJon Leighton2011-05-262-1/+11
|\ \ | | | | | | use association_primary_key in AssociationScope#add_constraints
| * | added assertion for non-standard primary_key on models used in the ↵Marian Rudzynski2011-05-261-0/+3
| | | | | | | | | | | | primary_key test
| * | use association_primary_key in AssociationScope#add_constraintsMarian Rudzynski2011-05-262-1/+8
| | |
* | | Merge pull request #1318 from TheEmpty/masterJon Leighton2011-05-263-19/+0
|\ \ \ | | | | | | | | Resolve issue #534
| * | | Removes a now needless test - via GithubMohammad Typaldos2011-05-261-8/+0
| | | |
| * | | Removes the restriction on primary key when joining in a habtm && test that ↵Mohammad El-Abid2011-05-263-15/+4
| |/ / | | | | | | | | | it was properly removed
* | | Don't merge base opts into includes when serializing ARsJohn Mileham2011-05-261-6/+2
| | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/serialization.rb
* | | Failing test - JSON serialization shouldn't merge base opts into include opts.John Mileham2011-05-261-0/+9
|/ /
* | Merge branch 'master' of github.com:rails/railsXavier Noria2011-05-2512-162/+4
|\ \
| * \ Merge pull request #1285 from joshk/remove_active_record_deprecationsAaron Patterson2011-05-2512-162/+4
| |\ \ | | | | | | | | removed deprecated methods, and related tests, from ActiveRecord
| | * | removed deprecated methods, and related tests, from ActiveRecordJosh Kalderimis2011-05-2512-162/+4
| | | |
* | | | Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-05-2529-83/+87
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | Conflicts: actionmailer/lib/action_mailer/base.rb activesupport/lib/active_support/core_ext/kernel/requires.rb
| * | | changed http://api.rubyonrails.com to http://api.rubyonrails.org in readme ↵Karunakar (Ruby)2011-05-241-1/+1
| | | | | | | | | | | | | | | | files
| * | | Remove extra white spaces on ActiveRecord docs.Sebastian Martinez2011-05-2325-51/+51
| | | |
| * | | has_many :dependent => :restrict raises an exception but is not documented ↵Aditya Sanghi2011-05-221-2/+4
| | | | | | | | | | | | | | | | appropriately. has_one also has :dependent => :restrict but is not documented at all.
| * | | 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
| | | | | | | | | | | | | | | | Fixed what looks like minor cut/paste error in documentation for ActiveRecord::Locking:Pessimistic
* | | | Add the MIT-LICENSE to the Active Record gemspecFranck Verrot2011-05-251-1/+1
| | | |
* | | | Fix the AR::Base#inspect method [closes #1294]Franck Verrot2011-05-251-6/+10
| | | |
* | | | Test AR::Base#inspect on an allocated object not yet initializedFranck Verrot2011-05-251-0/+8
| | | |
* | | | 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-254-4/+36
| | | | | | | | | | | | #1264.
* | | Merge pull request #1254 from pixeltrix/ignore-includes-in-through-scopeJon Leighton2011-05-244-1/+16
|\ \ \ | | | | | | | | Ignore :includes on through associations
| * | | Ignore :includes on through associationsAndrew White2011-05-244-1/+16
| | | |
* | | | Ensure that the surrounding code in Relation#to_a respects the default_scope ↵Jon Leighton2011-05-241-17/+24
| | | | | | | | | | | | | | | | (as well as having Relation#arel respect the default scope). Fixes #1233.
* | | | Failing tests for #1233.Andrew White2011-05-242-0/+75
| | | |
* | | | Merge pull request #1274 from vijaydev/rake-packagetask-warning-fixJosé Valim2011-05-241-2/+2
|\ \ \ \ | | | | | | | | | | Fixes for Rake::GemPackageTask deprecation warnings from Rake 0.9.0
| * | | | fixes Rake::GemPackageTask deprecation warnings from rake 0.9.0Vijay Dev2011-05-241-2/+2
| | | | |
* | | | | rescue record invalid exceptions and return false from the save method. ↵Aaron Patterson2011-05-241-1/+5
| | | | | | | | | | | | | | | | | | | | fixes #796
* | | | | add tests surrounding behavior of save and save! for associations that have ↵Aaron Patterson2011-05-241-0/+26
| | | | | | | | | | | | | | | | | | | | validation errors
* | | | | adding a test for create! with invalid associationsAaron Patterson2011-05-241-0/+9
| | | | |
* | | | | do not bother with assert_nothing_raised, the test will fail and we get a ↵Aaron Patterson2011-05-241-3/+1
| | | | | | | | | | | | | | | | | | | | better trace without it