aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
Commit message (Collapse)AuthorAgeFilesLines
* Ensure that calculations properly override the select value even if it's set ↵Jon Leighton2011-05-311-2/+2
| | | | in the default scope. Fixes #1395.
* Only save the record once when calling create! on a collection association. ↵Jon Leighton2011-05-314-25/+45
| | | | Fixes #1360.
* Implementing @dmathieu's cleaner fix from #1425. Unfortunately he deleted ↵Jon Leighton2011-05-311-8/+5
| | | | the branch so I cannot just merge it.
* Adding comment to work with 1.8.7. Nested Attribute fix.Arun Agrawal2011-05-311-0/+3
|
* Fix nested attribute for memory record.Arun Agrawal2011-05-311-1/+5
|
* Merge pull request #1410 from lucasts/pg_schemaAaron Patterson2011-05-301-5/+11
|\ | | | | a little step to better postgresql schema support in rails
| * [activerecord][postgresql] verify if table has a schema(not public)Lucas Stephanou2011-05-271-6/+5
| |
| * find sequences with pg schemas properlyLucas Stephanou2011-05-271-4/+11
| |
* | Corrected some typos and American vs. Queen's English issuesLee Reilly2011-05-293-3/+3
| |
* | 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
| |
* | 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-271-2/+4
|\ \ \ | |/ / |/| | Fix for Issue #1205
| * | 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-231-2/+6
| | | | | | | | | | | | been provided
* | | 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_constraints
| * | 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
|\ \ \ | | | | | | | | Resolve issue #534
| * | | Removes the restriction on primary key when joining in a habtm && test that ↵Mohammad El-Abid2011-05-262-10/+0
| |/ / | | | | | | | | | 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
* | 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 ActiveRecord
| | * | 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
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | Conflicts: actionmailer/lib/action_mailer/base.rb activesupport/lib/active_support/core_ext/kernel/requires.rb
| * | | 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
* | | | 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
| | | | | | | | | | | | #1264.
* | | Merge pull request #1254 from pixeltrix/ignore-includes-in-through-scopeJon Leighton2011-05-241-1/+1
|\ \ \ | | | | | | | | Ignore :includes on through associations
| * | | 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
| | | | | | | | | | | | | | | | (as well as having Relation#arel respect the default scope). Fixes #1233.
* | | | rescue record invalid exceptions and return false from the save method. ↵Aaron Patterson2011-05-241-1/+5
| | | | | | | | | | | | | | | | fixes #796
* | | | properly reference yml alias nodesdmathieu2011-05-242-3/+3
|/ / / | | | | | | | | | as per the last version of the yml specifications : http://www.yaml.org/spec/1.2/spec.html#* alias//
* | | 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
| | |