Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | fix: limit of enum columns of mysql | Yamada Masaki | 2012-06-28 | 2 | -0/+19 | |
| | ||||||
* | Revert "Merge pull request #6344" | Piotr Sarnacki | 2012-06-25 | 1 | -1/+0 | |
| | | | | | | | | | | | | | | This commit needs to be reverted because it introduces difficulties when using sqlite3 in development and other databases in production. This happens because when you create time column in sqlite3, it's dumped as datetime in schema.rb file. This reverts commit 57d534ee9e441d078fcc161c0c78ebaa5aacd736, reversing changes made to 20f049fb50daee0c5e5a69b55b529af5737e8e3f. Conflicts: activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb | |||||
* | Improve the derivation of HABTM assocation join table names | Andrew White | 2012-06-22 | 1 | -0/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve the derivation of HABTM join table name to take account of nesting. It now takes the table names of the two models, sorts them lexically and then joins them, stripping any common prefix from the second table name. Some examples: Top level models (Category <=> Product) Old: categories_products New: categories_products Top level models with a global table_name_prefix (Category <=> Product) Old: site_categories_products New: site_categories_products Nested models in a module without a table_name_prefix method (Admin::Category <=> Admin::Product) Old: categories_products New: categories_products Nested models in a module with a table_name_prefix method (Admin::Category <=> Admin::Product) Old: categories_products New: admin_categories_products Nested models in a parent model (Catalog::Category <=> Catalog::Product) Old: categories_products New: catalog_categories_products Nested models in different parent models (Catalog::Category <=> Content::Page) Old: categories_pages New: catalog_categories_content_pages Also as part of this commit the validity checks for HABTM assocations have been moved to ActiveRecord::Reflection One side effect of this is to move when the exceptions are raised from the point of declaration to when the association is built. This is consistant with other association validity checks. | |||||
* | Add uuid type support to PostgreSQL adapter | Konstantin Shabanov | 2012-06-14 | 1 | -1/+9 | |
| | ||||||
* | Merge pull request #6238 from pwnall/pgsql_bytea_limit | Aaron Patterson | 2012-05-17 | 1 | -0/+1 | |
|\ | | | | | Postgresql doesn't accept limits on binary (bytea) columns. | |||||
| * | Postgresql doesn't accept limits on binary (bytea) columns. | Victor Costan | 2012-05-09 | 1 | -0/+1 | |
| | | ||||||
* | | SQLite3 doesn't actually support the 'time' type. | Erich Menge | 2012-05-15 | 1 | -0/+1 | |
| | | ||||||
* | | MySQL doesn't allow default values for blobs. | Rafael Mendonça França | 2012-05-13 | 1 | -2/+2 | |
| | | ||||||
* | | Merge pull request #5807 from Antiarchitect/store-improvement | Rafael Mendonça França | 2012-05-13 | 1 | -0/+2 | |
|\ \ | | | | | | | Custom coders support for ActiveRecord::Store. | |||||
| * | | Custom coders support for ActiveRecord::Store. JSON, YAML, Marshal can be ↵ | Andrey Voronkov | 2012-05-09 | 1 | -0/+2 | |
| |/ | | | | | | | used out of the box. | |||||
* / | mispelling errors in render_text_test.rb and sqlite_specific_schema | angelo giovanni capilleri | 2012-05-12 | 1 | -1/+1 | |
|/ | ||||||
* | Modify test schema.rb to use a VARCHAR rather than a TEXT when a default is ↵ | Michael Pearson | 2012-05-05 | 1 | -1/+3 | |
| | | | | required to keep MySQL happy. | |||||
* | Duplicate column_defaults properly (closes #6115) | Piotr Sarnacki | 2012-05-04 | 1 | -0/+1 | |
| | ||||||
* | Create plpgsql language if not available | Prem Sichanugrist | 2012-04-27 | 1 | -21/+29 | |
| | | | | | This should fix the problem in Travis CI server. (http://travis-ci.org/#!/rails/rails/jobs/1194988) | |||||
* | add use_returning as a postgresql connection config | Doug Cole | 2012-03-31 | 1 | -2/+27 | |
| | ||||||
* | whitespace :scissors: | Jon Leighton | 2012-03-30 | 1 | -1/+1 | |
| | ||||||
* | Merge pull request #5334 from courtland/master | Jon Leighton | 2012-03-30 | 1 | -0/+5 | |
|\ | | | | | Fix deleting from a HABTM join table upon destroying an object of a model with optimistic locking enabled. | |||||
| * | Tests for removing a HABTM association when optimistic locking is enabled. | Nick Rogers | 2012-03-07 | 1 | -0/+5 | |
| | | ||||||
* | | Nested attribute setters can be overridden. | Jonathan Mukai & Peter Jaros | 2012-03-28 | 1 | -0/+1 | |
| | | | | | | | | Overriding implementation can call super. | |||||
* | | attributes are cached by string keys, so to_s to support symbols. fixes #5549 | Aaron Patterson | 2012-03-27 | 1 | -0/+1 | |
|/ | ||||||
* | Fix type_to_sql with text and limit on mysql/mysql2. Fix GH #3931. | kennyj | 2012-02-26 | 2 | -3/+3 | |
| | ||||||
* | Merge pull request #5000 from flavorpill/master-with-multidb-association-fix | Aaron Patterson | 2012-02-13 | 1 | -0/+5 | |
|\ | | | | | Fix associations with per-class/multiple database connections | |||||
| * | added test for #3732 | Rick Martinez | 2012-02-10 | 1 | -0/+5 | |
| | | ||||||
* | | Merge branch 'joelhoffman-postgres_schema_builder' into instance_reader | Aaron Patterson | 2012-02-10 | 1 | -1/+10 | |
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | * joelhoffman-postgres_schema_builder: Also support writing the hstore back to the database Hstore values are all strings string_to_hstore / hstore_to_string, serializing don't test schema where hstore not installed schema dumper tests for hstore Additional hstore tests, supporting null values, better compliance with postgres docs add hstore to postgres native types and defaults Conflicts: activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb | |||||
| * | don't test schema where hstore not installed | Joel | 2012-02-08 | 1 | -0/+2 | |
| | | ||||||
| * | schema dumper tests for hstore | Joel | 2012-02-08 | 1 | -1/+8 | |
| | | ||||||
* | | Made schema dumper recognize partial indices' where statements | Marcelo Silveira | 2012-02-09 | 1 | -0/+1 | |
|/ | ||||||
* | Allow store to be a not null column. | Jeremy Walker | 2012-02-02 | 1 | -1/+2 | |
| | ||||||
* | Merge pull request #4696 from rafaelfranca/issue-4653 | Aaron Patterson | 2012-01-26 | 1 | -2/+0 | |
| | | | | Remove extra attributes from HABTM join tables in AR tests | |||||
* | Fix bug where reset_counters resets the wrong counter cache. | David Peter | 2012-01-16 | 1 | -0/+10 | |
| | | | | | | | | If a model belongs_to two associations with the same class, then reset_counters will reset the wrong counter cache. Finding the right reflection should use the foreign_key instead, which should be unique. | |||||
* | Merge branch 'master' of git://github.com/rails/rails | Dmitry Polushkin | 2011-12-31 | 3 | -1/+37 | |
|\ | ||||||
| * | Test fixtures with custom model and table names | Alexey Muranov | 2011-12-30 | 1 | -0/+5 | |
| | | | | | | | | | | | | Test using fixtures with random names and model names, that is not following naming conventions but using set_fixture_class instead. It is expected that the table name be defined in the model, but this is not explicitly tested here. This will need to be fixed. | |||||
| * | Support establishing connection on ActiveRecord::Model. | Jon Leighton | 2011-12-28 | 1 | -0/+1 | |
| | | | | | | | | | | This is the 'top level' connection, inherited by any models that include ActiveRecord::Model or inherit from ActiveRecord::Base. | |||||
| * | Fixtures support for ActiveRecord::Model | Jon Leighton | 2011-12-24 | 1 | -0/+1 | |
| | | ||||||
| * | I herd you like modules. | Jon Leighton | 2011-12-24 | 1 | -0/+4 | |
| | | ||||||
| * | serialize fails on subclass | Alvaro Bautista | 2011-12-23 | 1 | -0/+2 | |
| | | ||||||
| * | Added ActiveRecord::Base.store for declaring simple single-column key/value ↵ | David Heinemeier Hansson | 2011-10-13 | 1 | -0/+1 | |
| | | | | | | | | stores [DHH] | |||||
| * | Only use LOWER for mysql case insensitive uniqueness check when column has a ↵ | Joseph Palermo | 2011-10-09 | 2 | -1/+23 | |
| | | | | | | | | case sensitive collation. | |||||
* | | Merge branch 'master' of git://github.com/rails/rails | Dmitry Polushkin | 2011-09-15 | 1 | -1/+7 | |
|\| | ||||||
| * | Raise error when using write_attribute with a non-existent attribute. | Jon Leighton | 2011-09-13 | 1 | -1/+7 | |
| | | | | | | | | | | | | | | | | | | Previously we would just silently write the attribute. This can lead to subtle bugs (for example, see the change in AutosaveAssociation where a through association would wrongly gain an attribute. Also, ensuring that we never gain any new attributes after initialization will allow me to reduce our dependence on method_missing. | |||||
* | | Test polymorphic record with optimistic locking and counter cache should be ↵ | Dmitry Polushkin | 2011-09-09 | 1 | -0/+1 | |
|/ | | | | destoyed without catching the ActiveRecord::StaleObjectError. | |||||
* | Fix exception if old and new targets are both nil. Fixes #1471. | Jon Leighton | 2011-07-12 | 1 | -0/+1 | |
| | ||||||
* | Merge pull request #2017 from Casecommons/active_record_lint | José Valim | 2011-07-08 | 1 | -0/+2 | |
|\ | | | | | ActiveRecord::Base subclasses should pass ActiveModel::Lint. | |||||
| * | ActiveRecord::Base should pass ActiveModel::Lint. | Grant Hutchins & Peter Jaros | 2011-07-08 | 1 | -0/+2 | |
| | | ||||||
* | | Destroy association habtm record before destroying the record itself. Fixes ↵ | Tomas D'Stefano | 2011-07-08 | 1 | -0/+2 | |
|/ | | | | issue #402. | |||||
* | Merge pull request #560 from guilleiguaran/fix_pluralize_table_names_false | Jon Leighton | 2011-05-16 | 1 | -0/+4 | |
|\ | | | | | Fixing has_many when ActiveRecord::Base.pluralize_table_names is false | |||||
| * | Fixing has_many association when ActiveRecord::Base.pluralize_table_names is ↵ | Guillermo Iguaran | 2011-05-15 | 1 | -0/+4 | |
| | | | | | | | | false. fixes #557 | |||||
* | | CollectionAssociation#merge_target_lists should write to the underlying ↵ | Jon Leighton | 2011-05-14 | 1 | -0/+1 | |
|/ | | | | attributes when copying, rather than using the assignment method | |||||
* | Add test to specify that attributes from an association's conditions should ↵ | Jon Leighton | 2011-05-10 | 1 | -0/+1 | |
| | | | | be assigned without mass-assignment protection when a record is built on the association. | |||||
* | Don't quote ID's as Arel will quote them -- follow same conventions as the ↵ | Christopher Meiklejohn | 2011-05-08 | 1 | -0/+6 | |
| | | | | delete method. |