Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #5015 from castlerock/revert_PR_5001_fix_isolated_test_run | José Valim | 2012-02-12 | 4 | -0/+5 |
|\ | | | | | TO make build green Revert PR#5001 "removed unuseful require for reply as we are not using require model" | ||||
| * | 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. | ||||
* | Merge pull request #5014 from castlerock/fix_build_PR_5001 | Xavier Noria | 2012-02-12 | 1 | -0/+1 |
|\ | | | | | fix build #5001, model reply is required in cases/primary_keys_test too! for isolated test | ||||
| * | fix build 5001, model reply is required in cases/primary_keys_test too! | Vishnu Atrai | 2012-02-12 | 1 | -0/+1 |
|/ | |||||
* | Merge pull request #5013 from castlerock/fix_build_pull_5001 | José Valim | 2012-02-12 | 1 | -0/+1 |
|\ | | | | | fix build #5001, reply model required in relations_test | ||||
| * | fix build #5001 reply model required in relations_test | Vishnu Atrai | 2012-02-12 | 1 | -0/+1 |
|/ | |||||
* | Merge pull request #5010 from tchandy/clean_routing_tests | José Valim | 2012-02-11 | 2 | -58/+2 |
|\ | | | | | Cleaning Route generation tests | ||||
| * | Cleaning Route generation tests | Thiago Pradi | 2012-02-12 | 2 | -58/+2 |
|/ | |||||
* | Merge pull request #5006 from lest/patch-1 | Xavier Noria | 2012-02-11 | 2 | -1/+7 |
|\ | | | | | handle id attribute in PrimaryKey module | ||||
| * | handle id attribute in PrimaryKey module | Sergey Nartimov | 2012-02-11 | 2 | -1/+7 |
|/ | |||||
* | 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 |
| | | |||||
* | | Merge pull request #5001 from Karunakar/no_reply_requires | Xavier Noria | 2012-02-11 | 6 | -7/+0 |
|\ \ | | | | | | | removed unuseful require for reply as we are not using require model | ||||
| * | | removed unuseful require for reply as we are not using require model | Karunakar (Ruby) | 2012-02-11 | 6 | -7/+0 |
|/ / | |||||
* / | say unshift when you mean unshift (modulus prepend) | Xavier Noria | 2012-02-11 | 2 | -4/+8 |
|/ | |||||
* | say goodbye to #with_test_routes :axe: | Xavier Noria | 2012-02-10 | 1 | -1166/+947 |
| | |||||
* | fixes a regression introduced by 532cd4, and a bogus test in AP the ↵ | Xavier Noria | 2012-02-10 | 3 | -8/+10 |
| | | | | regression uncovered | ||||
* | Merge branch 'master' into instance_reader | Aaron Patterson | 2012-02-10 | 2 | -6/+15 |
|\ | | | | | | | | | * master: Add Inflection test (and fixes) to ensure singularizing a singular actually give you the correct singular in more cases | ||||
| * | Merge pull request #4719 from markmcspadden/singularize_words_that_end_in_ss | Xavier Noria | 2012-02-10 | 2 | -6/+15 |
| |\ | | | | | | | Add Inflection test (and fixes) to ensure singularizing a singular actually give you the correct singular in more cases | ||||
| | * | Add Inflection test (and fixes) to ensure singularizing a singular actually ↵ | Mark McSpadden | 2012-01-27 | 2 | -6/+15 |
| | | | | | | | | | | | | give you the correct singular in more cases | ||||
* | | | PG column consults oid types when typecasting | Aaron Patterson | 2012-02-10 | 5 | -10/+34 |
| | | | |||||
* | | | dynamically populate casting objects via the pg_type table | Aaron Patterson | 2012-02-10 | 2 | -35/+74 |
| | | | |||||
* | | | Merge branch 'joelhoffman-postgres_schema_builder' into instance_reader | Aaron Patterson | 2012-02-10 | 6 | -36/+126 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | 2 | -0/+13 |
| | | | | |||||
| * | | | Hstore values are all strings | Joel | 2012-02-08 | 1 | -1/+1 |
| | | | | |||||
| * | | | string_to_hstore / hstore_to_string, serializing | Joel | 2012-02-08 | 3 | -17/+26 |
| | | | | |||||
| * | | | don't test schema where hstore not installed | Joel | 2012-02-08 | 1 | -0/+2 |
| | | | | |||||
| * | | | schema dumper tests for hstore | Joel | 2012-02-08 | 2 | -1/+15 |
| | | | | |||||
| * | | | Additional hstore tests, supporting null values, better compliance with ↵ | Joel | 2012-02-08 | 2 | -28/+76 |
| | | | | | | | | | | | | | | | | postgres docs | ||||
| * | | | add hstore to postgres native types and defaults | Joel | 2012-02-08 | 1 | -1/+5 |
| | | | | |||||
* | | | | Merge branch 'master' into instance_reader | Aaron Patterson | 2012-02-10 | 15 | -6/+121 |
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | 11 | -5/+77 |
| |\ \ \ | | | | | | | | | | | 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 | 7 | -2/+27 |
| | | | | | |||||
| | * | | | Added where option to add_index to support postgresql partial indices | Marcelo Silveira | 2012-02-09 | 5 | -3/+47 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | | | | Merge pull request #4985 from shigeya/range_overlaps_to_use_cover | Aaron Patterson | 2012-02-10 | 2 | -1/+13 |
| |\ \ \ \ | | | | | | | | | | | | | make Range#overlaps? accept Range of Time | ||||
| | * | | | | make Range#overlaps? accept Range of Time | Shigeya Suzuki | 2012-02-09 | 2 | -1/+13 |
| | | | | | | |||||
| * | | | | | Merge pull request #4988 from kennyj/fix_4720-3 | Aaron Patterson | 2012-02-10 | 2 | -0/+31 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Fix GH #4720. Routing problem with nested namespace and already camelized controller option. | ||||
| | * | | | | | Fix GH #4720. Routing problem with nested namespace and already camelized ↵ | kennyj | 2012-02-10 | 2 | -0/+31 |
| |/ / / / / | | | | | | | | | | | | | | | | | | | controller option. | ||||
* | | | | | | fixing indentation, moving class methods together | Aaron Patterson | 2012-02-09 | 1 | -124/+124 |
| | | | | | | |||||
* | | | | | | removing dead code | Aaron Patterson | 2012-02-09 | 4 | -29/+0 |
| | | | | | | |||||
* | | | | | | typecast columns based on the returned types | Aaron Patterson | 2012-02-09 | 2 | -8/+15 |
| | | | | | | |||||
* | | | | | | Merge branch 'master' into instance_reader | Aaron Patterson | 2012-02-09 | 38 | -107/+175 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 ... | ||||
| * | | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-02-09 | 8 | -27/+19 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/relation/query_methods.rb | ||||
| | * | | | | | Clean up some wording. | Ben Orenstein | 2012-02-08 | 1 | -2/+2 |
| | | | | | | | |||||
| | * | | | | | Fix typo. | Ben Orenstein | 2012-02-08 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Fixes in AMo README | Carlos Antonio da Silva | 2012-02-07 | 1 | -5/+4 |
| | | | | | | | |||||
| | * | | | | | Merge pull request #82 from simi/encode_with | Josef Šimánek | 2012-02-06 | 1 | -1/+1 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | Correcting ActiveRecord::Core#encode_with docs | ||||
| | | * | | | | | Correcting ActiveRecord::Core#encode_with docs | Josef Šimánek | 2012-02-07 | 1 | -1/+1 |
| | |/ / / / / | |||||
| | * | | | | | use appropriate words for docs of Model.none | Rohit Arondekar | 2012-02-07 | 1 | -2/+2 |
| | | | | | | |