aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
Commit message (Collapse)AuthorAgeFilesLines
* Allow translations of activerecord.errors.messages.record_invalid to be ↵Christopher Dell2012-03-051-1/+1
| | | | looked up in errors.messages.record_invalid
* Merge pull request #5268 from carlosantoniodasilva/ar-new-record-warningJon Leighton2012-03-042-1/+1
|\ | | | | Fix ActiveRecord warning in tests with Marshal
| * Initialize @stale_state to nil in associationCarlos Antonio da Silva2012-03-042-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | This apparently fix the warning related to @new_record variable not being initialized in AR's test suit, when an association is built and the object is marshalled/loaded. See these tests in AR's base_test.rb: test_marshalling_with_associations test_marshalling_new_record_round_trip_with_associations Closes #3720.
* | tidy up formattingJon Leighton2012-03-041-10/+11
| |
* | Merge pull request #5267 from kennyj/fix_4674Jon Leighton2012-03-041-5/+14
|\ \ | | | | | | Fix GH #4674. Reset column information and sequence name when setting table_name.
| * | Don't clear sequence name when we explicitly assign it.kennyj2012-03-041-2/+4
| | |
| * | Fix GH #4674. Reset column information and sequence name when setting ↵kennyj2012-03-041-4/+11
| | | | | | | | | | | | table_name.
* | | Fix GH #3163. Should quote database on mysql/mysql2.kennyj2012-03-051-1/+1
|/ /
* / Remove unusused variablesJon Leighton2012-03-043-14/+9
|/
* Merge pull request #5255 from carlosantoniodasilva/active-record-reviewPiotr Sarnacki2012-03-038-68/+77
|\ | | | | Refactor and cleanup in some ActiveRecord modules
| * Refactor and cleanup in some ActiveRecord modulesCarlos Antonio da Silva2012-03-038-68/+77
| | | | | | | | | | | | | | | | | | | | | | * Avoid double hash lookups in AR::Reflection when reflecting associations/aggregations * Minor cleanups: use elsif, do..end, if..else instead of unless..else * Simplify DynamicMatchers#respond_to? * Use "where" instead of scoped with conditions hash * Extract `scoped_by` method pattern regexp to constant * Extract noisy class_eval from method_missing in dynamic matchers * Extract readonly check, avoid calling column#to_s twice in persistence * Refactor predicate builder, remove some variables
* | Merge pull request #4984 from raghunadhd/change_orderhashVijay Dev2012-03-032-2/+2
|\ \ | | | | | | Refactored code
| * | Refactored codeRaghunadh2012-02-102-2/+2
| | |
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-03-031-0/+3
|\ \ \ | |_|/ |/| |
| * | Add documentation for IndexDefinition.Waseem Ahmad2012-03-021-0/+3
| | |
* | | only log an error if there is a logger. fixes #5226Aaron Patterson2012-03-022-2/+2
| | |
* | | revert setting NOT NULL constraints in add_timestampsXavier Noria2012-03-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 3dbedd2 added NOT NULL constraints both to table creation and modification. For creation the new default makes sense, but the generic situation for changing a table is that there exist records. Those records have no creation or modification timestamps, and in the general case you don't even know them, so when updating a table these constraints are not going to work. See a bug report for this use case in #3334.
* | | 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-281-0/+1
|\ \ \ \ | |_|/ / |/| | | force datetime attributes to be changed, fix GH #3965
| * | | force datetime attributes to be changed, fix GH #3965Sergey Nartimov2012-02-281-0/+1
| | | |
* | | | 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-271-1/+1
|\ \ | | | | | | [PostgreSQL] Remove NULLS FIRST/LAST. Closes #5152
| * | Remove NULLS FIRST/LAST. closes #5152kennyj2012-02-251-1/+1
| | |
* | | Merge pull request #5173 from kennyj/fix_3931-2Aaron Patterson2012-02-271-9/+20
|\ \ \ | | | | | | | | 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-261-9/+20
| |/ /
* | | 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
* | | 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.
* | | Remove unused implementation of next_migration_numberMarcelo Silveira2012-02-232-17/+0
| | |
* | | 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-201-16/+37
|/ / | | | | | | nonmatching sequence default value for PK.
* | 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-162-14/+52
| | | | | | | | Connection pools are 1:1 with pids.
* | Merge pull request #5064 from lest/patch-1Jeremy Kemper2012-02-162-6/+11
|\ \ | | | | | | move id_before_type_cast to PrimaryKey module
| * | move id_before_type_cast to PrimaryKey moduleSergey Nartimov2012-02-162-6/+11
| | |
* | | Autoload various constants effectively in abstract connection adapter.Waseem Ahmad2012-02-161-9/+12
|/ /