Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'rails/master' | Emilio Tagua | 2009-08-03 | 1 | -1/+0 |
|\ | |||||
| * | SQLite: drop support for 'dbfile' option in favor of 'database.' | Jeremy Kemper | 2009-08-01 | 1 | -1/+0 |
| | | |||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-07-31 | 2 | -1/+9 |
|\| | | | | | | | | | Conflicts: activerecord/lib/active_record/associations.rb | ||||
| * | Merge docrails | Pratik Naik | 2009-07-25 | 2 | -1/+9 |
| | | |||||
* | | Create is now powered by Arel. Removed methods that are no longer used. | Emilio Tagua | 2009-07-01 | 2 | -4/+4 |
| | | |||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-06-30 | 4 | -1/+40 |
|\| | | | | | | | | | Conflicts: activerecord/test/cases/adapter_test.rb | ||||
| * | Make sure the wrapped exceptions also have the original exception available. | Michael Koziarski | 2009-06-26 | 3 | -5/+5 |
| | | | | | | | | [#2419 state:committed] | ||||
| * | Translate foreign key violations to ActiveRecord::InvalidForeignKey exceptions. | Michael Schuerig | 2009-06-26 | 2 | -0/+4 |
| | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
| * | Translate adapter errors that indicate a violated uniqueness constraint to ↵ | Michael Schuerig | 2009-06-26 | 4 | -1/+36 |
| | | | | | | | | | | | | ActiveRecord::RecordNotUnique exception derived from ActiveReecord::StatementInvalid. Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-06-23 | 2 | -2/+2 |
|\| | |||||
| * | Fixed a bug where create_table could not be called without a block [#2221 ↵ | Joseph Wilk | 2009-06-21 | 1 | -1/+1 |
| | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Ensure table names are quoted while renaming for sqlite3 adapter [#2272 ↵ | Brian Hogan | 2009-06-21 | 1 | -1/+1 |
| | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | | Removed unused methods. | Emilio Tagua | 2009-06-23 | 2 | -39/+0 |
| | | |||||
* | | Arel now buils SQL queries for associations. Removed old code and | Emilio Tagua | 2009-06-23 | 2 | -20/+0 |
| | | | | | | | | updated Arel version to support this. | ||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-06-09 | 1 | -2/+14 |
|\| | |||||
| * | PostgreSQL adapter should call thread safe quote_string function | Eugene Pimenov | 2009-06-09 | 1 | -2/+14 |
| | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
* | | Refactors to work with latest Arel implementation. | Emilio Tagua | 2009-06-02 | 4 | -4/+7 |
| | | |||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-05-18 | 7 | -3/+11 |
|\| | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/base.rb activerecord/lib/active_record/migration.rb activerecord/test/cases/helper.rb | ||||
| * | Cherry-pick core extensions | Jeremy Kemper | 2009-05-13 | 7 | -3/+11 |
| | | |||||
* | | Refactor to calculations. Migration's versions are string not integer. ARel ↵ | Emilio Tagua | 2009-05-06 | 1 | -10/+10 |
| | | | | | | | | submodule updated. | ||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-05-02 | 2 | -7/+8 |
|\| | |||||
| * | Ensure ActiveRecord::Base.connection_pool.with_connection creates a new ↵ | steve | 2009-05-01 | 1 | -5/+6 |
| | | | | | | | | | | | | connection only when needed [#1752 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Use table_exists? in #initialize_schema_migrations_table [#1923 state:resolved] | Ken Collins | 2009-05-01 | 1 | -2/+2 |
| | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | | construct_finder_sql now use Arel | Emilio Tagua | 2009-04-24 | 1 | -1/+1 |
|/ | |||||
* | Add microsecond support for sqlite adapter [#1982 state:resolved] | Alex Pooley | 2009-04-21 | 1 | -0/+10 |
| | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | Fixed dumping from postgresql columns in index in wrong order. [#2515 ↵ | Max Lapshin | 2009-04-21 | 1 | -15/+18 |
| | | | | | | state:resolved] Signed-off-by: Tarmo Tänav <tarmo@itech.ee> | ||||
* | Quote table names when casting to regclass so that capitalized tables are ↵ | Scott Woods | 2009-04-21 | 1 | -3/+3 |
| | | | | | | supported. [#2418 state:resolved] Signed-off-by: Tarmo Tänav <tarmo@itech.ee> | ||||
* | Fixed wrong quoting of index names in postgres [#2402 state:resolved] | Max Lapshin | 2009-04-21 | 1 | -1/+1 |
| | | | | Signed-off-by: Tarmo Tänav <tarmo@itech.ee> | ||||
* | Support multiple schemas in table names for postgresql [#390 state:resolved] | Max Lapshin | 2009-04-05 | 1 | -1/+30 |
| | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | SQLite adapters now support DDL transactions [#2080 state:resolved] | Jason King | 2009-03-14 | 1 | -22/+33 |
| | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | Ensure SQLite adapters stores the config [#1947 state:resolved] [John ↵ | John Aughey | 2009-03-08 | 2 | -3/+8 |
| | | | | | | Aughey, Pratik Naik] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | Ensure ActiveRecord session store's connections are checked in after each ↵ | Joshua Peek | 2009-02-24 | 1 | -0/+16 |
| | | | | request [#1927 state:resolved] | ||||
* | Support true/false in query_attribute for calculated columns | Max Lapshin | 2009-02-06 | 1 | -0/+1 |
| | | | | | Signed-off-by: Tarmo Tänav <tarmo@itech.ee> Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
* | Sqlite adapter's copy_table incorrectly attempts to recreate a primary key ↵ | Jacob Dunphy | 2009-01-29 | 1 | -1/+1 |
| | | | | | | | | | id (:id => true in the create_table) if an :id column is present, even if it isn't a primary_key. This fix sets :id => false if there is an :id column, but it's not the primary_key. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1766 state:committed] | ||||
* | Mysql#reconnect is set according to the 'reconnect' key in the connection spec. | Dov Murik | 2009-01-27 | 1 | -2/+5 |
| | | | | | | | | | | | | The 'reconenct' boolean option is read from the connection specification and is used to set the reconnect attribute of Mysql. The default is false in order not to change existing application behaviour. Also, reconnect is set AFTER real_connect is called, so its value sticks (the mysql gem sets reconnect to false inside real_connect). Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1797 state:committed] | ||||
* | Fix PostgreSQL unit test failures that only occur when using the old ↵ | Hongli Lai (Phusion) | 2009-01-13 | 2 | -10/+12 |
| | | | | | | | | 'postgres' driver. [#1748 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Introduce transaction_joinable flag to mark that the fixtures transaction ↵ | Jeremy Kemper | 2009-01-10 | 2 | -25/+25 |
| | | | | | | can't joined, a new savepoint is required even if :requires_new is not set. Use :requires_new option instead of :nest. Update changelog. [#383 state:committed] | ||||
* | Merge branch 'master' into savepoints | Jeremy Kemper | 2009-01-10 | 7 | -58/+76 |
|\ | |||||
| * | Add transaction check to SQLite2 adapter to fix ↵ | Mike Gunderloy | 2008-12-30 | 1 | -0/+4 |
| | | | | | | | | | | | | test_sqlite_add_column_in_transaction_raises_statement_invalid [#1669 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Inline code comments for class_eval/module_eval [#1657 state:resolved] | Xavier Noria | 2008-12-28 | 4 | -48/+50 |
| | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Merge docrails | Pratik Naik | 2008-12-19 | 2 | -1/+4 |
| | | |||||
| * | Free MySQL::Result objects after a call to execute [#1416 state:resolved] | Manfred Stienstra | 2008-12-18 | 1 | -4/+13 |
| | | | | | | | | | | | | | | | | No freeing Result objects causes the MySQL driver to free result sets at undefined times, this can lead to erratic performance in your application. Signed-off-by: Frederick Cheung <frederick.cheung@gmail.com> | ||||
| * | Benchmark.ms | Jeremy Kemper | 2008-12-09 | 1 | -5/+5 |
| | | |||||
* | | Merge commit 'origin/master' into savepoints | Hongli Lai (Phusion) | 2008-12-09 | 2 | -6/+11 |
|\| | |||||
| * | Merge with docrails | Pratik Naik | 2008-12-07 | 2 | -6/+11 |
| | | |||||
* | | Merge commit 'origin/master' into savepoints | Hongli Lai (Phusion) | 2008-12-03 | 3 | -15/+21 |
|\| | | | | | | | | | | | Conflicts: activerecord/lib/active_record/fixtures.rb activerecord/test/cases/defaults_test.rb | ||||
| * | Autoload ActiveRecord files | Joshua Peek | 2008-11-24 | 1 | -0/+1 |
| | | |||||
| * | Remove reset! as a connection#checkout callback | Pratik Naik | 2008-11-19 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'master' into testing | Jeremy Kemper | 2008-11-08 | 1 | -3/+11 |
| |\ | |||||
| | * | Timeout the connection pool monitor on ruby 1.8 only | Jeremy Kemper | 2008-11-08 | 1 | -3/+11 |
| | | |