Commit Graph

479 Commits

Author SHA1 Message Date
Rick Olson
9a72cd22cf Don't classify the has_one class when eager loading, it is already singular. Add tests. (closes #4117) [jonathan@bluewire.net.nz]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3983 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2006-03-19 19:32:07 +00:00
Rick Olson
753010ac39 add support for COUNT(DISTINCT id) queries in sqlite2 (closes #4300) [Rick Olson]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3979 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2006-03-19 17:42:51 +00:00
Rick Olson
8196e8e723 skip count_by_sql test using COUNT(DISTINCT) for sqlite2 only
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3978 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2006-03-19 17:19:17 +00:00
David Heinemeier Hansson
46106755b7 Fix boolean test
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3977 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2006-03-19 17:06:53 +00:00
Rick Olson
ea25e246e0 Quit ignoring default :include options in has_many :through calls [Mark James]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3974 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2006-03-19 16:13:52 +00:00
Rick Olson
fcd4c9529c Allow has_many :through associations to find the source association by setting a custom class (closes #4307) [jonathan@bluewire.net.nz]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3973 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2006-03-19 07:14:48 +00:00
Rick Olson
9412c0531d Eager Loading support added for has_many :through => :has_many associations (see below). [Rick Olson]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3967 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2006-03-19 03:05:21 +00:00
David Heinemeier Hansson
389a667664 Small pgsql fixes (closes #4083) [pergesu@gmail.com]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3965 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2006-03-19 02:21:58 +00:00
Rick Olson
0925c6b6a0 Allow has_many :through to work on has_many associations (closes #3864) [sco@scottraymond.net]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3964 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2006-03-19 02:01:40 +00:00
Rick Olson
57af961a80 Raise error when trying to select many polymorphic objects with has_many :through or :include (closes #4226) [josh@hasmanythrough.com]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3961 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2006-03-19 00:53:24 +00:00
Rick Olson
9c9069a675 Fixed has_many :through to include :conditions set on the :through association. closes #4020 [jonathan@bluewire.net.nz]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3958 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2006-03-18 23:14:31 +00:00
Rick Olson
fbd1e01bd6 Fix that has_many :through honors the foreign key set by the belongs_to association in the join model (closes #4259) [andylien@gmail.com / Rick]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3954 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2006-03-18 22:38:49 +00:00
David Heinemeier Hansson
7581193678 Added more tests to validates_format_of (closes #3142) [jp.bougie@gmail.com]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3951 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2006-03-18 21:44:08 +00:00
David Heinemeier Hansson
9db8f3e57a SQL Server adapter gets some love (closes #4298) [rtomayko@gmail.com]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3949 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2006-03-18 21:27:40 +00:00
Jamis Buck
3257a4b9b0 Fix incorrect mysql column type (requires AR test DB to be rebuilt) (closes #4299)
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3943 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2006-03-18 20:33:00 +00:00
David Heinemeier Hansson
e18fad6c43 Update lingering uses of deprecated association dependency options (closes #4169) [coffe2code]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3941 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2006-03-18 20:25:50 +00:00
Rick Olson
50103b86e6 fixed has_many :conditions sanitizing (closes #4278) [hakuja@hakuja.net]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3935 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2006-03-18 18:01:50 +00:00
David Heinemeier Hansson
416385a09d Added OpenBase database adapter that builds on top of the http://www.spice-of-life.net/ruby-openbase/ driver. All functionality except LIMIT/OFFSET is supported (closes #3528) [derrickspell@cdmplus.com]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3932 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2006-03-18 16:50:25 +00:00
Rick Olson
229c0f4367 Rework table aliasing to account for truncated table aliases. Add smarter table aliasing when doing eager loading of STI associations. This allows you to use the association name in the order/where clause. [Jonathan Viney / Rick Olson] closes #4108
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3921 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2006-03-18 07:31:01 +00:00
Rick Olson
263479b5a3 Add AbstractAdapter#table_alias_for to create table aliases according to the rules of the current adapter. [Rick]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3916 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2006-03-18 05:43:35 +00:00
Michael Koziarski
7fdab4446a Remove broken attempts at handling columns with a a default of 'now()' in the postgresql adapter. Closes #2257
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3913 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2006-03-18 04:38:49 +00:00
David Heinemeier Hansson
0555fc905c Added connection#current_database that'll return of the current database (only works in MySQL, SQL Server, and Oracle so far -- please help implement for the rest of the adapters) (closes #3663) [Tom ward]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3911 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2006-03-18 03:54:04 +00:00
David Heinemeier Hansson
df97ed5e4c Nicer error message on has_many :through when :through reflection can not be found (closes #4042) [court3nay@gmail.com]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3910 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2006-03-18 03:39:18 +00:00
David Heinemeier Hansson
ea617708c2 Added migrations support to the Sybase adapter (closes #4293) [John R. Sheets]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3905 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2006-03-18 03:02:32 +00:00
Rick Olson
a3502c419e Use association's :conditions when eager loading. [jeremyevans0@gmail.com] closes #4144
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3897 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2006-03-16 06:17:54 +00:00
Rick Olson
02d34440cf Alias the has_and_belongs_to_many join table on eager includes. closes #4106 [jeremyevans0@gmail.com]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3895 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2006-03-16 04:18:12 +00:00
Rick Olson
a0c459bca7 fix test_find_in_association_with_options test, tweak other tests affected by developer/project addition
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3890 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2006-03-16 03:24:40 +00:00
David Heinemeier Hansson
9b9a0908e5 Oracle adapter gets some love #4230 [schoenm@earthlink.net]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3889 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2006-03-16 03:20:46 +00:00
Rick Olson
e74ec90a07 added test checking that NOT NULL is properly reflected on [nathaniel@talbott.ws] closes #4125
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3885 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2006-03-16 02:55:38 +00:00
Rick Olson
def746030c Added Base.abstract_class? that marks which classes are not part of the Active Record hierarchy. closes #3704
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3882 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2006-03-16 02:46:01 +00:00
Rick Olson
0859779d6f Allow :dependent options to be used with polymorphic joins. #3820 [Rick Olson]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3881 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2006-03-16 02:10:11 +00:00
Rick Olson
fa4fb50186 fix calculation tests to get around inconsistent ordering of nils
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3872 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2006-03-15 03:50:47 +00:00
Michael Koziarski
c42cd3c383 make save! return true on success[johan@johansorensen.com]. Closes #4173
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3871 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2006-03-15 02:32:14 +00:00
Michael Koziarski
c32fa73ea1 Unit test fixes for postgresql.
Allow to_xml tests to pass in time zones other than CST.



git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3870 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2006-03-15 02:17:31 +00:00
Michael Koziarski
eccf39203f Correct syntax error in postgresql schema definition
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3868 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2006-03-15 01:31:00 +00:00
Rick Olson
4965a754d5 Catch FixtureClassNotFound when using instantiated fixtures on a fixture that has no ActiveRecord model [Rick Olson]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3866 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2006-03-14 15:15:06 +00:00
Rick Olson
796a43dead Allow ordering of calculated results and/or grouped fields in calculations [solo@gatelys.com] closes #4228
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3865 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2006-03-14 14:59:14 +00:00
Jeremy Kemper
25fb2db409 Dynamically set allow_concurrency. Closes #4044.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3862 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2006-03-13 17:28:55 +00:00
David Heinemeier Hansson
3442e0c671 Added options to control the :only/:except for included associations on Base#to_xml [DHH]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3832 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2006-03-10 03:50:00 +00:00
David Heinemeier Hansson
db37c0c95f Added association inclusion in to_xml [DHH]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3831 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2006-03-10 00:25:29 +00:00
David Heinemeier Hansson
d872281975 Fixed to_xml across the board to use nice indention, better skip_attributes workings, no type on strings, and cleaned tests [DHH]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3829 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2006-03-09 21:12:28 +00:00
Jamis Buck
b95b09f32d a few more tests for the custom counter_cache naming code
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3826 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2006-03-09 18:11:41 +00:00
Jamis Buck
87898badba Allow counter_cache to accept a column name
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3825 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2006-03-09 17:23:57 +00:00
Rick Olson
2383a60443 Allow set_fixture_class to take Classes instead of strings for a class in a module. Raise FixtureClassNotFound if a fixture can't load. [Rick Olson] closes #4095
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3804 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2006-03-06 23:03:35 +00:00
Rick Olson
5a7722de98 added assert_queries for the AR test suite
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3784 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2006-03-05 23:41:17 +00:00
David Heinemeier Hansson
4f00c70580 Fixed eager loading problems with single-table inheritance [Rick Olson] Added smarter table aliasing for eager associations for multiple self joins [Rick Olson] (closes #3580)
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3776 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2006-03-05 18:43:56 +00:00
David Heinemeier Hansson
55854c4195 Added cascading eager loading that allows for queries like Author.find(:all, :include=> { :posts=> :comments }), which will fetch all authors, their posts, and the comments belonging to those posts in a single query (using LEFT OUTER JOIN) #3913 [anna@wota.jp]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3769 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2006-03-04 23:33:10 +00:00
Jamis Buck
ff881c7f8b Make counter cache work when replacing an association (closes #3245). Thanks for the patch!
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3762 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2006-03-04 19:42:41 +00:00
Jamis Buck
c0fb67c0f8 Make migrations verbose
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3760 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2006-03-04 18:46:51 +00:00
David Heinemeier Hansson
3dcf7fe4e9 Fixed that Date was in incorrect format in tasks.yml (closes #4072) [mlaster@metavillage.com]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3758 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2006-03-04 17:17:43 +00:00