aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge pull request #10098 from subwindow/postgres_dump_bigint_defaultRafael Mendonça França2013-04-054-1/+12
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | Correctly parse bigint defaults in PostgreSQL Conflicts: activerecord/CHANGELOG.md
| * | | Correctly parse bigint defaults in PostgreSQLErik Peterson2013-04-054-1/+12
| | | |
* | | | Move changelog to the top [ci skip]Carlos Antonio da Silva2013-04-051-17/+17
| | | |
* | | | Fix indent and remove extra white spacesCarlos Antonio da Silva2013-04-051-15/+17
| | | |
* | | | Merge pull request #9996 from mikz/masterJon Leighton2013-04-053-0/+34
|\ \ \ \ | | | | | | | | | | Association with inverse_of does not set the parent in association building block
| * | | | fix inverse_of association in block of new childMichal Cichra2013-04-013-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes inconsistency when building children of association which has inverse_of set properly. When creating new association object with a block: parent.association.build do |child| child.parent.equal?(parent) # false end So the block the `child.parent` did not point to the same object. But when the object is created it points to same instance: child = parent.association.build child.parent.equal?(parent) # true
* | | | | Merge pull request #10058 from jamesgolick/masterJon Leighton2013-04-052-5/+3
|\ \ \ \ \ | | | | | | | | | | | | Avoid calling define_method in CollectionProxy#scope
| * | | | | Refactor CollectionProxy#scope to avoid calling #extend.James Golick2013-04-022-5/+3
| | | | | |
* | | | | | Fix scope chaining + STIJon Leighton2013-04-054-11/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See #9869 and #9929. The problem arises from the following example: class Project < ActiveRecord::Base scope :completed, -> { where completed: true } end class MajorProject < Project end When calling: MajorProject.where(tasks_count: 10).completed This expands to: MajorProject.where(tasks_count: 10).scoping { MajorProject.completed } However the lambda for the `completed` scope is defined on Project. This means that when it is called, `self` is Project rather than MajorProject. So it expands to: MajorProject.where(tasks_count: 10).scoping { Project.where(completed: true) } Since the scoping was applied on MajorProject, and not Project, this fails to apply the tasks_count condition. The solution is to make scoping apply across STI classes. I am slightly concerned about the possible side-effects of this, but no tests fail and it seems ok. I guess we'll see.
* | | | | | failing test for #9869Neeraj Singh2013-04-052-0/+6
| | | | | |
* | | | | | Merge pull request #10102 from xxxcaqui/masterCarlos Antonio da Silva2013-04-051-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Sort modules in active_record.rb
| * | | | | | Sort modules in alphabetical order.Shunsuke Osa2013-04-051-2/+2
| | |_|/ / / | |/| | | |
* / | | | | Improve `belongs_to touch: true` timestamp testAndrew White2013-04-051-7/+21
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Round off time to a whole second value to compensate for databases that don't support fractional timestamps. Also add a assertion to check that the old record is touched when the association is cleared.
* | | | | Avoid an attempt to fetch old record when id was not present in touch callbackCarlos Antonio da Silva2013-04-041-7/+7
| | | | |
* | | | | Use the correct pk field from the reflected class to find the old recordCarlos Antonio da Silva2013-04-041-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The implementation was using the source class foreign key field instead of the reflected primary key one to find the old record. For instance, for this scenario class Bulb < ActiveRecord::Base belongs_to :car, :touch => true end class Car < ActiveRecord::Base has_many :bulbs end the current implementation was trying to do this query: Car.where(car_id: X).first where we should be doing this query: Car.where(id: X).first This should hopefully fix the build.
* | | | | Refactor mail_to to not generate intermediate hashes when adding hrefCarlos Antonio da Silva2013-04-041-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's no need to use Hash#merge with a new hash just for setting the href option to pass it through. Since we're always dealing with a new html_options hash, we're free to just set the value instead.
* | | | | Ensure mail_to helper does not modify the given html options hashCarlos Antonio da Silva2013-04-042-4/+10
| | | | |
* | | | | Merge pull request #10065 from spohlenz/mail_to_blockCarlos Antonio da Silva2013-04-043-5/+30
|\ \ \ \ \ | | | | | | | | | | | | Add block support for the mail_to helper
| * | | | | Add block support for the helperSam Pohlenz2013-04-033-5/+30
| | | | | |
* | | | | | Merge pull request #10092 from amco/masterCarlos Antonio da Silva2013-04-041-10/+16
|\ \ \ \ \ \ | | | | | | | | | | | | | | Model generator USAGE doc improvement
| * | | | | | Model generator USAGE doc improvedJason King2013-04-041-10/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Added information about syntax for precision/scale of decimals * Removed incorrect information about being able to set `default` * Added more examples of usage
* | | | | | | Use inspect when writing the foreign key from the reflectionAndrew White2013-04-052-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we don't use inspect inside the class_eval block then the foreign key is written without quotes causing us to fetch the foreign key value and not the column name.
* | | | | | | Use a space after the comment sign when showing the result of commandsCarlos Antonio da Silva2013-04-041-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://guides.rubyonrails.org/api_documentation_guidelines.html#example-code [ci skip]
* | | | | | | Merge pull request #10094 from neerajdotname/fix2Carlos Antonio da Silva2013-04-044-5/+23
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Collection of small fixes. Check individual commits for background.
| * | | | | | | template should have generic nameNeeraj Singh2013-04-042-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | since users just copy and paste and the class name is never changed
| * | | | | | | use | to have more intent revealing codeNeeraj Singh2013-04-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | thanks to @egilburg for suggestion
| * | | | | | | expanded rdoc for chain and reflection_namesNeeraj Singh2013-04-041-2/+20
| | | | | | | |
* | | | | | | | Merge pull request #10095 from frodsan/exclude_template_filesCarlos Antonio da Silva2013-04-041-1/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Exclude template files for rdoc API [ci skip]
| * | | | | | | | Exclude template files for rdoc API [ci skip]Francesco Rodriguez2013-04-041-1/+2
|/ / / / / / / /
* | | | | | | | Revert "Merge pull request #10034 from ↵Rafael Mendonça França2013-04-043-33/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | benofsky/fix_skipping_object_callback_filters" This reverts commit c79c6980647eb76bfa52178711fb04ba7e9d403b, reversing changes made to ba4c27479add60b783a0e623c8a5d176c1dc9043. This broke all the tests. See https://travis-ci.org/rails/rails/builds/6061839
* | | | | | | | stop depending on callbacksAaron Patterson2013-04-041-6/+12
| | | | | | | |
* | | | | | | | Merge pull request #10034 from benofsky/fix_skipping_object_callback_filtersRafael Mendonça França2013-04-043-1/+33
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Fixes skipping object callback filters
| * | | | | | | Fixes skipping object callback filtersBen McRedmond2013-04-043-1/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows you to skip callbacks that are defined by objects, e.g. for `ActionController`: skip_after_filter MySpecialFilter Previously this didn't work due to a bug in how Rails compared callbacks in `Callback#matches?`. When a callback is compiled, if it's an object filter (i.e. not a method, proc, etc.), `Callback` now defines a method on `@klass` that is derived from the class name rather than `@callback_id`. So, when `skip_callback` tries to find the appropriate callback to remove, `Callback` can regenerate the method name for the filter object and return the correct value for `Callback#matches?`.
* | | | | | | | Merge pull request #10087 from neerajdotname/10016Carlos Antonio da Silva2013-04-047-3/+26
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | has_many through obeys order on through association
| * | | | | | | | has_many through obeys order on through associationNeeraj Singh2013-04-047-3/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes #10016
* | | | | | | | | Merge pull request #10090 from vipulnsward/fix_private_warnSteve Klabnik2013-04-042-3/+6
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | fix private attribute warning
| * | | | | | | | fix private attribute warningVipul A M2013-04-042-3/+6
| | | | | | | | |
* | | | | | | | | Further simplify enumerable group_by testCarlos Antonio da Silva2013-04-041-3/+1
| | | | | | | | |
* | | | | | | | | Merge pull request #10076 from choudhuryanupam/masterRafael Mendonça França2013-04-041-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Removed unused comma after loop variable
| * | | | | | | | | Replaced inject with mapAnupam Choudhury2013-04-041-2/+2
| | | | | | | | | |
| * | | | | | | | | Removed unused comma after loop variableAnupam Choudhury2013-04-041-1/+1
| |/ / / / / / / /
* | | | | | | | | Merge pull request #10088 from neerajdotname/fixes1Rafael Mendonça França2013-04-043-5/+15
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | minor fixes including variable name change and expanded rdoc
| * | | | | | | | expanded rdoc on source_reflection methodNeeraj Singh2013-04-041-0/+10
| | | | | | | | |
| * | | | | | | | show name of the klass that has missing associationNeeraj Singh2013-04-021-1/+1
| | | | | | | | |
| * | | | | | | | not a relation. it's an arel select managerNeeraj Singh2013-04-021-4/+4
| | | | | | | | |
* | | | | | | | | Merge pull request #10082 from vipulnsward/fix_railties_test-v2Steve Klabnik2013-04-031-3/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | fix warnings in railties test
| * | | | | | | | | fix warnings in railties testVipul A M2013-04-041-3/+3
|/ / / / / / / / /
* | | | | | | | | Fix typo in view nameCarlos Antonio da Silva2013-04-032-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduced in 2c22376fe04b89e8f34620139720b85a85ce3428
* | | | | | | | | Merge pull request #10080 from vipulnsward/railties_warning_fix_v2Steve Klabnik2013-04-032-1/+2
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | add require to suppress warning; remove variable
| * | | | | | | | add require to suppress warning; remove variableVipul A M2013-04-042-1/+2
| | | | | | | | |