Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Use ActiveSupport::Callbacks instead of | Emilio Tagua | 2009-10-13 | 1 | -1/+1 |
| | | | | ActiveSupport::DeprecatedCallbacks. | ||||
* | Merge commit 'rails/master' | Emilio Tagua | 2009-10-13 | 1 | -2/+2 |
|\ | |||||
| * | Callbacks, DeprecatedCallbacks = NewCallbacks, Callbacks | Joshua Peek | 2009-10-12 | 1 | -2/+2 |
| | | |||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-09-22 | 1 | -13/+9 |
|\| | |||||
| * | Instrument process_action, render and sql. | José Valim | 2009-09-20 | 1 | -13/+9 |
| | | |||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-09-21 | 1 | -1/+4 |
|\| | |||||
| * | Enable use of MySQL stored procedures by default. | Justin Bailey | 2009-09-17 | 1 | -1/+4 |
| | | | | | | | | | | | | [#3204 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-09-14 | 1 | -1/+2 |
|\| | |||||
| * | Ruby 1.9 compat: corrected instance_methods check | sdsykes | 2009-09-13 | 1 | -1/+2 |
| | | | | | | | | | | | | [#3156 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-08-17 | 2 | -42/+3 |
|\| | |||||
| * | Remove support for SQLite 2. | Pratik Naik | 2009-08-17 | 2 | -42/+3 |
| | | | | | | | | If you're still using it, please install the plugin from git://github.com/rails/sqlite2_adapter.git | ||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-08-10 | 6 | -13/+67 |
|\| | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/calculations.rb activerecord/lib/active_record/connection_adapters/mysql_adapter.rb activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb | ||||
| * | Use table prefix and suffix for schema_migrations index. | Tim Peters | 2009-08-09 | 1 | -1/+1 |
| | | | | | | | | | | | | [#1543 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | PostgreSQL: XML datatype support | Leonardo Borges | 2009-08-09 | 2 | -13/+36 |
| | | | | | | | | | | | | [#1874 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | raises exception (ActiveRecord::ConfigurationError with message) on habtm ↵ | Jaime Bellmyer | 2009-08-09 | 4 | -0/+32 |
| | | | | | | | | | | | | association creation if join table contains a primary key Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Fix that creating a table whose primary key prefix type is :table_name ↵ | Morgan Schweers | 2009-08-09 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | generates an incorrectly pluralized primary key. [#872 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | AR should respect default values for MySQL BINARY and VARBINARY columns. | Jatinder Singh | 2009-08-09 | 1 | -2/+2 |
| | | | | | | | | | | | | [#1273 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | No longer require database name for MySQL to allow cross database selects. | Tristan Dunn | 2009-08-09 | 1 | -6/+1 |
| | | | | | | | | | | | | [#1122 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Allow connect_timeout, read_timeout and write_timeout settings for MySQL ↵ | Matt Conway | 2009-08-09 | 1 | -0/+4 |
| | | | | | | | | | | | | [#2544 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-08-06 | 1 | -2/+1 |
|\| | |||||
| * | Ruby 1.9.2 compat: Array#* uses to_str instead of to_s to join values since ↵ | Akira Matsuda | 2009-08-05 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | | Ruby 1.9.2 [#2959 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-08-05 | 1 | -1/+6 |
|\| | |||||
| * | Revert "fallback_string_to_date sets Date._parse comp arg to true, so that ↵ | Geoff Buesing | 2009-08-05 | 1 | -1/+1 |
| | | | | | | | | | | | | strings with two-digit years, e.g. '1/1/09', are interpreted as modern years" [#2019 state:wontfix] This reverts commit 55d1d12c32a1b99f3f07d2346b49a63650ba2e9d. | ||||
| * | fallback_string_to_date sets Date._parse comp arg to true, so that strings ↵ | Matt Ganderup | 2009-08-03 | 1 | -1/+1 |
| | | | | | | | | with two-digit years, e.g. '1/1/09', are interpreted as modern years [#2019 state:resolved] | ||||
| * | quoted_date converts time-like objects to ↵ | Geoff Buesing | 2009-08-03 | 1 | -1/+6 |
| | | | | | | | | ActiveRecord::Base.default_timezone before serialization. This allows you to use Time.now in find conditions and have it correctly be serialized as the current time in UTC when default_timezone == :utc [#2946 state:resolved] | ||||
* | | 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> |