aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Fix warning: assigned but unused variablekennyj2012-03-011-3/+0
| |_|/ |/| |
* | | Merge pull request #5212 from MarkMT/masterXavier Noria2012-02-281-8/+19
|\ \ \ | | | | | | | | update_only documentation for accepts_nested_attributes_for
| * | | Modified comments explaining what the update_only option does.Mark2012-02-281-8/+19
| | | |
* | | | Merge pull request #5196 from lest/patch-3José Valim2012-02-282-0/+14
|\ \ \ \ | |_|/ / |/| | | force datetime attributes to be changed, fix GH #3965
| * | | force datetime attributes to be changed, fix GH #3965Sergey Nartimov2012-02-282-0/+14
| | | |
* | | | Merge pull request #5197 from lest/patch-4José Valim2012-02-271-6/+0
|\ \ \ \ | |_|/ / |/| | | remove unnecessary code
| * | | remove unnecessary codeSergey Nartimov2012-02-281-6/+0
| |/ / | | | | | | | | | | | | it was added in 36129f21b86db4bd69e932e586129e246c2a5ca8 but isn't useful anymore as corresponding tests pass without it
* | | Revert "only mutate the scope object in the `bind` method"Aaron Patterson2012-02-271-1/+1
| | | | | | | | | | | | This reverts commit 1b9e19cd22f2b5d5e7b82e042f92340822c0f966.
* | | only mutate the scope object in the `bind` methodAaron Patterson2012-02-271-1/+1
| | |
* | | bind value creation refactoringAaron Patterson2012-02-271-4/+10
|/ /
* | removing dead codeAaron Patterson2012-02-271-3/+2
| |
* | use bind values for join columnsAaron Patterson2012-02-276-12/+36
| |
* | Merge pull request #5168 from kennyj/fix_5152Aaron Patterson2012-02-272-1/+6
|\ \ | | | | | | [PostgreSQL] Remove NULLS FIRST/LAST. Closes #5152
| * | Remove NULLS FIRST/LAST. closes #5152kennyj2012-02-252-1/+6
| | |
* | | Merge pull request #5173 from kennyj/fix_3931-2Aaron Patterson2012-02-273-12/+23
|\ \ \ | | | | | | | | Fix type_to_sql with text and limit on mysql/mysql2. Fix GH #3931 (Try again).
| * | | Fix type_to_sql with text and limit on mysql/mysql2. Fix GH #3931.kennyj2012-02-263-12/+23
| | | |
* | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-02-252-3/+4
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Conflicts: actionmailer/CHANGELOG.md
| * | | Fixed typo in composed_of example with Money#<=>, was comparing amount ↵Noah Hendrix2012-02-241-1/+1
| | | | | | | | | | | | | | | | itself instead of other_money.amount
| * | | Revert "Remove meaningless code from the examples" of AutosaveAssociation Dimitar Dimitrov2012-02-221-0/+3
| | | | | | | | | | | | Reverts a part of 91148936f770dc8bbbb33d46a09528f1a32d8a71. Should probably be squashed with it when merging back in rails/rails.
| * | | Minor fixes to ActiveRecord::AutosaveAssociation's docs Dimitar Dimitrov2012-02-221-5/+3
| | | | | | | | | | | | | | | | * Fix typos * Remove meaningless code from the examples
* | | | Update changelogs with rails 3.0-stable branch infoPaco Guzman2012-02-251-3/+85
| |/ / |/| |
* | | use regular ruby for fewer method calls. we do not need :gift:s!Aaron Patterson2012-02-241-1/+4
| | |
* | | removes verify_active_connections!Xavier Noria2012-02-242-16/+1
| | | | | | | | | | | | | | | | | | | | | The method verify_active_connections! was used in the old days (up to 2.1 I think) by the dispatcher to verify the connections, but nowadays we do that in a different way and this method is obsolete.
* | | Update with new task names for building mysql and postgresql databasesMichael Guterl2012-02-231-1/+1
| | |
* | | Remove unused implementation of next_migration_numberMarcelo Silveira2012-02-232-17/+0
| | |
* | | bumping up arelAaron Patterson2012-02-211-1/+1
| | |
* | | prepared statements can be disabledAaron Patterson2012-02-218-30/+56
| | |
* | | more ruby 2.0 respond_to? changesAaron Patterson2012-02-211-1/+1
| | |
* | | tag bind params with a bind param objectAaron Patterson2012-02-203-3/+3
| | |
* | | removed commented line. 3434 tests, 10531 assertions, 0 failures, 0 errors, ↵William Lawson2012-02-201-1/+0
| | | | | | | | | | | | 31 skips
* | | Restored ability to identify ID and Sequence from tables relying on a ↵William Lawson2012-02-202-19/+44
| | | | | | | | | | | | nonmatching sequence default value for PK.
* | | Update activerecord/CHANGELOG.mdJosef Šimánek2012-02-181-1/+1
|/ /
* | Correctly print names of non-timestamped migrations with db:migrate:statusPeter Mitchell2012-02-171-2/+3
| |
* | use Process.pid rather than $$Aaron Patterson2012-02-163-7/+7
| |
* | database connections are automatically established after forking.Aaron Patterson2012-02-163-14/+73
| | | | | | | | Connection pools are 1:1 with pids.
* | Merge pull request #5064 from lest/patch-1Jeremy Kemper2012-02-163-6/+19
|\ \ | | | | | | move id_before_type_cast to PrimaryKey module
| * | move id_before_type_cast to PrimaryKey moduleSergey Nartimov2012-02-163-6/+19
| | |
* | | Autoload various constants effectively in abstract connection adapter.Waseem Ahmad2012-02-161-9/+12
|/ /
* | Revert "No need to pass options which is never used"Rafael Mendonça França2012-02-151-2/+2
| | | | | | | | | | | | | | | | | | Options is needed for some Rails extensions to determine when referential integrity should be disabled This reverts commit bcb466c543451dce69403aaae047295758589d8e. Fixes #5052
* | Merge pull request #3544 from amatsuda/_field_changedAaron Patterson2012-02-143-4/+18
|\ \ | | | | | | Rename field_changed? to _field_changed? so that users can create a field named field
| * | A test case for GH #3544 to ensure that a field named field works fineAkira Matsuda2012-02-141-0/+14
| | |
| * | Rename field_changed? to _field_changed? so that users can create a field ↵Akira Matsuda2012-02-142-4/+4
| | | | | | | | | | | | named field
* | | Always reenable _dump task in AR databases rake. Closes #5030Carlos Antonio da Silva2012-02-141-1/+4
| | | | | | | | | | | | | | | | | | | | | This allows the internal :_dump task to be called as many times as required. For instance, `rake db:migrate:redo` calls two tasks that internally call :_dump, and without reenabling it to be reinvoked, the database was left in incorrect state.
* | | 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.