github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-01-30 00:38:00 -05:00
Code Issues Packages Projects Releases Wiki Activity
3,598 Commits 34 Branches 105 Tags
e4254939aa8abb7a18f65e95cafaa2f37cbfa754
Commit Graph

3598 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeremy Kemper
e4254939aa r4663@asus: jeremy | 2006-06-19 17:23:57 -0700 
ActiveRecord::Locking is now ActiveRecord::Locking::Optimistic (to make way for Pessimistic.)


git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4461 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-06-20 01:58:27 +00:00
Jeremy Kemper
15aa6e0552 r4644@asus: jeremy | 2006-06-16 14:57:03 -0700 
locking
 r4645@asus:  jeremy | 2006-06-17 12:41:30 -0700
 missing reply fixture
 r4646@asus:  jeremy | 2006-06-19 13:05:23 -0700
 Use a per-thread (rather than global) transaction mutex so you may execute concurrent transactions on separate connections.
 r4647@asus:  jeremy | 2006-06-19 13:07:23 -0700
 PostgreSQL: introduce allow_concurrency option which determines whether to use blocking or asynchronous #execute. Adapters with blocking #execute will deadlock Ruby threads. The default value is ActiveRecord::Base.allow_concurrency.
 r4648@asus:  jeremy | 2006-06-19 13:08:40 -0700
 Pass the default allow_concurrency when instantiating new connections.
 r4649@asus:  jeremy | 2006-06-19 13:11:12 -0700
 Break out concurrent transaction tests and run them for PostgreSQLAdapter only (need to fork or system('some_test_script') for the other adapters)
 r4650@asus:  jeremy | 2006-06-19 13:42:48 -0700
 Row locking. Provide a locking clause with the :lock finder option or true for the default "FOR UPDATE".
 r4661@asus:  jeremy | 2006-06-19 15:36:51 -0700
 excise the junk mutex


