github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity
23,079 Commits 34 Branches 105 Tags
7b4cd4bb5bfd169404d501fde29fe237eeecebfa
Commit Graph

6049 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
Erik Fonselius
a5806fa409 Failing test for aggregating on default_scope with select 2011-05-31 20:47:30 +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
Farley Knight
aa316e27b7 Tests for issue #1360 2011-05-31 19:47:34 +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
Jon Leighton
0bb8429e71 Reduce test noise 2011-05-31 18:18:14 +01:00
Arun Agrawal
e04f2c1d42 Opening class CascadedEagerLoadingTest at once. 2011-05-31 12:35:37 +05:30
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
Akira Matsuda
9fb51e76fd Disable IdentityMap by default for ActiveRecord testing 
because enabling IM by default will possibly hide some bugs on 3.1 default behavior
 2011-05-28 09:08:13 +09:00
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
Aaron Patterson
8628948e2a fixing test for mysql2 2011-05-27 11:44:14 -07:00
Aaron Patterson
d1c74706c3 adding a test for #1322 2011-05-26 16:16:57 -07: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
Mohammad Typaldos
ded7e35cb0 Removes a now needless test - via Github 2011-05-26 12:17:20 -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
John Mileham
294e2a8c2e Failing test - JSON serialization shouldn't merge base opts into include opts. 2011-05-26 11:24:25 -04:00
Marian Rudzynski
f4ed56df43 added assertion for non-standard primary_key on models used in the primary_key test 2011-05-26 12:40:09 +02: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
64d977359d Add the MIT-LICENSE to the Active Record gemspec 2011-05-25 15:32:04 +02:00
Franck Verrot
b2db8740ea Fix the AR::Base#inspect method [closes #1294] 2011-05-25 13:54:38 +02:00
Franck Verrot
bf159aa5fc Test AR::Base#inspect on an allocated object not yet initialized 2011-05-25 13:53:51 +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
Andrew White
f1f1ab77df Failing tests for #1233. 2011-05-24 23:25:21 +01:00
José Valim
36991f195b Merge pull request #1274 from vijaydev/rake-packagetask-warning-fix 
Fixes for Rake::GemPackageTask deprecation warnings from Rake 0.9.0
 2011-05-24 12:14:30 -07: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
Aaron Patterson
559d809609 add tests surrounding behavior of save and save! for associations that have validation errors 2011-05-24 11:21:24 -07:00