Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | ConnectionPool wait_timeout no longer used for different types of timeouts. ↵ | Jonathan Rochkind | 2012-05-23 | 1 | -7/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #6441 An AR ConnectionSpec `wait_timeout` is pre-patch used for three different things: * mysql2 uses it for MySQL's own wait_timeout (how long MySQL should allow an idle connection before closing it), and defaults to 2592000 seconds. * ConnectionPool uses it for "number of seconds to block and wait for a connection before giving up and raising a timeout error", default 5 seconds. * ConnectionPool uses it for the Reaper, for deciding if a 'dead' connection can be reaped. Default 5 seconds. Previously, if you want to change these from defaults, you need to change them all together. This is problematic _especially_ for the mysql2/ConnectionPool conflict, you will generally _not_ want them to be the same, as evidenced by their wildly different defaults. This has caused real problems for people #6441 #2894 But as long as we're changing this, forcing renaming the ConnectionPool key to be more specific, it made sense to seperate the two ConnectionPool uses too -- these two types of ConnectionPool timeouts ought to be able to be changed independently, you won't neccesarily want them to be the same, even though the defaults are (currently) the same. | ||||
* | Revert "Merge pull request #6416 from pmahoney/threadsafe-connection-pool" | Rafael Mendonça França | 2012-05-22 | 1 | -86/+34 |
| | | | | | | | | | | | | This reverts commit d2901f0fc4270a765717ad572d559dc49a56b3a8, reversing changes made to 525839fdd8cc34d6d524f204528d5b6f36fe410c. Conflicts: activerecord/test/cases/connection_pool_test.rb Reason: This change broke the build (http://travis-ci.org/#!/rails/rails/builds/1391490) and we don't have any solution until now. I asked the author to try to fix it and open a new pull request. | ||||
* | Make connection pool fair with respect to waiting threads. | Patrick Mahoney | 2012-05-20 | 1 | -34/+86 |
| | |||||
* | Merge pull request #6397 from kennyj/fix_translate_exception | Aaron Patterson | 2012-05-19 | 1 | -3/+7 |
|\ | | | | | Fix a problem of translate_exception method in a Japanese (non English) environment. | ||||
| * | Fix a problem of translate_exception method in Japanese. | kennyj | 2012-05-20 | 1 | -3/+7 |
| | | |||||
* | | Synchronize read and modification of @reserved_connections hash to avoid ↵ | Patrick Mahoney | 2012-05-19 | 1 | -4/+8 |
|/ | | | | concurrency error. | ||||
* | Merge pull request #6238 from pwnall/pgsql_bytea_limit | Aaron Patterson | 2012-05-17 | 1 | -8/+19 |
|\ | | | | | Postgresql doesn't accept limits on binary (bytea) columns. | ||||
| * | Postgresql doesn't accept limits on binary (bytea) columns. | Victor Costan | 2012-05-09 | 1 | -8/+19 |
| | | |||||
* | | Merge pull request #6192 from ↵ | Aaron Patterson | 2012-05-16 | 3 | -7/+65 |
|\ \ | | | | | | | | | | | | | danmcclain/add_inet_and_cidr_types_to_postgresql_adapter Add support for macaddr, inet, and cidr types to PostgreSQL adapter | ||||
| * | | Removes NetAddr dependency | Dan McClain | 2012-05-08 | 1 | -6/+7 |
| | | | |||||
| * | | Converts inet and cidr columns to NetAddr::CIDR | Dan Seaver | 2012-05-07 | 3 | -3/+41 |
| | | | |||||
| * | | Adds migration and schema dump support for INET, CIDR, and MACADDR | Dan Seaver | 2012-05-05 | 1 | -4/+23 |
| | | | |||||
* | | | Merge pull request #6349 from erichmenge/patch-raise-type-errors | Aaron Patterson | 2012-05-16 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Integer limit out of range should be allowed to raise. Closes #6272 | ||||
| * | | | Integer limit out of range should be allowed to raise. Closes #6272 | Erich Menge | 2012-05-16 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #6344 from erichmenge/patch_sqlite_time_type | Piotr Sarnacki | 2012-05-15 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | SQLite3 doesn't actually support the 'time' type. | ||||
| * | | | | SQLite3 doesn't actually support the 'time' type. | Erich Menge | 2012-05-15 | 1 | -1/+1 |
| |/ / / | |||||
* / / / | Remove useless check of adapter | Oscar Del Ben | 2012-05-15 | 1 | -4/+0 |
|/ / / | |||||
* | | | Remove unnecessary calls to primary_key on sqlite3_adapter | Carlos Galdino | 2012-05-15 | 1 | -1/+1 |
| | | | |||||
* | | | Set the primary key during #copy_table if necessary. Fixes [#2312] | Sean Scally | 2012-05-14 | 1 | -1/+5 |
| | | | |||||
* | | | Merge pull request #6285 from ↵ | Vijay Dev | 2012-05-12 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | | | | | | | | | acapilleri/missplelling_error_in_abstract_mysql_adapter missplelling error in abstract_mysql_adapter | ||||
| * | | | missplelling error in abstract_mysql_adapter | Angelo Capilleri | 2012-05-12 | 1 | -1/+1 |
| | | | | |||||
* | | | | remove unnecessary 'examples' noise [ci skip] | Vijay Dev | 2012-05-11 | 2 | -28/+18 |
| |_|/ |/| | | |||||
* | | | Merge pull request #5362 from zenprogrammer/quoting_bug | Aaron Patterson | 2012-05-09 | 1 | -0/+1 |
|\ \ \ | | | | | | | | | Fixed bug in ActiveRecord that caused classes to be quoted incorrectly | ||||
| * | | | Fixed bug in Quoting that caused classes to be quoted incorrectly | Ryan Oblak | 2012-03-09 | 1 | -0/+1 |
| | | | | |||||
* | | | | Merge pull request #6069 from mipearson/use_strict_mode_in_mysql | Jeremy Kemper | 2012-05-05 | 2 | -0/+16 |
|\ \ \ \ | | | | | | | | | | | Use strict mode in mysql | ||||
| * | | | | Add config option, rdoc, tests for mysql(2) STRICT_ALL_TABLES mode. | Michael Pearson | 2012-05-05 | 2 | -4/+9 |
| | | | | | |||||
| * | | | | Default to 'strict mode' in MySQL | Michael Pearson | 2012-05-05 | 2 | -0/+11 |
| | |_|/ | |/| | | |||||
* / | | | Prevent creating valid time-like objects from blank string from db | Egor Lynko | 2012-05-05 | 1 | -3/+3 |
|/ / / | | | | | | | | | | Issue #6045 | ||||
* | | | Merge pull request #3713 from kf8a/master | Aaron Patterson | 2012-05-04 | 1 | -2/+7 |
|\ \ \ | | | | | | | | | postgresql adapter should quote not a number and infinity correctly for float columns | ||||
| * | | | postgresql adapter handles quoting of not a number (NaN) and Infinity | Sven Bohm | 2011-11-21 | 1 | -2/+7 |
| | | | | |||||
* | | | | Use arel nodes instead of raw sql | Marcelo Silveira | 2012-05-02 | 1 | -1/+4 |
| | | | | |||||
* | | | | Refactored remove_column | Edgars Beigarts | 2012-05-02 | 3 | -4/+2 |
| | | | | |||||
* | | | | Don't type cast values that don't respond to to_i to 1 | James Sanders & Jason Noble | 2012-04-30 | 1 | -1/+1 |
| | | | | |||||
* | | | | Remove unused assignments | Mark Rushakoff | 2012-04-29 | 1 | -5/+3 |
| | | | | |||||
* | | | | Merge pull request #5698 from dougcole/support_postgresql_partitioning | Aaron Patterson | 2012-04-27 | 3 | -9/+44 |
|\ \ \ \ | | | | | | | | | | | Support postgresql partitioning by making INSERT RETURNING optional | ||||
| * | | | | refactor configuration of insert_returning | Doug Cole | 2012-04-07 | 1 | -14/+4 |
| | | | | | |||||
| * | | | | pick better names and add a little documentation | Doug Cole | 2012-04-01 | 1 | -8/+16 |
| | | | | | |||||
| * | | | | refactor | Doug Cole | 2012-03-31 | 1 | -13/+8 |
| | | | | | |||||
| * | | | | update mysql for new exec_insert signature | Doug Cole | 2012-03-31 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | add use_returning as a postgresql connection config | Doug Cole | 2012-03-31 | 2 | -6/+48 |
| | | | | | |||||
* | | | | | renamed class SQLiteColumn to SQLite3Column | Andrey Deryabin | 2012-04-27 | 1 | -3/+3 |
| | | | | | |||||
* | | | | | removed tail of old sqlite versions | Andrey Deryabin | 2012-04-27 | 1 | -9/+9 |
| | | | | | |||||
* | | | | | fix SQLite3Adapter doc | Andrey Deryabin | 2012-04-27 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | Upgrade sqlite3 version to 1.3.6 | Andrey Deryabin | 2012-04-27 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | merged sqlite and sqlite3 adapters | Andrey Deryabin | 2012-04-27 | 2 | -546/+538 |
| | | | | | |||||
* | | | | | EXPLAIN only for sqlite3 | Andrey Deryabin | 2012-04-26 | 2 | -24/+25 |
| |_|_|/ |/| | | | |||||
* | | | | Merge pull request #5973 from academia-edu/master | Aaron Patterson | 2012-04-25 | 1 | -2/+1 |
|\ \ \ \ | | | | | | | | | | | Always quote hstore keys and values | ||||
| * | | | | Restore .to_s to escape_hstore | Ryan Fitzgerald | 2012-04-24 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Always quote hstore keys and values | Ryan Fitzgerald | 2012-04-24 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | escape_hstore uses quotation marks around keys and values only if it seems necessary. However, it currently breaks in the presence of some non-ASCII characters. Instead of trying to guess exactly which characters are safe, it seems better to always use quotes. | ||||
* | | | | | Merge pull request #5976 from aderyabin/fix1 | Jeremy Kemper | 2012-04-25 | 1 | -5/+0 |
|\ \ \ \ \ | | | | | | | | | | | | | Duplicate quote_table_name method |