aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #396 from asanghi/lh_4346Xavier Noria2011-05-062-29/+187
|\
| * Multiparameter POLA, time_select fixes. See LH4346Aditya Sanghi2011-05-052-29/+187
* | Update CHANGELOGs.José Valim2011-05-061-19/+16
* | Merge pull request #399 from ernie/join_conditions_on_joinJon Leighton2011-05-052-3/+14
|\ \
| * | Add a test for outer joins with conditions where value IS NULLErnie Miller2011-05-051-0/+5
| * | Add join conditions to JOIN clause, not WHEREErnie Miller2011-05-052-3/+9
| |/
* | Merge pull request #358 from baroquebobcat/fix_find_or_create_masterAaron Patterson2011-05-052-3/+30
|\ \ | |/ |/|
| * Fix for lighthouse #6741Nick Howard2011-05-012-3/+30
* | Prepare for beta1David Heinemeier Hansson2011-05-041-1/+1
* | ensure query cache is cleared when Rack body is closed, fixes bug reported on...Aaron Patterson2011-05-042-0/+12
* | Bump up rack-cache, tzinfo and thorSantiago Pastorino2011-05-041-1/+1
* | Move sandbox to AR and pass the sandbox as a value. This way, other ORMs like...José Valim2011-05-042-1/+8
* | Remove defined?(ActiveRecord) and use the railtie hook instead.José Valim2011-05-041-3/+4
* | Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-05-045-33/+41
|\ \
| * | Remove extra whitespacesSebastian Martinez2011-05-031-9/+9
| * | Improves Mysql2 adapter docsSebastian Martinez2011-05-031-0/+6
| * | Added #recreate_database docsSebastian Martinez2011-05-031-0/+2
| * | Fixes on schema_definitions docsSebastian Martinez2011-05-031-3/+3
| * | fixed-fonts on SchemaDefinitionsSebastian Martinez2011-05-021-3/+3
| * | Remove extra whitespacesSebastian Martinez2011-05-021-18/+18
* | | added the mysql schema test to mysql2 adapter, and fixed the corresponding fa...Josh Kalderimis2011-05-033-3/+54
* | | make sure IM repository is cleared after body is closedAaron Patterson2011-05-032-0/+12
* | | proxying the body in the IM middleware so that IM is available for streaming ERbAaron Patterson2011-05-032-3/+47
* | | adding a test case for the identity map middlewareAaron Patterson2011-05-031-0/+34
* | | favor collect over each in mysql* adaptersJosh Kalderimis2011-05-032-8/+4
* | | introduce a body proxy to ensure that query cache is enabled during streamingAaron Patterson2011-05-023-3/+58
* | | more tests around cachingAaron Patterson2011-05-021-1/+10
* | | add a couple test cases surrounding query cache middlewareAaron Patterson2011-05-021-0/+18
* | | Fix failing AR test.José Valim2011-05-022-17/+12
* | | Make the identity map use the instrumentation infrastructure so we can style ...David Heinemeier Hansson2011-05-013-10/+31
* | | Remove schema noise from logging (TODO: Deprecate/remove the name attribute t...David Heinemeier Hansson2011-05-011-4/+4
* | | Merge pull request #357 from joshk/assign_attributes.David Heinemeier Hansson2011-05-017-64/+464
|\ \ \
| * | | singular and collection relations in AR can now specify mass-assignment secur...Josh Kalderimis2011-05-016-59/+346
| * | | Added mass-assignment security :as and :without_protection support to AR.new ...Josh Kalderimis2011-05-012-29/+142
| | |/ | |/|
* | | Merge pull request #340 from joshk/default_scope_changes.David Heinemeier Hansson2011-05-013-56/+41
|\ \ \ | |/ / |/| |
| * | removed the default_scope deprecations and updated the docs and tests to refl...Josh Kalderimis2011-04-283-56/+41
* | | assert_difference can take a callable piece of code rather than just evaling ...Aaron Patterson2011-05-011-4/+4
* | | Merge pull request #316 from arunagw/jdbc_postgresql.Aaron Patterson2011-05-011-83/+83
|\ \ \ | |_|/ |/| |
| * | Minor fixes in databases.rake Arun Agrawal2011-04-271-71/+71
| * | Allowing jdbcsqlite3 to drop database, clone structure. #jrubyArun Agrawal2011-04-271-7/+7
| * | Re-factored database.rake to allow Jdbcpostgresql. #jrubyArun Agrawal2011-04-271-5/+5
* | | Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-05-018-24/+65
|\ \ \
| * \ \ Merge branch 'master' of github.com:lifo/docrailsDan Pickett2011-04-298-24/+65
| |\ \ \
| | * | | Better formatting hereSebastian Martinez2011-04-241-3/+3
| | * | | Added missing docs to mysql2_adapterSebastian Martinez2011-04-221-0/+13
| | * | | Fixed punctuation errors.Sebastian Martinez2011-04-221-4/+4
| | * | | Better docs formattingSebastian Martinez2011-04-221-10/+11
| | * | | Fix #postgresql_version docsSebastian Martinez2011-04-221-1/+1
| | * | | Added docs for #version on mysql_adapterSebastian Martinez2011-04-221-0/+1
| | * | | Added some docs on SQLite adapterSebastian Martinez2011-04-221-0/+5