aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | move helper class to the topAaron Patterson2013-10-211-42/+42
| | | |
* | | | build the association graph functionallyAaron Patterson2013-10-213-20/+13
| | | | | | | | | | | | | | | | This lets us avoid the constant calls to Array#<<
* | | | Merge branch 'master' into joindepAaron Patterson2013-10-2126-244/+418
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (23 commits) Escape the parentheses in the default function regexp Update docs on Tilt::Template in Asset Pipeline guide Fix loading a sql structure file on postgres when the file's path has whitespace in it remove trailing whitespace added with b057765 [ci skip]. Allow unscope to work with `where.not` Raise an exception when model without primary key calls .find_with_ids Process sub-query relation's binding values Instrument the generation of Action Mailer messages Remove extra variable creation and merge. In Relation#empty? use #exists? instead of #count. [ci skip] avoid deprecation warning in sample code Convert Fixnum into String the port number in MySQL Fix some indentation on autosave association Make define_non_cyclic_method simpler Add Sass gobbling info to asset pipeline docs Ensure the state is clean after one failure Fix typo in form_helper.rb add a new local variable to track if digests are being stored, to ensure the cleanup works correctly [ci skip] Fix number of methods added by association. update digestor code based on review ...
| * \ \ \ Merge pull request #12588 from jetthoughts/12586_subquery_with_unprepared_sqlRafael Mendonça França2013-10-214-6/+56
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Inline bind values for sub-queries generated for Relation in where Conflicts: activerecord/CHANGELOG.md
| | * | | | Process sub-query relation's binding valuesPaul Nikitochkin2013-10-204-4/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generated sub-query for Relation as array condition for `where` method did not take in account its bind values, in result generates invalid SQL query. Fixed by adding sub-query relation's binding values to base relation Closes: #12586
| * | | | | Escape the parentheses in the default function regexpRafael Mendonça França2013-10-212-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is causing every default value in PostreSQL database to being handled as default function. Fixes #12581
| * | | | | Merge pull request #12567 from GoBoundless/fix_postgres_structure_importYves Senn2013-10-213-1/+13
| |\ \ \ \ \ | | | | | | | | | | | | | | Fix loading a sql structure file on postgres when the file's path has whitespace in it
| | * | | | | Fix loading a sql structure file on postgres when the file's path has ↵Kevin Mook2013-10-213-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | whitespace in it
| * | | | | | Merge pull request #12603 from dv/fix-tilt-template-in-asset-pipeline-docsGuillermo Iguaran2013-10-211-3/+8
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | Update docs on Tilt::Template in Asset Pipeline guide
| | * | | | | Update docs on Tilt::Template in Asset Pipeline guideDavid Verhasselt2013-10-211-3/+8
| |/ / / / /
| * | | | | remove trailing whitespace added with b057765 [ci skip].Yves Senn2013-10-211-2/+2
| | | | | |
| * | | | | Merge pull request #12565 from stormsilver/unscope_fixesYves Senn2013-10-213-7/+23
| |\ \ \ \ \ | | | | | | | | | | | | | | Allow unscope to work with `where.not`
| | * | | | | Allow unscope to work with `where.not`Eric Hankins2013-10-213-7/+23
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows you to call #unscope on a relation with negative equality operators, i.e. Arel::Nodes::NotIn and Arel::Nodes::NotEqual that have been generated through the use of where.not.
| * | | | | Merge pull request #12549 from makimoto/raise-when-find-without-pkYves Senn2013-10-213-0/+13
| |\ \ \ \ \ | | | | | | | | | | | | | | Raise an exception when model without primary key calls .find_with_ids
| | * | | | | Raise an exception when model without primary key calls .find_with_idsShimpei Makimoto2013-10-213-0/+13
| |/ / / / /
| * | | | | Merge pull request #12591 from vipulnsward/remove_mail_mergeYves Senn2013-10-201-3/+3
| |\ \ \ \ \ | | | | | | | | | | | | | | Remove extra variable creation and merge.
| | * | | | | Remove extra variable creation and merge.Vipul A M2013-10-201-3/+3
| | | |_|_|/ | | |/| | |
| * | | | | Merge pull request #12556 from dasch/dasch/nstrument-am-processingJosé Valim2013-10-204-7/+29
| |\ \ \ \ \ | | |/ / / / | |/| | | | Instrument the generation of Action Mailer messages
| | * | | | Instrument the generation of Action Mailer messagesDaniel Schierbeck2013-10-204-7/+29
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | The processing of outbound mail is instrumented with the key `process.action_mailer`. The payload includes the mailer name as well as the mailer method.
| * | | | Merge pull request #12533 from szimek/use_exists_in_relation_emptySantiago Pastorino2013-10-192-2/+5
| |\ \ \ \ | | |/ / / | |/| | | In Relation#empty? use #exists? instead of #count.
| | * | | In Relation#empty? use #exists? instead of #count.Szymon Nowak2013-10-192-2/+5
| |/ / /
| * | | Merge pull request #12560 from sue445/modify_find_lock_sample_codeYves Senn2013-10-181-3/+3
| |\ \ \ | | | | | | | | | | avoid deprecation warning in sample code [ci skip]
| | * | | [ci skip] avoid deprecation warning in sample codesue4452013-10-181-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Account.find(1, lock: true) -> DEPRECATION WARNING: Passing options to #find is deprecated. Please build a scope and then call #find on it.
| * | | | Merge pull request #11839 from chocoby/fix/convert_port_numberYves Senn2013-10-183-1/+15
| |\ \ \ \ | | | | | | | | | | | | Convert Fixnum into String the port number like `db:structure:dump` task in MySQL.
| | * | | | Convert Fixnum into String the port number in MySQLKenta Okamoto2013-10-183-1/+15
| |/ / / /
| * | | | Merge pull request #12569 from arthurnn/autosave_small_cleanipRafael Mendonça França2013-10-171-196/+196
| |\ \ \ \ | | | | | | | | | | | | Small cleanup on autosave association
| | * | | | Fix some indentation on autosave associationArthur Neves2013-10-171-196/+196
| | | | | |
| | * | | | Make define_non_cyclic_method simplerArthur Neves2013-10-171-7/+7
| | | | | |
| * | | | | Merge pull request #12218 from dv/add-sass-globbing-to-asset-pipeline-docsYves Senn2013-10-171-1/+5
| |\ \ \ \ \ | | |/ / / / | |/| | | | Add sass globbing to asset pipeline docs [ci skip]
| | * | | | Add Sass gobbling info to asset pipeline docsDavid Verhasselt2013-10-171-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | Merge pull request #12564 from JuanitoFatas/association-basicsYves Senn2013-10-161-8/+8
| |\ \ \ \ \ | | | | | | | | | | | | | | [ci skip] Fix number of methods added by association.
| | * | | | | [ci skip] Fix number of methods added by association.Juanito Fatas2013-10-171-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also clean up some trailing spaces on line 1143-1146.
| * | | | | | Ensure the state is clean after one failureRafael Mendonça França2013-10-161-5/+4
| | | | | | |
| * | | | | | Merge pull request #12540 from wyaeld/bug/fix-recursive-digestRafael Mendonça França2013-10-163-6/+37
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Ensure ActionView::Digestor.cache is correctly cleaned up
| | * | | | | | add a new local variable to track if digests are being stored, to ensure the ↵Brad Murray2013-10-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cleanup works correctly
| | * | | | | | update digestor code based on reviewBrad Murray2013-10-151-2/+2
| | | | | | | |
| | * | | | | | update changelogBrad Murray2013-10-151-0/+5
| | | | | | | |
| | * | | | | | Ensure ActionView::Digest.cache is correctly cleaned up whenBrad Murray2013-10-151-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActionView::Resolver.caching = false.
| | * | | | | | Add 2 tests, 1 of which fails, to isolate the digest_caching behaviour ↵Brad Murray2013-10-151-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | causing #12521 If config.action_view.cache_template_loading = false, most likely in a development configuration if config.cache_classes = false & config.action_controller.perform_caching = true. config.action_view.cache_template_loading defaults to the value of config.cache_classes
| * | | | | | | Merge pull request #12568 from adamyonk/patch-1Rafael Mendonça França2013-10-161-1/+1
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | Fix typo in form_helper.rb
| | * | | | | | Fix typo in form_helper.rbAdam Jahnke2013-10-161-1/+1
| |/ / / / / /
* | | | | | | @base_klass is not usedAaron Patterson2013-10-211-1/+0
| | | | | | |
* | | | | | | join_type isn't used on the node anymoreAaron Patterson2013-10-212-11/+7
| | | | | | |
* | | | | | | make joins generation method look similarAaron Patterson2013-10-211-6/+9
| | | | | | |
* | | | | | | remove node duping codeAaron Patterson2013-10-211-57/+19
| | | | | | |
* | | | | | | refactor outer join generationAaron Patterson2013-10-211-11/+6
| | | | | | |
* | | | | | | add outer joins for matching nodesAaron Patterson2013-10-211-2/+14
| | | | | | |
* | | | | | | construct joins by walking the outer join treeAaron Patterson2013-10-211-5/+34
| | | | | | |
* | | | | | | pass the outer joins to join_constraintsAaron Patterson2013-10-202-6/+3
| | | | | | |
* | | | | | | disconnect join_constraints from the instanceAaron Patterson2013-10-202-3/+3
| | | | | | |