Commit Graph

26266 Commits

Author SHA1 Message Date
Aaron Patterson
29d2040b29 AbstractAdapter#close can be called to add the connection back to the
pool.
2011-11-29 14:40:37 -08:00
Aaron Patterson
ce3d8d646a Start implementing @reserved_connections in terms of connection leases. 2011-11-29 14:02:59 -08:00
Aaron Patterson
5725e397fe Rename checked_out to more descriptive active_connections 2011-11-29 14:02:59 -08:00
Aaron Patterson
b72b477c37 Use connection lease to determine "checked_out" connections 2011-11-29 14:02:59 -08:00
Aaron Patterson
f866f66b30 expire will set in_use to false 2011-11-29 14:02:58 -08:00
Aaron Patterson
79306de791 last_use is set on connection lease 2011-11-29 14:02:58 -08:00
Aaron Patterson
134cc8f939 Leased connections return false on second lease 2011-11-29 14:02:58 -08:00
Aaron Patterson
9bf8bf82b9 Adapters keep in_use flag when leased 2011-11-29 14:02:58 -08:00
Aaron Patterson
7837574e5b namespace the adapter test 2011-11-29 14:02:58 -08:00
Jon Leighton
3da5fba56a Fix ruby 1.8 compat. const_defined? only takes a second arg on 1.9. 2011-11-29 20:43:05 +00:00
Jon Leighton
8df787d428 Deprecated define_attr_method in ActiveModel::AttributeMethods
This only existed to support methods like `set_table_name` in Active
Record, which are themselves being deprecated.
2011-11-29 20:13:37 +00:00
Jon Leighton
f3c84dc316 Deprecate set_locking_column in favour of self.locking_column= 2011-11-29 20:13:37 +00:00
Jon Leighton
1a474cc8e4 Deprecate set_primary_key in favour of self.primary_key= 2011-11-29 20:13:37 +00:00
Jon Leighton
4aad289428 Make sure the original_foo accessor still works (but deprecated) if we are using self.foo= 2011-11-29 20:13:37 +00:00
Jon Leighton
e51ecfaaa3 extract method 2011-11-29 20:13:37 +00:00
Jon Leighton
7af719e81c Deprecate set_sequence_name in favour of self.sequence_name= 2011-11-29 20:13:37 +00:00
Jon Leighton
fd7ca98bb6 Add tests for set_sequence_name etc 2011-11-29 20:13:36 +00:00
Jon Leighton
34609d67b4 Deprecate set_inheritance_column in favour of self.inheritance_column= 2011-11-29 20:13:36 +00:00
Jon Leighton
0b72a04d0c Deprecate set_table_name in favour of self.table_name= or defining your own method. 2011-11-29 20:13:36 +00:00
Aaron Patterson
f73f53455a respond_to? information of AR is not the responsibility of the spec
resolver.
2011-11-29 11:48:55 -08:00
Jon Leighton
2169603385 Merge pull request #3636 from joshsusser/master
association methods are now generated in modules
2011-11-29 10:09:42 -08:00
Josh Susser
c347b3c06c don't change class definition in test case 2011-11-29 09:14:21 -08:00
Jon Leighton
d534c8fbe2 Fix resolver_test.rb on travis (postgresql isn't setup, so it can't load the connection adapter) 2011-11-29 12:47:54 +00:00
Jon Leighton
1defb6adb8 Fix schema_cache_test.rb for sqlite3_mem 2011-11-29 12:29:42 +00:00
Vijay Dev
6e399acaa8 Merge pull request #3797 from HeeL/test
splited a long line to shorter ones
2011-11-29 02:23:06 -08:00
Sergey Parizhskiy
69d56cb933 splited a long line to shorter ones 2011-11-29 11:50:02 +02:00
Vijay Dev
42d70d9852 Merge pull request #3790 from masterkain/patch-1
Fix typo in AS::TaggedLogging
2011-11-29 00:30:00 -08:00
José Valim
913c42a6a9 Merge pull request #3793 from marcandre/asset_host
Handle correctly optional parameters for callable asset_host.
2011-11-28 23:56:42 -08:00
Marc-Andre Lafortune
d3bc12b27f Handle correctly optional parameters for callable asset_host. 2011-11-29 02:01:18 -05:00
Claudio Poli
2a76f33b51 Fix typo in AS::TaggedLogging 2011-11-29 00:26:58 +01:00
Aaron Patterson
52a9884ce4 remove unused instance variable 2011-11-28 15:23:26 -08:00
Aaron Patterson
beff819a4d just check in all connections 2011-11-28 15:23:26 -08:00
Aaron Patterson
884a04007f remove useless class_eval 2011-11-28 15:23:25 -08:00
Aaron Patterson
dde2113867 Move connection resoluion logic to it's own testable class. 2011-11-28 15:23:25 -08:00
Aaron Patterson
30f7c59e90 clean up string => hash conversion for connection pool 2011-11-28 15:23:25 -08:00
Aaron Patterson
ffb218c750 pools are 1:1 with spec now rather than 1:1 with class 2011-11-28 15:23:25 -08:00
Aaron Patterson
2a9a8ad4df break establish_connection to smaller methods 2011-11-28 15:23:24 -08:00
Jakub Kuźma
d1afd98746 added information about callbacks created by autosave association (#3639) 2011-11-28 19:37:00 +01:00
Aaron Patterson
ba0b3eee14 Merge pull request #3768 from janv/master
Test and fix for Issue 3450
2011-11-28 09:35:43 -08:00
José Valim
a0c61c81d7 Merge pull request #3785 from lest/backtrace-cleaner-env
Put backtrace_cleaner to env
2011-11-28 08:43:14 -08:00
lest
fe7d4f09ef put backtrace_cleaner to env 2011-11-28 19:25:37 +03:00
Vijay Dev
970caea5bc Merge pull request #3783 from HeeL/master
fixed a typo in a travis message
2011-11-28 07:18:22 -08:00
Sergey Parizhskiy
cc5f68d56b fixed a typo in a message when there is no failuresin a build 2011-11-28 16:45:40 +02:00
José Valim
f4ce002c0e Merge pull request #3278 from arunagw/rails_rake_task_warning
Global variable `$rails_rake_task' not initialized Warning removed
2011-11-28 04:25:55 -08:00
Arun Agrawal
8ef1ec427f global variable `$rails_rake_task' not initialized Warning removed 2011-11-28 17:35:10 +05:30
José Valim
5f75a92c32 Merge pull request #3657 from arunagw/mysql2_bump_master
Bump Mysql2!
2011-11-28 03:15:30 -08:00
Vijay Dev
9ca58ba492 Revert "use any? to check for size"
This reverts commit c4af5f00f6.
2011-11-28 16:29:55 +05:30
José Valim
89925e817c Revert "Use any instead of length"
This reverts commit 1756629835.
2011-11-28 11:18:39 +01:00
Xavier Noria
152bd3c510 Revert "Used any? instead of length call"
Reason: This is slower, and any? is not equivalent in the
general case.

See discussion in https://github.com/rails/rails/pull/3779

This reverts commit 20cbf8eddc.
2011-11-28 11:07:01 +01:00
José Valim
ad5c8b0d52 Merge pull request #3776 from nashby/add-namespace-to-form
add namespace options to form_for
2011-11-27 23:59:36 -08:00