aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge pull request #399 from ernie/join_conditions_on_joinJon Leighton2011-05-051-3/+3
|\ \ \ | | | | | | | | Add association join conditions to JOIN clause, not WHERE
| * | | Add join conditions to JOIN clause, not WHEREErnie Miller2011-05-051-3/+3
| |/ /
* | | Merge pull request #358 from baroquebobcat/fix_find_or_create_masterAaron Patterson2011-05-051-3/+6
|\ \ \ | |/ / |/| | Fix for lighthouse #6741
| * | Fix for lighthouse #6741Nick Howard2011-05-011-3/+6
| | | | | | | | | | | | | | | | | | | | | - adds tests for find_or_create_by and find_or_initialize_by on has_many associations - changes the behavior of ActiveRecord::Associations::CollectionProxy#method_missing to differ to ActiveRecord::FinderMethods#find_or_instantiator_by_attributes for arg processing and saving so find_or_create_by's api on associations will be consistent w/ the api for model classes.
* | | Prepare for beta1David Heinemeier Hansson2011-05-041-1/+1
| | |
* | | ensure query cache is cleared when Rack body is closed, fixes bug reported ↵Aaron Patterson2011-05-041-0/+1
| |/ |/| | | | | on 951e18abea9c116fc5d6b330ca1dcd2890abe006
* | Move sandbox to AR and pass the sandbox as a value. This way, other ORMs ↵José Valim2011-05-042-1/+8
| | | | | | | | like Datamapper can also have their own sandboxing in rails console.
* | 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 ↵Josh Kalderimis2011-05-031-2/+17
| | | | | | | | | | | | failures
* | | make sure IM repository is cleared after body is closedAaron Patterson2011-05-031-0/+1
| | |
* | | proxying the body in the IM middleware so that IM is available for streaming ERbAaron Patterson2011-05-031-3/+21
| | |
* | | 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-022-3/+32
| | |
* | | Make the identity map use the instrumentation infrastructure so we can style ↵David Heinemeier Hansson2011-05-012-6/+18
| | | | | | | | | | | | the messages nicely with colors (FIXME: Can someone look into why the test is not working?)
* | | Remove schema noise from logging (TODO: Deprecate/remove the name attribute ↵David Heinemeier Hansson2011-05-011-4/+4
| | | | | | | | | | | | to all these methods -- will take a pull request!)
* | | Merge pull request #357 from joshk/assign_attributes.David Heinemeier Hansson2011-05-014-25/+48
|\ \ \ | | | | | | | | Assign protected attributes with create/new and control the role.
| * | | singular and collection relations in AR can now specify mass-assignment ↵Josh Kalderimis2011-05-013-20/+20
| | | | | | | | | | | | | | | | security options (:as and :without_protection) in build, create and create! methods.
| * | | Added mass-assignment security :as and :without_protection support to AR.new ↵Josh Kalderimis2011-05-011-5/+28
| | |/ | |/| | | | | | | and AR.create
* | | Merge pull request #340 from joshk/default_scope_changes.David Heinemeier Hansson2011-05-011-36/+17
|\ \ \ | |/ / |/| | removed the default_scope deprecations and updated the docs and tests to
| * | removed the default_scope deprecations and updated the docs and tests to ↵Josh Kalderimis2011-04-281-36/+17
| | | | | | | | | | | | reflect its use cases
* | | Merge pull request #316 from arunagw/jdbc_postgresql.Aaron Patterson2011-05-011-83/+83
|\ \ \ | |_|/ |/| | Re-factored database.rake to allow Jdbcpostgresql. #jruby
| * | 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
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: railties/guides/source/contributing_to_ruby_on_rails.textile
| * \ \ 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
| | | | |
| | * | | Make this docs more consistent with the rest of the docs presentSebastian Martinez2011-04-223-4/+6
| | | | |
| | * | | dot missing hereSebastian Martinez2011-04-221-1/+1
| | | | |
| | * | | Added doc for #table_exists?Sebastian Martinez2011-04-221-0/+4
| | | | |
| | * | | Added docs for #rename_table on some adaptersSebastian Martinez2011-04-223-0/+11
| | | | |
| | * | | Added docs for #columns on some adaptersSebastian Martinez2011-04-222-0/+2
| | | | |
| | * | | Merge branch 'master' of git://github.com/rails/railsXavier Noria2011-04-237-49/+49
| | |\ \ \
| | * | | | Added docs for #indexes on adaptersSebastian Martinez2011-04-223-1/+3
| | | | | |
* | | | | | using bind parameters for updatesAaron Patterson2011-04-306-5/+16
| | | | | |
* | | | | | make sure we flatten the fixture path listAaron Patterson2011-04-291-1/+1
| | | | | |
* | | | | | shorten up our fixture path resolving codeAaron Patterson2011-04-291-2/+2
| | | | | |