aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
Commit message (Collapse)AuthorAgeFilesLines
* make active_connection? return true only if there is an open connection in ↵Aaron Patterson2012-03-081-7/+4
| | | | use for the current thread. fixes #5330
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-03-091-2/+2
|\
| * Fix doc examples for has_and_belongs_to_many associationBraden Schaeffer2012-03-051-2/+2
| |
* | Merge pull request #5289 from rafaelfranca/fix-through-associationsJon Leighton2012-03-082-4/+10
|\ \ | | | | | | Fix has_many through associations when mass_assignment_sanitizer is strict
| * | Not need to pass join attributes to association buildRafael Mendonça França2012-03-072-4/+10
| | |
* | | Merge pull request #5162 from kennyj/schema_cache_dumpAaron Patterson2012-03-074-17/+88
|\ \ \ | | | | | | | | [Proposal] Schema cache dump
| * | | Support judgement expired schema cache dump.kennyj2012-03-012-4/+11
| | | |
| * | | Load db/schema_cache.dump duaring boot time.kennyj2012-03-013-2/+18
| | | |
| * | | Add db:schema:cache:dump and db:schema:cache:clear tasks.kennyj2012-03-012-0/+28
| | | |
| * | | Add support schema cache dump and load.kennyj2012-03-011-14/+34
| | | |
* | | | Merge pull request #5315 from ↵Aaron Patterson2012-03-071-0/+21
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | travisjeffery/enhance_postgresql_adapter_schema_support Enhance PostgreSQL Adapter schema support
| * | | | Adds #create/drop_schema on the PostgreSQL Adapter.Travis Jeffery2012-03-071-0/+10
| | | | |
| * | | | Add #schema_names to PostgreSQL Adapter.Travis Jeffery2012-03-071-0/+11
| | | | |
* | | | | Merge pull request #5316 from Jacobkg/masterJosé Valim2012-03-071-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Update ActiveRecord::AttributeMethods#attribute_present? to return false for empty strings
| * | | | | attribute_present? should return false for empty stringsJacob Green2012-03-061-1/+1
| | | | | |
* | | | | | Merge pull request #5305 from arunagw/warning_fixVijay Dev2012-03-071-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | warning fix : mismatched indentations at 'end' with 'case'
| * | | | | warning fix : mismatched indentations at 'end' with 'case'Arun Agrawal2012-03-061-1/+1
| | |_|/ / | |/| | |
* | | | | Clean up module docs [ci skip]Vijay Dev2012-03-071-1/+1
| | | | | | | | | | | | | | | | | | | | Removed some useless docstrings and no-doc'ed some.
* | | | | Revert table_name= needs connection now, so just stub table_namekennyj2012-03-071-1/+1
|/ / / /
* | | | Fix #5069 - Protect foreign key from mass assignment throught association ↵Jean Boussier2012-03-051-1/+2
| | | | | | | | | | | | | | | | builder
* | | | 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
| | |