Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #5000 from flavorpill/master-with-multidb-association-fix | Aaron Patterson | 2012-02-13 | 1 | -0/+12 |
|\ | | | | | Fix associations with per-class/multiple database connections | ||||
| * | added test for #3732 | Rick Martinez | 2012-02-10 | 1 | -0/+12 |
| | | |||||
* | | Revert PR#5001 "removed unuseful require for reply as we are not using ↵ | Vishnu Atrai | 2012-02-12 | 4 | -0/+5 |
| | | | | | | | | | | | | require model" This reverts commit 7381596ea32aff47222af89e4bc66000f4597acb. | ||||
* | | fix build 5001, model reply is required in cases/primary_keys_test too! | Vishnu Atrai | 2012-02-12 | 1 | -0/+1 |
| | | |||||
* | | fix build #5001 reply model required in relations_test | Vishnu Atrai | 2012-02-12 | 1 | -0/+1 |
| | | |||||
* | | Merge pull request #5003 from kennyj/fix_warning_20120211 | Santiago Pastorino | 2012-02-11 | 1 | -1/+1 |
|\ \ | | | | | | | Fix warning: The method name is a duplicate and wrong. | ||||
| * | | Fix warning: The method name is a duplicate and wrong. | kennyj | 2012-02-11 | 1 | -1/+1 |
| | | | |||||
* | | | removed unuseful require for reply as we are not using require model | Karunakar (Ruby) | 2012-02-11 | 6 | -7/+0 |
|/ / | |||||
* | | PG column consults oid types when typecasting | Aaron Patterson | 2012-02-10 | 1 | -3/+6 |
| | | |||||
* | | Merge branch 'joelhoffman-postgres_schema_builder' into instance_reader | Aaron Patterson | 2012-02-10 | 2 | -8/+75 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | ||||
| * | | Also support writing the hstore back to the database | Joel | 2012-02-08 | 1 | -0/+8 |
| | | | |||||
| * | | string_to_hstore / hstore_to_string, serializing | Joel | 2012-02-08 | 1 | -6/+6 |
| | | | |||||
| * | | schema dumper tests for hstore | Joel | 2012-02-08 | 1 | -0/+7 |
| | | | |||||
| * | | Additional hstore tests, supporting null values, better compliance with ↵ | Joel | 2012-02-08 | 1 | -7/+59 |
| | | | | | | | | | | | | postgres docs | ||||
* | | | Merge branch 'master' into instance_reader | Aaron Patterson | 2012-02-10 | 4 | -0/+36 |
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | * master: Fix GH #4720. Routing problem with nested namespace and already camelized controller option. make Range#overlaps? accept Range of Time improved test case for partial indices Made schema dumper recognize partial indices' where statements Added where option to add_index to support postgresql partial indices | ||||
| * | | Merge pull request #4956 from mhfs/pg_partial_indices | Aaron Patterson | 2012-02-10 | 4 | -0/+36 |
| |\ \ | | | | | | | | | Add support for partial indices to PostgreSQL adapter | ||||
| | * | | improved test case for partial indices | Marcelo Silveira | 2012-02-09 | 1 | -6/+9 |
| | | | | |||||
| | * | | Made schema dumper recognize partial indices' where statements | Marcelo Silveira | 2012-02-09 | 3 | -0/+21 |
| | | | | |||||
| | * | | Added where option to add_index to support postgresql partial indices | Marcelo Silveira | 2012-02-09 | 1 | -0/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `add_index` method now supports a `where` option that receives a string with the partial index criteria. add_index(:accounts, :code, :where => "active") Generates CREATE INDEX index_accounts_on_code ON accounts(code) WHERE active | ||||
* | | | | typecast columns based on the returned types | Aaron Patterson | 2012-02-09 | 1 | -6/+1 |
| | | | | |||||
* | | | | Merge branch 'master' into instance_reader | Aaron Patterson | 2012-02-09 | 3 | -5/+35 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (30 commits) Bump tzinfo. 0.3.31 was released on November 6, 2011. Fix GH #4909. Dependency on TZInfo move from AR to AS. moving ordered hash to normal hash because ruby 1.9.3 hash defaultly ordered one Refactored the OrderedHash related stuff Replaced OrderedHash usage with Ruby 1.9 Hash Replaced OrderedHash with Hash for ruby 1.9 series removed unnecessary code replacing the orderhash with hash for ruby-1.9 Clean up some wording. Fix typo. test title changed corresponding to the test replaced active support ordered hash to ruby hash on active resource PostgreSQL does not work in the same way of the other adapters AR::Relation#pluck: improve to work with joins Fix match docs Fix attribute_before_type_cast for serialized attributes. Fixes #4837. Fix failing request test Fixes in AMo README Update README to mention lint. Trim down Active Model API by removing valid? and errors.full_messages ... | ||||
| * | | | moving ordered hash to normal hash because ruby 1.9.3 hash defaultly ordered one | Karunakar (Ruby) | 2012-02-09 | 1 | -5/+5 |
| | |/ | |/| | |||||
| * | | PostgreSQL does not work in the same way of the other adapters | Rafael Mendonça França | 2012-02-08 | 1 | -3/+7 |
| | | | |||||
| * | | AR::Relation#pluck: improve to work with joins | Bogdan Gusiev | 2012-02-08 | 1 | -0/+11 |
| | | | |||||
| * | | Fix attribute_before_type_cast for serialized attributes. Fixes #4837. | Jon Leighton | 2012-02-07 | 1 | -0/+15 |
| |/ | |||||
* | | fixing the list of cached columns | Aaron Patterson | 2012-02-09 | 1 | -1/+3 |
| | | |||||
* | | only exclude serialized columns from cacheable columns | Aaron Patterson | 2012-02-09 | 1 | -1/+1 |
| | | |||||
* | | postgresql correctly typecasts back to Ruby, so change assertions | Aaron Patterson | 2012-02-07 | 1 | -2/+4 |
| | | |||||
* | | column_types hash is used for doing typecasting | Aaron Patterson | 2012-02-07 | 1 | -1/+21 |
| | | |||||
* | | column types are passed from the result set to the instantiated AR object | Aaron Patterson | 2012-02-07 | 1 | -0/+4 |
|/ | |||||
* | let automatic EXPLAIN ignore CACHE notifications | Xavier Noria | 2012-02-03 | 1 | -0/+48 |
| | |||||
* | Get ActiveRecord::TestCase back on its feet, despite deprecation. It ↵ | Jeremy Kemper | 2012-02-05 | 2 | -91/+7 |
| | | | | requires SQLCounter which was moved to AR internal tests only. | ||||
* | Merge pull request #4856 from ihid/store_null_bug | Aaron Patterson | 2012-02-02 | 1 | -2/+11 |
|\ | | | | | Allow store to be a not null column. | ||||
| * | Allow store to be a not null column. | Jeremy Walker | 2012-02-02 | 1 | -2/+11 |
| | | |||||
* | | columns method doesn't have name argument | Rafael Mendonça França | 2012-02-02 | 1 | -5/+4 |
| | | |||||
* | | Merge pull request #4543 from jdelStrother/find_or_init | Jon Leighton | 2012-02-01 | 1 | -0/+12 |
|\ \ | |/ |/| | Don't instantiate two objects in collection proxy / find_or_instantiate_by | ||||
| * | Don't instantiate two objects in collection proxy / find_or_instantiator_by | Jonathan del Strother | 2012-01-19 | 1 | -0/+12 |
| | | |||||
* | | Fix typo | Rafael Mendonça França | 2012-02-01 | 1 | -2/+2 |
| | | |||||
* | | Use human attribute name to show the dependent destroy message | Rafael Mendonça França | 2012-02-01 | 1 | -1/+25 |
| | | |||||
* | | Merge pull request #4828 from railsaholic/fix_error_message | José Valim | 2012-02-01 | 2 | -2/+2 |
|\ \ | | | | | | | fix has_one, has_many restrict error message | ||||
| * | | fix has_one, has_many restrict error message | Manoj | 2012-02-01 | 2 | -2/+2 |
| | | | |||||
* | | | Merge pull request #4806 from KL-7/do-not-serialize-nil | Aaron Patterson | 2012-02-01 | 1 | -1/+14 |
|\ \ \ | | | | | | | | | Do not serialize nil in serialized attribute. | ||||
| * | | | Do not serialize nil in serialized attribute. | Kirill Lashuk | 2012-01-31 | 1 | -1/+14 |
| | | | | |||||
* | | | | Merge pull request #4809 from cfeist/feist-sqlite-binary-corruption | Aaron Patterson | 2012-02-01 | 1 | -1/+1 |
|\ \ \ \ | |_|/ / |/| | | | Fix for SQLite binary data corrupter (to master branch) | ||||
| * | | | Added test to illustrate bad binary blobs. | Chris Feist | 2012-01-31 | 1 | -1/+1 |
| | | | | |||||
* | | | | fix a typo [ci skip] | Vijay Dev | 2012-02-01 | 1 | -1/+1 |
|/ / / | |||||
* | | | Revert "Merge pull request #4746 from jenslukowski/issue4718" | Aaron Patterson | 2012-01-31 | 1 | -8/+0 |
| | | | | | | | | | | | | | | | This reverts commit 5cad7a0dba652f3e942e58087bc88ba5c5390edc, reversing changes made to bb842e8d2111e50b21a14b8bd6d89371a4b9cd68. | ||||
* | | | Merge pull request #4805 from xuanxu/none_and_null_object_pattern | Jon Leighton | 2012-01-31 | 1 | -0/+13 |
|\ \ \ | |/ / |/| | | Added `none` query method to return zero records. | ||||
| * | | Added `none` query method to return zero records. | Juanjo Bazán | 2012-01-31 | 1 | -0/+13 |
| | | | | | | | | | And added NullRelation class implementing the null object pattern for the `Relation` class. | ||||
* | | | Merge pull request #4742 from petervandenabeele/master | Aaron Patterson | 2012-01-31 | 1 | -0/+3 |
|\ \ \ | | | | | | | | | Set the timezone correctly for a test in activerecord/../base_test.rb |