aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
* remove unnecessary require core_ext/string/encodingSergey Nartimov2012-02-141-1/+0
|
* Merge pull request #4834 from sskirby/fix_usage_of_psql_in_db_test_prepareAaron Patterson2012-02-131-1/+1
|\ | | | | Fix usage of psql in db:test:prepare
| * fixes rake db:test:prepare when using postgresql with sql db structure file ↵Sean Kirby2012-02-011-1/+1
| | | | | | | | and specifying a template in database.yml
* | Merge pull request #5000 from flavorpill/master-with-multidb-association-fixAaron Patterson2012-02-1311-10/+40
|\ \ | | | | | | Fix associations with per-class/multiple database connections
| * | fix associations when using per class databasesLars Kanis2012-02-103-8/+5
| | | | | | | | | | | | | | | | | | would get ConnectionNotEstablished error because it always tried to use ActiveRecord::Base's connection, even though it should be using the connection of the model whose context we're operating in
| * | added test for #3732Rick Martinez2012-02-108-2/+35
| | |
* | | Merge pull request #5012 from waseem/alias-reconnect-mysql2Aaron Patterson2012-02-131-5/+1
|\ \ \ | | | | | | | | Alias reconnect! to reset! for Mysql2 adapter since they have same behavior.
| * | | Alias reconnect! to reset! for Mysql2 adapter since they have sameWaseem Ahmad2012-02-121-5/+1
| | | | | | | | | | | | | | | | behavior.
* | | | 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.
* | | | fix build 5001, model reply is required in cases/primary_keys_test too!Vishnu Atrai2012-02-121-0/+1
| | | |
* | | | fix build #5001 reply model required in relations_testVishnu Atrai2012-02-121-0/+1
|/ / /
* | | 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
| | | |
* | | | 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-111-1/+3
|/ / /
* | | 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-1011-5/+77
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | | | | 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-099-11/+52
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-092-3/+3
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/relation/query_methods.rb
| | * | | | Correcting ActiveRecord::Core#encode_with docsJosef Šimánek2012-02-071-1/+1
| | | | | |
| | * | | | use appropriate words for docs of Model.noneRohit Arondekar2012-02-071-2/+2
| | | | | |
| | * | | | minor tidy up of none relation query methodRohit Arondekar2012-02-061-2/+2
| | | | | |
| | * | | | Fix code example in ActiveRecord::Relation#noneCarlos Antonio da Silva2012-02-011-3/+3
| | | | | |
| * | | | | Fix GH #4909. Dependency on TZInfo move from AR to AS.kennyj2012-02-101-1/+0
| | | | | |
| * | | | | Merge pull request #4965 from raghunadhd/fix_hashXavier Noria2012-02-091-2/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | Refactored the OrderedHash related stuff
| | * | | | | Refactored the OrderedHash related stuffRaghunadh2012-02-091-2/+1
| | | |_|/ / | | |/| | |
| * / | | | moving ordered hash to normal hash because ruby 1.9.3 hash defaultly ordered oneKarunakar (Ruby)2012-02-091-5/+5
| |/ / / /
| * | | | PostgreSQL does not work in the same way of the other adaptersRafael Mendonça França2012-02-081-3/+7
| | | | |
| * | | | AR::Relation#pluck: improve to work with joinsBogdan Gusiev2012-02-082-0/+14
| | | | |
| * | | | Fix attribute_before_type_cast for serialized attributes. Fixes #4837.Jon Leighton2012-02-073-0/+25
| | | | |
* | | | | fixing the list of cached columnsAaron Patterson2012-02-091-1/+3
| | | | |
* | | | | only exclude serialized columns from cacheable columnsAaron Patterson2012-02-092-2/+6
| | | | |
* | | | | removed unnecessary translator objectAaron Patterson2012-02-082-44/+0
| | | | |