Commit Graph

5242 Commits

Author SHA1 Message Date
Rick Olson
ea07212d97 dont call #collect on a string when returning query cache results. Closes #9099 [norbert]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7239 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-07-25 13:05:58 +00:00
Rick Olson
f5ea6f880f Perform a deep #dup on query cache results so that modifying activerecord attributes does not modify the cached attributes. [Rick]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7238 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-07-25 03:48:30 +00:00
Rick Olson
d51e7f8252 Ensure that has_many :through associations use a count query instead of loading the target when #size is called. Closes #8800 [lifo]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7237 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-07-25 03:09:21 +00:00
Rick Olson
b49fcde7e5 tiny doc patches [lifo]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7236 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-07-25 03:05:55 +00:00
Rick Olson
2d7afe4456 misc doc fixes + Add ActiveResource to Rails::Info. Closes #8741, #9008, #9089 [kampers]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7235 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-07-25 02:50:35 +00:00
Rick Olson
bdcbfa9944 Allow you to set custom :conditions on resource routes. [Rick]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7234 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-07-25 02:47:21 +00:00
Michael Koziarski
94e5b10aff Use Gem.find_name instead of search when freezing gems. Prevent false positive for other gems with rails in the name. Closes #8729 [wselman]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7233 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-07-24 21:06:45 +00:00
David Heinemeier Hansson
6391e192f8 Fix load-order inconsistency (closes #9081) [themug]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7225 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-07-24 18:36:13 +00:00
David Heinemeier Hansson
edd68a587f Refactored in use of extract_options! (closes #9079) [josh]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7220 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-07-24 16:48:57 +00:00
David Heinemeier Hansson
34b0811125 Added Array#extract_options! to encapsulate the pattern of getting an options hash out of a variable number of parameters (closes #8759) [norbert]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7217 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-07-24 14:17:09 +00:00
Rick Olson
7de537dbf4 Automatically generate add/remove column commands in specially named migrations like AddLocationToEvent. Closes #9006 [zenspider]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7216 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-07-24 04:10:22 +00:00
David Heinemeier Hansson
1e1f93fd10 Added :unless clause to validations (closes #8003) [monki]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7215 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-07-24 01:48:17 +00:00
David Heinemeier Hansson
230615b286 assert_difference belongs in Assertions, not forced onto TestCase (closes #8894) [norbert]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7213 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-07-24 01:23:15 +00:00
David Heinemeier Hansson
937a7abe45 Fixed that file.content_type for uploaded files would include a trailing \r #9053 [bgreenlee]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7212 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-07-24 01:20:18 +00:00
David Heinemeier Hansson
80150a0cfb Its just ERb now
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7211 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-07-24 01:19:08 +00:00
Rick Olson
3029a76af3 Fix #count on a has_many :through association so that it recognizes the :uniq option. Closes #8801 [lifofifo]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7199 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-07-20 00:10:06 +00:00
Tobias Lütke
9014bf3f26 * url_for now accepts a series of symbols representing the namespace of the record [Josh Knowles]. Closes #8640
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7197 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-07-19 13:42:11 +00:00
Michael Koziarski
8b5eb2bacc fix one line formatting bug
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7196 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-07-19 10:35:20 +00:00
Michael Koziarski
1eb79bcc3b Let alias_attribute work with attributes with initial capital letters (legacy columns etc). Closes #8596 [mpalmer]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7195 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-07-19 10:09:40 +00:00
Rick Olson
a413056407 Fix and properly document/test count(column_name) usage. Closes #8999 [lifofifo]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7192 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-07-17 20:16:35 +00:00
Michael Koziarski
b549366216 Introduce fake_models.rb to avoid platform-specific code. [mpalmer] Closes #8714
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7190 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-07-17 09:44:03 +00:00
Rick Olson
872c5f4380 Remove deprecated count(conditions=nil, joins=nil) usage. Closes #8993 [lifofifo]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7189 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-07-16 20:26:10 +00:00
Rick Olson
4ef5af8d4d Change belongs_to so that the foreign_key assumption is taken from the association name, not the class name. Closes #8992 [hasmanyjosh]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7188 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-07-16 20:21:36 +00:00
Michael Koziarski
ddb00f1078 Remove spurious tests from deprecated_associations_test, most of these aren't deprecated, and are duplicated in associations_test. Closes #8987 [lifofifo]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7187 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-07-15 01:16:40 +00:00
Michael Koziarski
5476a6a6c7 Make :trailing_slash work with query parameters for url_for. Closes #4004 [nov]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7186 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-07-14 09:28:56 +00:00
Rick Olson
f9b7394430 Default to plural table name in Rails Generator if ActiveRecord is not present. Closes #8963 [evan]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7183 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-07-12 06:23:50 +00:00
Michael Koziarski
816522ecd8 Make create! on a has_many :through association return the association object. Not the collection. Closes #8786 [lifofifo]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7182 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-07-11 23:54:43 +00:00
Michael Koziarski
d4d4a08f6b Make sure missing template exceptions actually say which template they were looking for. Closes #8683 [dasil003]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7181 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-07-11 23:32:02 +00:00
Michael Koziarski
e80fabbbf4 Fix errors with around_filters which do not yield, restore 1.1 behaviour with after filters. Closes #8891 [skaes]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7177 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-07-11 02:29:25 +00:00
Tobias Lütke
f7bd676c8d Allow for optional messages on assert_difference [nicwilliams] Closes #8928
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7174 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-07-09 22:10:34 +00:00
Tobias Lütke
187e1f85d0 Support for non heterogeneous arrays when serializing to xml. Unless guessable from array name the type name will be included as attribute
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7173 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-07-09 22:07:39 +00:00
David Heinemeier Hansson
cb23816960 Added Hash#except which is the inverse of Hash#slice -- return the hash except the keys that are specified [DHH]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7172 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-07-09 21:49:37 +00:00
Tobias Lütke
5b2be62934 Make [7169] work as expected with indented XML.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7171 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-07-09 19:10:45 +00:00
Tobias Lütke
049b1440a3 Include empty has_many/has_and_belongs_to_many associations as empty array tags when serializing to XML
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7169 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-07-09 18:13:24 +00:00
Tobias Lütke
1241615692 Don't blow up when using nested fields_for and the source object is nil
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7168 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-07-09 16:19:40 +00:00
Michael Koziarski
3fbfc13ee3 Move from select * to select tablename.* to avoid clobbering IDs. Closes #8889 [dasil003]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7167 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-07-07 02:42:42 +00:00
Michael Koziarski
fd65d89e07 Allow you to delete cookies with options. Closes #3685 [josh, Chris Wanstrath]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7160 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-07-01 23:27:59 +00:00
Rick Olson
a450e769f1 Allow you to render views with periods in the name. Closes #8076 [norbert]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7158 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-07-01 00:04:03 +00:00
Michael Koziarski
d0ff4ec193 Don't call unsupported methods on associated objects when using :include, :method with to_xml [manfred, jwilger] Closes #7307
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7156 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-06-30 03:31:48 +00:00
David Heinemeier Hansson
20045df260 Temporary fix for formatted_polymorphic_urls and other polys that have additional options (need better testing!)
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7152 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-06-28 22:27:59 +00:00
David Heinemeier Hansson
4d0780e9c7 Allow symbols as name
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7151 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-06-28 22:27:11 +00:00
David Heinemeier Hansson
8a207f6f22 Drop the trailing slash
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7150 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-06-28 18:44:08 +00:00
David Heinemeier Hansson
f6a91b7b4c Added rake routes for listing all the defined routes in the system (closes #8795) [josh]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7149 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-06-28 18:33:06 +00:00
Jeremy Kemper
dfc15e122a Improve capture helper documentation. Closes #8796.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7148 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-06-28 18:32:34 +00:00
Jeremy Kemper
f26141c98d db:create creates the database for the current environment if it's on localhost. db:create:all creates local databases for all environments. Closes #8783.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7147 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-06-28 18:23:41 +00:00
Tobias Lütke
817d5d489d Add the type="array" moniker to has_many / has_and_belongs_to_many associations upon serialization.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7144 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-06-27 16:37:40 +00:00
Tobias Lütke
80d539bd4d Fixes that using a subclass of an ARes object would cache a connection object based of its parent's site variable. Changing the parent's site would have no effect on the descentent objects.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7143 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-06-27 16:00:07 +00:00
Jeremy Kemper
868e6b08df Generators: look for generators in all gems, not just those suffixed with _generator, in the gem's generators or rails_generators directory. Allow use of the rails_generators directory instead of the standard generators directory in plugins also. Closes #8730.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7139 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-06-27 09:25:25 +00:00
Jeremy Kemper
557e19346a Prefix nested resource named routes with their action name, e.g. new_group_user_path(@group) instead of group_new_user_path(@group). The old nested action named route is deprecated in Rails 1.2.4. Closes #8558.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7138 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-06-27 08:38:55 +00:00
Jeremy Kemper
b5b16a80a9 Define collection singular ids method for has_many :through associations. Closes #8763.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7137 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-06-27 08:19:12 +00:00