github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-02-07 20:54:57 -05:00
Code Issues Packages Projects Releases Wiki Activity
2,638 Commits 34 Branches 105 Tags
b13573ed3796508f224f0b86f13462272c212fe3
Commit Graph

2638 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeremy Kemper
b13573ed37 Clear connection cache after rolling back transaction. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3221 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2005-12-05 19:58:11 +00:00
Jeremy Kemper
0632f5a93e Move dummy active? and reconnect! from sqlite to base adapter. References #428. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3219 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2005-12-04 06:15:04 +00:00
Jeremy Kemper
dc64887f21 Connection cache to speed up retrieve_connection and get rid of dirty connection marking. References #428. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3218 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2005-12-04 05:56:49 +00:00
Jeremy Kemper
1dfa0bd372 Don't use transactional fixtures for when DDL changes are involved. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3217 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2005-12-04 05:40:50 +00:00
Jeremy Kemper
6c9cfd64ca MySQL: work around ruby-mysql/mysql-ruby inconsistency with mysql.stat. Eliminate usage of mysql.ping because it doesn't guarantee reconnect. Explicitly close and reopen the connection instead. References #428. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3216 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2005-12-03 23:04:34 +00:00
Marcel Molina
4f1e37ccd4 Add install.rb file to plugin generation which is loaded, if it exists, when you install a plugin. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3215 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2005-12-03 06:53:14 +00:00
David Heinemeier Hansson
6abda696b5 Added preliminary support for join models [DHH] Added preliminary support for polymorphic associations [DHH] Refactored associations to use reflections to get DRYer, beware, major refactoring -- double check before deploying anything with this (all tests pass, but..) 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3213 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2005-12-03 04:29:55 +00:00
David Heinemeier Hansson
57b7532b91 Work-in progress for providing better join model support and polymorphic associations 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3209 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2005-12-02 06:03:43 +00:00
Marcel Molina
96c29ab890 Fix docs for text_area_tag. Closes #3083. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3207 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2005-12-02 04:37:53 +00:00
Marcel Molina
2e42167058 Allow validate_uniqueness_of to be scoped by more than just one column. Closes #1559. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3206 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2005-12-02 04:30:46 +00:00
Jeremy Kemper
3d0e3c9290 Firebird: active? and reconnect! methods for handling stale connections. References #428. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3205 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2005-12-02 01:19:18 +00:00
Marcel Molina
c3612a23e6 Silence deprecation warnings for keep_flash when running tests. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3203 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2005-12-02 00:39:25 +00:00
Jeremy Kemper
13cfabb2ff Firebird: updated for FireRuby 0.4.0. References #3009. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3202 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2005-12-02 00:37:32 +00:00
Marcel Molina
139e2c4aad Change form_for and fields_for method signatures to take object name and object as separate arguments rather than as a Hash. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3201 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2005-12-02 00:37:33 +00:00
Sam Stephenson
833d9c89fc Run initialize_logger in script/lighttpd to ensure the log file exists before tailing it 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3198 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2005-11-30 19:18:55 +00:00
Marcel Molina
191dfe8c6d Make load_fixtures include csv fixtures. Closes #3053. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3196 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2005-11-28 23:34:09 +00:00
Jeremy Kemper
b44720452c PostgreSQL: active? compatibility with the pure-Ruby driver. Still need to move connect into the adapter since postgres-pr doesn't support #reset. References #428. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3195 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2005-11-28 21:46:34 +00:00
Jeremy Kemper
75d0623b3d MySQL: active? compatibility with the pure-Ruby driver. References #428. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3194 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2005-11-28 21:00:03 +00:00
Jeremy Kemper
e47c8381e1 Handle mutual dependencies with .rb suffix. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3193 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2005-11-28 20:39:26 +00:00
Nicholas Seckar
ca7341d2a5 Fix freeze_gems so that the latest rails version is dumped by default 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3191 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2005-11-28 00:53:38 +00:00
Jeremy Kemper
e7219e9e2a Introduce Dependencies.warnings_on_first_load setting. If true, enables warnings on first load of a require_dependency. Otherwise, loads without warnings. Disabled (set to false) by default. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3190 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2005-11-24 20:26:01 +00:00
Jeremy Kemper
14d50e9da3 Oracle: active? check pings the database rather than testing the last command status. References #428. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3189 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2005-11-24 19:50:10 +00:00
Florian Weber
87c3287912 Credit everybody that helped =) 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3188 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2005-11-24 12:56:22 +00:00
Florian Weber
1f951bbf9f Made test_update_attributes_after_push_without_duplicate_join_table_rows pass with Oracle Adapter. #2888 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3186 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2005-11-24 12:45:33 +00:00
Jeremy Kemper
6c1a356a1a SQLServer: resolve column aliasing/quoting collision when using limit or offset in an eager find. References #2974. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3184 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2005-11-24 07:15:00 +00:00
Jeremy Kemper
2b28575734 Reloading a model doesn't lose track of its connection. References #2996. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3182 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2005-11-24 07:01:43 +00:00
Jeremy Kemper
52325f6bf8 Sever infinite loop for mutual dependencies. Closes #2997. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3181 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2005-11-24 05:43:27 +00:00
Jeremy Kemper
19f59b6eb1 Dependencies: set load_file_name = file_name if it ends in .rb 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3176 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2005-11-23 22:33:45 +00:00
Jeremy Kemper
21d50e4d1a script/plugin: handle root paths and plugin names which contain spaces. References #2995. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3175 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2005-11-23 22:24:16 +00:00
Jeremy Kemper
d933627044 Introduce :selected option to the select helper. Allows you to specify a selection other than the current value of object.method. Specify :selected => nil to leave all options unselected. Closes #2991. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3174 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2005-11-23 21:59:20 +00:00
Jeremy Kemper
26f2fbf35f Credit ticket author. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3170 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2005-11-23 21:40:23 +00:00
Jeremy Kemper
b94d6c0654 Enable warnings on first load only. File which are loaded but raise an exception are not added to loaded set. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3169 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2005-11-23 21:31:51 +00:00
Florian Weber
c66ac2102b Fixed bug where using update_attribute after pushing a record to a habtm association of the object caused duplicate rows in the join table. #2888 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3167 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2005-11-23 21:03:25 +00:00
Jeremy Kemper
202e4208c4 Correct spelling of persistent [Stefan Kaes]. Document and eliminate warnings in clear_persistent_model_associations. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3166 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2005-11-23 00:35:37 +00:00
Jeremy Kemper
e8f664dde0 MySQL, PostgreSQL: reconnect! also reconfigures the connection. Otherwise, the connection 'loses' its settings if it times out and is reconnected. Closes #2978. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3165 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2005-11-22 23:55:04 +00:00
Thomas Fuchs
d958f22ecc Make javascript_include_tag :default behave correctly with application.js, fixes #2986 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3164 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2005-11-22 23:18:53 +00:00
Nicholas Seckar
bd5ace88b2 Initialize @optional in routing code to avoid warnings 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3163 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2005-11-22 22:24:25 +00:00
Jeremy Kemper
3e51cd8b8e Model generator: correct relative path to test_helper in unit test. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3162 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2005-11-22 21:33:56 +00:00
Sam Stephenson
1b3c9a0a56 Remove superfluous check for pluralize_table_names (use table_name which does this check when it's set). 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3159 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2005-11-22 08:59:52 +00:00
Sam Stephenson
bea737eb5a Make ActionController's render honor the :locals option when rendering a :file. Closes #1665. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3157 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2005-11-22 08:37:04 +00:00
Jeremy Kemper
130c493a4f FormHelper correctly passes its object through select, collection_select, country_select, and time_zone_select. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3156 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2005-11-22 01:32:40 +00:00
Jeremy Kemper
d21ba5aec9 has_and_belongs_to_many: use JOIN instead of LEFT JOIN. References #2937. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3155 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2005-11-21 22:27:19 +00:00
Jamis Buck
f783d50cf8 Allow assert_tag(:conditions) to match the empty string when a tag has no children. Closes #2959. [Jamis Buck] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3154 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2005-11-21 21:02:10 +00:00
Jamis Buck
f9b199040c Update html-scanner to handle CDATA sections better. Closes #2970. [Jamis Buck] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3153 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2005-11-21 20:43:35 +00:00
Jeremy Kemper
f1a184fe88 MySQL: introduce :encoding option to specify the character set for client, connection, and results. Only available for MySQL 4.1 and later with the mysql-ruby driver. Do SHOW CHARACTER SET in mysql client to see available encodings. Closes #2975. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3152 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2005-11-21 18:51:27 +00:00
Jeremy Kemper
6580662254 Don't put flash in session if sessions are disabled. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3151 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2005-11-21 18:09:28 +00:00
David Heinemeier Hansson
d345b7a4f0 Back out of 3109 for now as it seems to interfere with the flash 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3150 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2005-11-21 16:59:25 +00:00
Jeremy Kemper
baad1c4cdc Simpler Mysql load test. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3148 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2005-11-21 12:47:28 +00:00
Marcel Molina
119155bebb Revert [3130]. Behavior of introducing Kernel.binding causes breakage. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3142 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2005-11-21 09:34:10 +00:00
Jeremy Kemper
5177333e70 Use Kernel.binding rather than binding to allow columns of that name. References #2973. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3139 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2005-11-21 08:34:50 +00:00