Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #10098 from subwindow/postgres_dump_bigint_default | Rafael Mendonça França | 2013-04-05 | 4 | -1/+12 |
|\ | | | | | | | | | | | | | Correctly parse bigint defaults in PostgreSQL Conflicts: activerecord/CHANGELOG.md | ||||
| * | Correctly parse bigint defaults in PostgreSQL | Erik Peterson | 2013-04-05 | 4 | -1/+12 |
| | | |||||
* | | Move changelog to the top [ci skip] | Carlos Antonio da Silva | 2013-04-05 | 1 | -17/+17 |
| | | |||||
* | | Merge pull request #9996 from mikz/master | Jon Leighton | 2013-04-05 | 3 | -0/+34 |
|\ \ | | | | | | | Association with inverse_of does not set the parent in association building block | ||||
| * | | fix inverse_of association in block of new child | Michal Cichra | 2013-04-01 | 3 | -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/master | Jon Leighton | 2013-04-05 | 2 | -5/+3 |
|\ \ \ | | | | | | | | | Avoid calling define_method in CollectionProxy#scope | ||||
| * | | | Refactor CollectionProxy#scope to avoid calling #extend. | James Golick | 2013-04-02 | 2 | -5/+3 |
| | | | | |||||
* | | | | Fix scope chaining + STI | Jon Leighton | 2013-04-05 | 4 | -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 #9869 | Neeraj Singh | 2013-04-05 | 2 | -0/+6 |
| | | | | |||||
* | | | | Merge pull request #10102 from xxxcaqui/master | Carlos Antonio da Silva | 2013-04-05 | 1 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | Sort modules in active_record.rb | ||||
| * | | | | Sort modules in alphabetical order. | Shunsuke Osa | 2013-04-05 | 1 | -2/+2 |
| | |_|/ | |/| | | |||||
* / | | | Improve `belongs_to touch: true` timestamp test | Andrew White | 2013-04-05 | 1 | -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 callback | Carlos Antonio da Silva | 2013-04-04 | 1 | -7/+7 |
| | | | |||||
* | | | Use the correct pk field from the reflected class to find the old record | Carlos Antonio da Silva | 2013-04-04 | 1 | -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. | ||||
* | | | Use inspect when writing the foreign key from the reflection | Andrew White | 2013-04-05 | 2 | -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 commands | Carlos Antonio da Silva | 2013-04-04 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | http://guides.rubyonrails.org/api_documentation_guidelines.html#example-code [ci skip] | ||||
* | | | Merge pull request #10094 from neerajdotname/fix2 | Carlos Antonio da Silva | 2013-04-04 | 2 | -3/+21 |
|\ \ \ | | | | | | | | | Collection of small fixes. Check individual commits for background. | ||||
| * | | | use | to have more intent revealing code | Neeraj Singh | 2013-04-04 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | thanks to @egilburg for suggestion | ||||
| * | | | expanded rdoc for chain and reflection_names | Neeraj Singh | 2013-04-04 | 1 | -2/+20 |
| | | | | |||||
* | | | | stop depending on callbacks | Aaron Patterson | 2013-04-04 | 1 | -6/+12 |
|/ / / | |||||
* | | | Merge pull request #10087 from neerajdotname/10016 | Carlos Antonio da Silva | 2013-04-04 | 7 | -3/+26 |
|\ \ \ | | | | | | | | | has_many through obeys order on through association | ||||
| * | | | has_many through obeys order on through association | Neeraj Singh | 2013-04-04 | 7 | -3/+26 |
| | | | | | | | | | | | | | | | | fixes #10016 | ||||
* | | | | Merge pull request #10088 from neerajdotname/fixes1 | Rafael Mendonça França | 2013-04-04 | 3 | -5/+15 |
|\ \ \ \ | |/ / / |/| | | | minor fixes including variable name change and expanded rdoc | ||||
| * | | | expanded rdoc on source_reflection method | Neeraj Singh | 2013-04-04 | 1 | -0/+10 |
| | | | | |||||
| * | | | show name of the klass that has missing association | Neeraj Singh | 2013-04-02 | 1 | -1/+1 |
| | | | | |||||
| * | | | not a relation. it's an arel select manager | Neeraj Singh | 2013-04-02 | 1 | -4/+4 |
| | | | | |||||
* | | | | Remove duplicated require from AR base test | Carlos Antonio da Silva | 2013-04-03 | 1 | -1/+0 |
| | | | | |||||
* | | | | Add missing require to inheritance test | Carlos Antonio da Silva | 2013-04-03 | 2 | -3/+1 |
| | | | | |||||
* | | | | Move changelog entry to the top and fix conflict [ci skip] | Carlos Antonio da Silva | 2013-04-03 | 1 | -22/+20 |
| | | | | |||||
* | | | | Merge pull request #9141 from adamgamble/issue-9091 | David Heinemeier Hansson | 2013-04-03 | 4 | -0/+62 |
|\ \ \ \ | | | | | | | | | | | belongs_to :touch should touch old record when transitioning. | ||||
| * | | | | Modifies belong_to touch callback to touch old associations also #9091 | Adam Gamble | 2013-03-14 | 3 | -10/+34 |
| | | | | | |||||
| * | | | | + Add test for auto timestamps update of both old & new parent records | PikachuEXE | 2013-03-14 | 2 | -0/+38 |
| | | | | | |||||
* | | | | | Merge pull request #10049 from vipulnsward/optimize_around_merge_v1 | Rafael Mendonça França | 2013-04-03 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | optimize some code around merge | ||||
| * | | | | | optimize some code around merge | Vipul A M | 2013-04-03 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Move alias method near to the aliased one in collection proxy | Carlos Antonio da Silva | 2013-04-03 | 1 | -2/+1 |
| | | | | | | |||||
* | | | | | | Merge pull request #10063 from SamSaffron/master | Santiago Pastorino | 2013-04-02 | 2 | -15/+29 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Per #9999 revert blank? to empty? | ||||
| * | | | | | | Per #9999 revert the revert changing so columns are only tested for empty? ↵ | Sam | 2013-04-03 | 2 | -15/+29 |
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | as opposed to blank? This is both faster and more correct, added tests to make sure this is not reverted again. | ||||
* / | | | | | true/false => truthy falsy | Steve Klabnik | 2013-04-02 | 1 | -2/+2 |
|/ / / / / | |||||
* | | / / | Prefer find_by over dynamic finders in rdoc | Sam Ruby | 2013-04-02 | 5 | -11/+11 |
| |_|/ / |/| | | | |||||
* | | | | Merge pull request #9975 from ↵ | Aaron Patterson | 2013-04-02 | 2 | -14/+20 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | mmangino/raise_when_attributes_cant_be_unserialized Unserializing YAML attributes can silently fail in development mode | ||||
| * | | | | Remove all error masking when decoding serialized data fails? | Mike Mangino | 2013-04-02 | 2 | -15/+12 |
| | | | | | |||||
| * | | | | Raise an exception when unserialization fails due to a missing class | Mike Mangino | 2013-03-28 | 2 | -1/+10 |
| | | | | | |||||
* | | | | | Add CHANGELOG entry about extracting and deprecating ↵ | kennyj | 2013-04-03 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | Firebird/Sqlserver/Oracle database tasks. | ||||
* | | | | | Show deprecated messages only when target database adapters defined | Yasuo Honda | 2013-04-03 | 3 | -3/+3 |
| | | | | | |||||
* | | | | | Fix tiny problem: change method order for consistency and fix wrong method name. | kennyj | 2013-04-03 | 2 | -2/+2 |
| | | | | | |||||
* | | | | | Suppress deprecation messages for deprecated database tasks, when executing ↵ | kennyj | 2013-04-03 | 3 | -0/+21 |
| | | | | | | | | | | | | | | | | | | | | rails's testcases. | ||||
* | | | | | Add deprecation message on Firebird / Sqlserver / Oracle database tasks. | kennyj | 2013-04-03 | 3 | -0/+3 |
| | | | | | |||||
* | | | | | Extract Oracle database tasks. | kennyj | 2013-04-03 | 5 | -31/+140 |
| | | | | | |||||
* | | | | | Extract Sqlserver database tasks. | kennyj | 2013-04-03 | 5 | -11/+131 |
| | | | | | |||||
* | | | | | Extract Firebird database tasks. | kennyj | 2013-04-03 | 5 | -20/+151 |
| | | | | |