git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4460 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-06-19 22:48:51 +00:00
Nicholas Seckar
e5fc5aaffe Change AR::Base#to_param to return a String instead of a Fixnum. Closes #5320. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4459 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-06-19 16:45:34 +00:00
Rick Olson
ae0e1a0682 Enhance Symbol#to_proc so it works with list objects, such as multi-dimensional arrays. Closes #5295 [nov@yo.rim.or.jp] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4455 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-06-17 03:01:57 +00:00
Rick Olson
2bbcff8cf4 Fix that routes with *path segments in the recall can generate URLs. [Rick] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4454 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-06-17 00:25:24 +00:00
David Heinemeier Hansson
36dc94a6a1 Added Hash.create_from_xml(string) which will create a hash from a XML string and even typecast if possible [DHH] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4453 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-06-16 10:07:13 +00:00
David Heinemeier Hansson
7c326a3b54 Added Jim Weirich's excellent FlexMock class to vendor (Copyright 2003, 2004 by Jim Weirich (jim@weriichhouse.org)) -- it's not automatically required, though, so require 'flexmock' is still necessary [DHH] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4452 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-06-16 09:55:18 +00:00
Rick Olson
2f58a467e3 add passing test to make sure unhandled requests don't load unnecessary classes. Closed #5408. [nkriege@hotmail.com] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4451 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-06-16 03:22:09 +00:00
Rick Olson
c638d9401b Fix script/plugin so it doesn't barf on invalid URLs [Rick] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4450 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-06-12 16:07:58 +00:00
Rick Olson
bdc1033d20 Fix plugin install bug at dir with space. (closes #5359) [Yoshimasa NIWA] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4449 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-06-11 17:17:32 +00:00
Rick Olson
cf6654318c Fix bug with 'script/plugin install' so it reports unknown plugin names correctly. [Rick] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4447 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-06-09 02:08:26 +00:00
Jamis Buck
486af0254a Fix strip_links so that it doesn't hang on multi-line acronym tags 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4446 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-06-08 17:19:58 +00:00
Jamis Buck
38efc32529 Remove problematic control chars in rescue template. (closes #5316) 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4445 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-06-08 16:18:10 +00:00
Jamis Buck
816d67b104 Make sure passed routing options are not mutated by routing code. (closes #5314) 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4444 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-06-07 16:27:14 +00:00
Jamis Buck
ae7029ddd1 Do some path normalization to prevent the possible_controllers list from containing invalid entries 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4443 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-06-07 16:16:37 +00:00
Jamis Buck
4e3543b467 Make sure named routes are never generated relative to some containing module 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4442 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-06-06 19:09:56 +00:00
Jamis Buck
e768dc694d Improve parameter expiry handling to fix sticky-id issue. Add a more informative Route#to_s method. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4441 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-06-06 17:59:54 +00:00
David Heinemeier Hansson
d3bb2e5236 Include uninstall.rb (closes #5003) 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4440 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-06-06 15:44:11 +00:00
Jamis Buck
5ced402393 Remove dependency on Pathname in new routes 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4439 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-06-05 16:01:50 +00:00
Jamis Buck
6c04eb2115 Make sure changing the controller from foo/bar to bing/bang does not change relative to foo. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4438 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-06-05 15:48:29 +00:00
Jamis Buck
f97978ad91 Use explicit delegation instead of method aliasing for AR::Base.to_param -> AR::Base.id. (closes #5299) 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4437 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-06-05 15:41:24 +00:00
Jamis Buck
149f5cad85 Escape the entire path before trying to recognize it (closes #3671) 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4436 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-06-05 15:30:09 +00:00
Jamis Buck
2ffc84d23f Make sure :id and friends are properly unescaped (closes #5275). 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4435 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-06-05 14:51:27 +00:00
Jamis Buck
332fcfaf6b Make sure regexp chunks are grouped when the segment has a regexp constraint so that captures are counted correctly (closes #5267) 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4434 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-06-05 14:31:38 +00:00
Jamis Buck
7d88146e9e Fix documentation for with_routing to reflect new reality (closes #5281) 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4433 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-06-05 14:14:32 +00:00
David Heinemeier Hansson
100b994d90 Added binary formatting 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4432 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-06-04 00:37:47 +00:00
David Heinemeier Hansson
2e65e8ccc6 Refactored ActiveRecord::Base.to_xml to become a delegate for XmlSerializer, which restores sanity to the mega method. This refactoring also reinstates the opinions that type="string" is redundant and ugly and nil-differentiation is not a concern of serialization [DHH] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4431 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-06-04 00:33:52 +00:00
David Heinemeier Hansson
15b022a74f Rolled back broken aliasing 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4430 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-06-03 23:27:51 +00:00
David Heinemeier Hansson
e72ff355c3 Fixed that Module#alias_method_chain should work with both foo? foo! and foo at the same time (closes #4954) [anna@wota.jp] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4429 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-06-03 22:43:13 +00:00
David Heinemeier Hansson
b85c5356c9 Added documentation for inflections (closes #5013) [m.stienstra@fngtps.com] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4428 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-06-03 22:30:32 +00:00
David Heinemeier Hansson
59432fe89b Added uninstall.rb hook to plugin handling, such that plugins have a way of removing assets and other artifacts on removal (closes #5003) [takiuchi@drecom.co.jp] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4427 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-06-03 22:26:44 +00:00
David Heinemeier Hansson
68e35f1371 Create temporary dirs relative to RAILS_ROOT when running script/server #5014 [elliot@townx.org] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4426 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-06-03 22:22:50 +00:00
David Heinemeier Hansson
c5ec16e583 Added simple hash conditions to find that'll just convert hash to an AND-based condition string (closes #5143) [hcatlin@gmail.com] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4425 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-06-03 22:15:06 +00:00
David Heinemeier Hansson
cb62f06dcf Fixed issues with BLOB limits, charsets, and booleans for Firebird (closes #5194, #5191, #5189) [kennethkunz@gmail.com] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4424 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-06-03 21:57:03 +00:00
David Heinemeier Hansson
9c0fb70e1e For Firebird adapter 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4423 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-06-03 21:52:22 +00:00
David Heinemeier Hansson
d016d9a6d4 Fixed usage of :limit and with_scope when the association in scope is a 1:m (closes #5208) [alex@purefiction.net] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4422 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-06-03 21:51:57 +00:00
David Heinemeier Hansson
2fbcae1912 Added disconnect! to Firebird adapter (closes #5210) [kennethkunz@gmail.com] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4421 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-06-03 21:48:30 +00:00
David Heinemeier Hansson
6a9f47f33f Make more Firebird tests pass (closes #5188) [kennethkunz@gmail.com] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4420 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-06-03 21:47:29 +00:00
David Heinemeier Hansson
7f00f51239 Fixed migration trouble with SQLite when NOT NULL is used in the new definition (closes #5215) [greg@lapcominc.com] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4419 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-06-03 21:41:40 +00:00
David Heinemeier Hansson
3e67e0b3b2 Fixed problems with eager loading and counting on SQL Server (closed #5212) [kajism@yahoo.com] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4418 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-06-03 21:27:16 +00:00
David Heinemeier Hansson
4394e402b7 Fixed that count distinct should use the selected column even when using :include (closes #5251) [anna@wota.jp] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4417 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-06-03 21:19:36 +00:00
David Heinemeier Hansson
1671609063 Fixed that has_many.create ended up with duplicate objects (closes #5250) [daniel@nouvelles-solutions.com] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4416 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-06-03 21:16:50 +00:00
David Heinemeier Hansson
01a52dd1ad Fixed that :includes merged from with_scope won't cause the same association to be loaded more than once if repetition occurs in the clauses (closes #5253) [alex@purefiction.net] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4415 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-06-03 21:11:48 +00:00
Jeremy Kemper
9422e71ca8 Uncry thyself 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4414 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-06-03 01:02:42 +00:00
Jeremy Kemper
48052d70ec to_xml fixes, features, and speedup. Closes #4989. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4413 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-06-03 00:01:08 +00:00
Jeremy Kemper
49060cda24 fixtures :accounts for base_test. Closes #5268. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4412 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-06-02 22:48:54 +00:00
Sam Stephenson
c377ce50ed Add OrderedHash#values 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4411 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-06-02 17:28:15 +00:00
Jeremy Kemper
8cdf9126d3 Rewind readable CGI params so others may reread them (such as CGI::Session when passing the session id in a multipart form). Closes #210. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4410 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-06-02 06:30:23 +00:00
David Heinemeier Hansson
6dea52c54e Finish custom handling [DHH] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4409 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-06-02 04:38:28 +00:00
David Heinemeier Hansson
180edf4146 Make new mime types first class [DHH] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4408 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-06-02 04:30:43 +00:00