Commit Graph

4903 Commits

Author SHA1 Message Date
Jon Leighton
fbe012e92d Ensure that calculations properly override the select value even if it's set in the default scope. Fixes #1395. 2011-05-31 21:12:20 +01:00
Jon Leighton
dfaad4f5a7 Only save the record once when calling create! on a collection association. Fixes #1360. 2011-05-31 20:32:09 +01:00
Jon Leighton
60cb96abea Implementing @dmathieu's cleaner fix from #1425. Unfortunately he deleted the branch so I cannot just merge it. 2011-05-31 18:34:27 +01:00
Arun Agrawal
2e57b66931 Adding comment to work with 1.8.7. Nested Attribute fix. 2011-05-31 12:12:19 +05:30
Arun Agrawal
cfb5f1b608 Fix nested attribute for memory record. 2011-05-31 11:31:10 +05:30
Aaron Patterson
7278547a5d Merge pull request #1410 from lucasts/pg_schema
a little step to better postgresql schema support in rails
2011-05-30 13:30:07 -07:00
Lee Reilly
4f234bfd79 Corrected some typos and American vs. Queen's English issues 2011-05-29 12:40:24 -07:00
Aaron Patterson
18b153d15d Merge pull request #1384 from amatsuda/simplify_drop_table
Remove unused options from drop_table
2011-05-28 13:36:40 -07:00
Akira Matsuda
bcb466c543 No need to pass options which is never used 2011-05-29 04:30:22 +09:00
Akira Matsuda
d8f4988867 No need to override for just calling super 2011-05-29 04:29:19 +09:00
Vijay Dev
995ea00328 Use change in place of up and down in sessions table migration 2011-05-28 21:59:54 +05:30
Aaron Patterson
c122c7b271 stop using boolean expressions because of the side effects 2011-05-27 14:53:20 -07:00
Aaron Patterson
4b536f7591 Merge pull request #1365 from gnufied/sqlite3
close statment only if its not closed
2011-05-27 14:40:32 -07:00
Aaron Patterson
2a9b3abe19 Merge pull request #1229 from workmad3/master
Fix for Issue #1205
2011-05-27 14:34:05 -07:00
Hemant Kumar
ed1a0672ab delegate connection and column_hash calls directly to model 2011-05-28 03:00:11 +05:30
Hemant Kumar
d48add714d close statment only if its not closed 2011-05-28 02:57:36 +05:30
Aaron Patterson
985ace4d7f work around bug in the sqlite3 bindings. fixes #1289 2011-05-27 14:12:28 -07:00
Lucas Stephanou
c44418ea4e [activerecord][postgresql] verify if table has a schema(not public) 2011-05-27 17:48:34 -03:00
Lucas Stephanou
055c6fb010 find sequences with pg schemas properly 2011-05-27 16:39:19 -03:00
Jon Leighton
602fff1f58 Merge pull request #1323 from fx/association_primary_key
use association_primary_key in AssociationScope#add_constraints
2011-05-26 13:08:10 -07:00
Jon Leighton
09e431aa89 Merge pull request #1318 from TheEmpty/master
Resolve issue #534
2011-05-26 12:54:38 -07:00
John Mileham
043b624390 Don't merge base opts into includes when serializing ARs
Conflicts:

	activerecord/lib/active_record/serialization.rb
2011-05-26 11:40:57 -04:00
Marian Rudzynski
1f7c3d0264 use association_primary_key in AssociationScope#add_constraints 2011-05-26 11:00:27 +02:00
Mohammad El-Abid
ec44763f03 Removes the restriction on primary key when joining in a habtm && test that it was properly removed 2011-05-26 00:54:51 -04:00
Xavier Noria
b7921f50e7 Merge branch 'master' of github.com:rails/rails 2011-05-25 22:49:23 +02:00
Xavier Noria
00e1d0832e Merge branch 'master' of git://github.com/lifo/docrails
Conflicts:
	actionmailer/lib/action_mailer/base.rb
	activesupport/lib/active_support/core_ext/kernel/requires.rb
2011-05-25 22:48:47 +02:00
Aaron Patterson
6b436c23a9 Merge pull request #1285 from joshk/remove_active_record_deprecations
removed deprecated methods, and related tests, from ActiveRecord
2011-05-25 13:48:35 -07:00
Franck Verrot
b2db8740ea Fix the AR::Base#inspect method [closes #1294] 2011-05-25 13:54:38 +02:00
Arun Agrawal
5d89675099 Database.rake file fixed for load_generators 2011-05-25 13:57:44 +05:30
Josh Kalderimis
542114e1d8 removed deprecated methods, and related tests, from ActiveRecord 2011-05-25 02:29:32 +02:00
José Valim
52e01fc59d Everyone receives app as argument for consistency. 2011-05-25 01:37:55 +02:00
Jon Leighton
c69111ba5f Fix infinite recursion where a lazy default scope references a scope. Fixes #1264. 2011-05-25 00:08:14 +01:00
Jon Leighton
ce37f747cd Merge pull request #1254 from pixeltrix/ignore-includes-in-through-scope
Ignore :includes on through associations
2011-05-24 15:34:28 -07:00
Jon Leighton
a000ff7a50 Ensure that the surrounding code in Relation#to_a respects the default_scope (as well as having Relation#arel respect the default scope). Fixes #1233. 2011-05-24 23:29:44 +01:00
Aaron Patterson
176883a906 rescue record invalid exceptions and return false from the save method. fixes #796 2011-05-24 11:22:11 -07:00
dmathieu
79dc275b8d properly reference yml alias nodes
as per the last version of the yml specifications : http://www.yaml.org/spec/1.2/spec.html#* alias//
2011-05-24 11:18:28 +02:00
Andrew White
d8bd19f6ab Ignore :includes on through associations 2011-05-24 07:21:32 +01:00
Sebastian Martinez
0034b7822d Remove extra white spaces on ActiveRecord docs. 2011-05-23 20:58:25 -03:00
Sebastian Martinez
05f29ca2c9 Remove extra white-space on some exception messages. 2011-05-23 20:53:18 -03:00
Aaron Patterson
5ec23b95ba fixing 1.8 support for new fixture tests 2011-05-23 15:06:13 -07:00
Aaron Patterson
1716da0720 removing CSV fixture support 2011-05-23 15:06:12 -07:00
Aaron Patterson
081b36c6ce fixture file will validate fixture format 2011-05-23 15:06:12 -07:00
Aaron Patterson
5278af3d8e return an empty array for empty yaml files 2011-05-23 15:06:12 -07:00
Aaron Patterson
74c5f65bfb use top level file constant for join, etc 2011-05-23 15:06:12 -07:00
Aaron Patterson
ad3f0eec75 adding AR::Fixtures::File class to wrap a fixture file 2011-05-23 15:06:12 -07:00
David Workman
86afbf7464 Using .try to test for the existence of a method option in a nil-resistent 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 2011-05-23 22:33:03 +01:00
David Workman
8588dd431b Neatened up the invert_add_index method as per suggeston 2011-05-23 15:03:42 +01:00
Josh Kalderimis
eff5d9aed4 Removed AS core_ext/kernel/requires as it's not used and is bad practice. 2011-05-23 15:31:33 +02:00
David Workman
a7fad65792 Simple fix for correctly inverting an add_index migration when a name has been provided 2011-05-23 13:54:51 +01:00
José Valim
a8b2a895b7 Merge pull request #1228 from fcheung/db_time_fix2
Take into account time spent in AR even if a redirect occurs or if it is after the render
2011-05-23 03:11:15 -07:00