aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | Merge pull request #5021 from tchandy/clean_controller_testsJosé Valim2012-02-123-39/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Removing old Controller test
| * | | | | | | Removing old Controller testThiago Pradi2012-02-123-39/+0
| | |/ / / / / | |/| | | | |
* | | | | | | prefer tr to gsub for replacing charactersXavier Noria2012-02-121-2/+2
| | | | | | |
* | | | | | | inflection regexp are meant to be applied onceXavier Noria2012-02-121-2/+2
| | | | | | |
* | | | | | | removes redundant argumentXavier Noria2012-02-121-1/+1
| | | | | | |
* | | | | | | boosts inflectionsXavier Noria2012-02-121-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | The impact of this change has been measured pluralizing the entire /usr/share/dict/words, showing a 6x speedup
* | | | | | Merge pull request #5015 from castlerock/revert_PR_5001_fix_isolated_test_runJosé Valim2012-02-124-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 Atrai2012-02-124-0/+5
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | require model" This reverts commit 7381596ea32aff47222af89e4bc66000f4597acb.
* | | | | Merge pull request #5014 from castlerock/fix_build_PR_5001Xavier Noria2012-02-121-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 Atrai2012-02-121-0/+1
|/ / / / /
* | | | | Merge pull request #5013 from castlerock/fix_build_pull_5001José Valim2012-02-121-0/+1
|\ \ \ \ \ | |/ / / / |/| | | | fix build #5001, reply model required in relations_test
| * | | | fix build #5001 reply model required in relations_testVishnu Atrai2012-02-121-0/+1
|/ / / /
* | | | Merge pull request #5010 from tchandy/clean_routing_testsJosé Valim2012-02-112-58/+2
|\ \ \ \ | | | | | | | | | | Cleaning Route generation tests
| * | | | Cleaning Route generation testsThiago Pradi2012-02-122-58/+2
|/ / / /
* | | | Merge pull request #5006 from lest/patch-1Xavier Noria2012-02-112-1/+7
|\ \ \ \ | | | | | | | | | | handle id attribute in PrimaryKey module
| * | | | handle id attribute in PrimaryKey moduleSergey Nartimov2012-02-112-1/+7
|/ / / /
* | | | Merge pull request #5003 from kennyj/fix_warning_20120211Santiago Pastorino2012-02-111-1/+1
|\ \ \ \ | | | | | | | | | | Fix warning: The method name is a duplicate and wrong.
| * | | | Fix warning: The method name is a duplicate and wrong.kennyj2012-02-111-1/+1
| | | | |
* | | | | Merge pull request #5001 from Karunakar/no_reply_requiresXavier Noria2012-02-116-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 modelKarunakar (Ruby)2012-02-116-7/+0
|/ / / / /
* / / / / say unshift when you mean unshift (modulus prepend)Xavier Noria2012-02-112-4/+8
|/ / / /
* | | | say goodbye to #with_test_routes :axe:Xavier Noria2012-02-101-1166/+947
| | | |
* | | | fixes a regression introduced by 532cd4, and a bogus test in AP the ↵Xavier Noria2012-02-103-8/+10
| | | | | | | | | | | | | | | | regression uncovered
* | | | Merge branch 'master' into instance_readerAaron Patterson2012-02-102-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_ssXavier Noria2012-02-102-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 McSpadden2012-01-272-6/+15
| | | | | | | | | | | | | | | | | | | | give you the correct singular in more cases
* | | | | PG column consults oid types when typecastingAaron Patterson2012-02-105-10/+34
| | | | |
* | | | | dynamically populate casting objects via the pg_type tableAaron Patterson2012-02-102-35/+74
| | | | |
* | | | | Merge branch 'joelhoffman-postgres_schema_builder' into instance_readerAaron Patterson2012-02-106-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 databaseJoel2012-02-082-0/+13
| | | | | |
| * | | | | Hstore values are all stringsJoel2012-02-081-1/+1
| | | | | |
| * | | | | string_to_hstore / hstore_to_string, serializingJoel2012-02-083-17/+26
| | | | | |
| * | | | | don't test schema where hstore not installedJoel2012-02-081-0/+2
| | | | | |
| * | | | | schema dumper tests for hstoreJoel2012-02-082-1/+15
| | | | | |
| * | | | | Additional hstore tests, supporting null values, better compliance with ↵Joel2012-02-082-28/+76
| | | | | | | | | | | | | | | | | | | | | | | | postgres docs
| * | | | | add hstore to postgres native types and defaultsJoel2012-02-081-1/+5
| | | | | |
* | | | | | Merge branch 'master' into instance_readerAaron Patterson2012-02-1015-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_indicesAaron Patterson2012-02-1011-5/+77
| |\ \ \ \ \ | | | | | | | | | | | | | | Add support for partial indices to PostgreSQL adapter
| | * | | | | improved test case for partial indicesMarcelo Silveira2012-02-091-6/+9
| | | | | | |
| | * | | | | Made schema dumper recognize partial indices' where statementsMarcelo Silveira2012-02-097-2/+27
| | | | | | |
| | * | | | | Added where option to add_index to support postgresql partial indicesMarcelo Silveira2012-02-095-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_coverAaron Patterson2012-02-102-1/+13
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | make Range#overlaps? accept Range of Time
| | * | | | | | make Range#overlaps? accept Range of TimeShigeya Suzuki2012-02-092-1/+13
| | | | | | | |
| * | | | | | | Merge pull request #4988 from kennyj/fix_4720-3Aaron Patterson2012-02-102-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 ↵kennyj2012-02-102-0/+31
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | controller option.
* | | | | | | | fixing indentation, moving class methods togetherAaron Patterson2012-02-091-124/+124
| | | | | | | |
* | | | | | | | removing dead codeAaron Patterson2012-02-094-29/+0
| | | | | | | |
* | | | | | | | typecast columns based on the returned typesAaron Patterson2012-02-092-8/+15
| | | | | | | |
* | | | | | | | Merge branch 'master' into instance_readerAaron Patterson2012-02-0938-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/docrailsVijay Dev2012-02-098-27/+19
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/relation/query_methods.rb