Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #399 from ernie/join_conditions_on_join | Jon Leighton | 2011-05-05 | 1 | -3/+3 |
|\ | | | | | Add association join conditions to JOIN clause, not WHERE | ||||
| * | Add join conditions to JOIN clause, not WHERE | Ernie Miller | 2011-05-05 | 1 | -3/+3 |
| | | |||||
* | | Merge pull request #358 from baroquebobcat/fix_find_or_create_master | Aaron Patterson | 2011-05-05 | 1 | -3/+6 |
|\ \ | |/ |/| | Fix for lighthouse #6741 | ||||
| * | Fix for lighthouse #6741 | Nick Howard | 2011-05-01 | 1 | -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 beta1 | David Heinemeier Hansson | 2011-05-04 | 1 | -1/+1 |
| | | |||||
* | | ensure query cache is cleared when Rack body is closed, fixes bug reported ↵ | Aaron Patterson | 2011-05-04 | 1 | -0/+1 |
| | | | | | | | | on 951e18abea9c116fc5d6b330ca1dcd2890abe006 | ||||
* | | Move sandbox to AR and pass the sandbox as a value. This way, other ORMs ↵ | José Valim | 2011-05-04 | 2 | -1/+8 |
| | | | | | | | | like Datamapper can also have their own sandboxing in rails console. | ||||
* | | Remove defined?(ActiveRecord) and use the railtie hook instead. | José Valim | 2011-05-04 | 1 | -3/+4 |
| | | |||||
* | | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-05-04 | 5 | -33/+41 |
|\ \ | |||||
| * | | Remove extra whitespaces | Sebastian Martinez | 2011-05-03 | 1 | -9/+9 |
| | | | |||||
| * | | Improves Mysql2 adapter docs | Sebastian Martinez | 2011-05-03 | 1 | -0/+6 |
| | | | |||||
| * | | Added #recreate_database docs | Sebastian Martinez | 2011-05-03 | 1 | -0/+2 |
| | | | |||||
| * | | Fixes on schema_definitions docs | Sebastian Martinez | 2011-05-03 | 1 | -3/+3 |
| | | | |||||
| * | | fixed-fonts on SchemaDefinitions | Sebastian Martinez | 2011-05-02 | 1 | -3/+3 |
| | | | |||||
| * | | Remove extra whitespaces | Sebastian Martinez | 2011-05-02 | 1 | -18/+18 |
| | | | |||||
* | | | added the mysql schema test to mysql2 adapter, and fixed the corresponding ↵ | Josh Kalderimis | 2011-05-03 | 1 | -2/+17 |
| | | | | | | | | | | | | failures | ||||
* | | | make sure IM repository is cleared after body is closed | Aaron Patterson | 2011-05-03 | 1 | -0/+1 |
| | | | |||||
* | | | proxying the body in the IM middleware so that IM is available for streaming ERb | Aaron Patterson | 2011-05-03 | 1 | -3/+21 |
| | | | |||||
* | | | favor collect over each in mysql* adapters | Josh Kalderimis | 2011-05-03 | 2 | -8/+4 |
| | | | |||||
* | | | introduce a body proxy to ensure that query cache is enabled during streaming | Aaron Patterson | 2011-05-02 | 2 | -3/+32 |
| | | | |||||
* | | | Make the identity map use the instrumentation infrastructure so we can style ↵ | David Heinemeier Hansson | 2011-05-01 | 2 | -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 Hansson | 2011-05-01 | 1 | -4/+4 |
| | | | | | | | | | | | | to all these methods -- will take a pull request!) | ||||
* | | | Merge pull request #357 from joshk/assign_attributes. | David Heinemeier Hansson | 2011-05-01 | 4 | -25/+48 |
|\ \ \ | | | | | | | | | Assign protected attributes with create/new and control the role. | ||||
| * | | | singular and collection relations in AR can now specify mass-assignment ↵ | Josh Kalderimis | 2011-05-01 | 3 | -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 Kalderimis | 2011-05-01 | 1 | -5/+28 |
| | |/ | |/| | | | | | | | and AR.create | ||||
* | | | Merge pull request #340 from joshk/default_scope_changes. | David Heinemeier Hansson | 2011-05-01 | 1 | -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 Kalderimis | 2011-04-28 | 1 | -36/+17 |
| | | | | | | | | | | | | reflect its use cases | ||||
* | | | Merge pull request #316 from arunagw/jdbc_postgresql. | Aaron Patterson | 2011-05-01 | 1 | -83/+83 |
|\ \ \ | |_|/ |/| | | Re-factored database.rake to allow Jdbcpostgresql. #jruby | ||||
| * | | Minor fixes in databases.rake | Arun Agrawal | 2011-04-27 | 1 | -71/+71 |
| | | | |||||
| * | | Allowing jdbcsqlite3 to drop database, clone structure. #jruby | Arun Agrawal | 2011-04-27 | 1 | -7/+7 |
| | | | |||||
| * | | Re-factored database.rake to allow Jdbcpostgresql. #jruby | Arun Agrawal | 2011-04-27 | 1 | -5/+5 |
| | | | |||||
* | | | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-05-01 | 8 | -24/+65 |
|\ \ \ | | | | | | | | | | | | | | | | | Conflicts: railties/guides/source/contributing_to_ruby_on_rails.textile | ||||
| * \ \ | Merge branch 'master' of github.com:lifo/docrails | Dan Pickett | 2011-04-29 | 8 | -24/+65 |
| |\ \ \ | |||||
| | * | | | Better formatting here | Sebastian Martinez | 2011-04-24 | 1 | -3/+3 |
| | | | | | |||||
| | * | | | Added missing docs to mysql2_adapter | Sebastian Martinez | 2011-04-22 | 1 | -0/+13 |
| | | | | | |||||
| | * | | | Fixed punctuation errors. | Sebastian Martinez | 2011-04-22 | 1 | -4/+4 |
| | | | | | |||||
| | * | | | Better docs formatting | Sebastian Martinez | 2011-04-22 | 1 | -10/+11 |
| | | | | | |||||
| | * | | | Fix #postgresql_version docs | Sebastian Martinez | 2011-04-22 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Added docs for #version on mysql_adapter | Sebastian Martinez | 2011-04-22 | 1 | -0/+1 |
| | | | | | |||||
| | * | | | Added some docs on SQLite adapter | Sebastian Martinez | 2011-04-22 | 1 | -0/+5 |
| | | | | | |||||
| | * | | | Make this docs more consistent with the rest of the docs present | Sebastian Martinez | 2011-04-22 | 3 | -4/+6 |
| | | | | | |||||
| | * | | | dot missing here | Sebastian Martinez | 2011-04-22 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Added doc for #table_exists? | Sebastian Martinez | 2011-04-22 | 1 | -0/+4 |
| | | | | | |||||
| | * | | | Added docs for #rename_table on some adapters | Sebastian Martinez | 2011-04-22 | 3 | -0/+11 |
| | | | | | |||||
| | * | | | Added docs for #columns on some adapters | Sebastian Martinez | 2011-04-22 | 2 | -0/+2 |
| | | | | | |||||
| | * | | | Merge branch 'master' of git://github.com/rails/rails | Xavier Noria | 2011-04-23 | 7 | -49/+49 |
| | |\ \ \ | |||||
| | * | | | | Added docs for #indexes on adapters | Sebastian Martinez | 2011-04-22 | 3 | -1/+3 |
| | | | | | | |||||
* | | | | | | using bind parameters for updates | Aaron Patterson | 2011-04-30 | 6 | -5/+16 |
| | | | | | | |||||
* | | | | | | make sure we flatten the fixture path list | Aaron Patterson | 2011-04-29 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | shorten up our fixture path resolving code | Aaron Patterson | 2011-04-29 | 1 | -2/+2 |
| | | | | | |