Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2013-03-30 | 1 | -1/+1 |
|\ | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb activerecord/test/cases/adapter_test.rb guides/source/testing.md [ci skip] | ||||
| * | Fix typo | Carson McDonald | 2013-03-22 | 1 | -1/+1 |
| | | | | | | | | [ci skip] | ||||
| * | Fix typo, ording to ordering | Carson McDonald | 2013-03-18 | 1 | -1/+1 |
| | | | | | | | | [ci skip] | ||||
| * | Uniq cannot be used directly on an ActiveRecord model. 'DISTINCT field' is ↵ | Daniel Lobato | 2013-03-12 | 1 | -1/+1 |
| | | | | | | | | the only pluck query that translates into the aforementioned SQL | ||||
* | | Merge pull request #9274 from KrzysiekJ/spaces_in_scope_names | Rafael Mendonça França | 2013-03-27 | 1 | -5/+3 |
|\ \ | | | | | | | | | | Use define_method when method name contains weird characters. | ||||
| * | | Use define_method when method name contains weird characters. | Krzysztof Jurewicz | 2013-03-18 | 1 | -5/+3 |
| | | | |||||
* | | | Fixed typos in activerecord | Prathamesh Sonpatki | 2013-03-27 | 1 | -1/+1 |
| | | | |||||
* | | | Fix some typos in AR- CHANGELOG, tests, method doc. fixed | Vipul A M | 2013-03-20 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'master-sec' | Aaron Patterson | 2013-03-18 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | * master-sec: fix protocol checking in sanitization [CVE-2013-1857] JDOM XXE Protection [CVE-2013-1856] fix incorrect ^$ usage leading to XSS in sanitize_css [CVE-2013-1855] stop calling to_sym when building arel nodes [CVE-2013-1854] | ||||
| * | | stop calling to_sym when building arel nodes [CVE-2013-1854] | Aaron Patterson | 2013-03-15 | 1 | -1/+1 |
| |/ | |||||
* | | Deprecate the `:distinct` option for `Relation#count`. | Yves Senn | 2013-03-15 | 1 | -2/+7 |
| | | | | | | | | | | | | | | We moved more and more away from passing options to finder / calculation methods. The `:distinct` option in `#count` was one of the remaining places. Since we can now combine `Relation#distinct` with `Relation#count` the option is no longer necessary and can be deprecated. | ||||
* | | rename `Relation#uniq` to `Relation#distinct`. `#uniq` still works. | Yves Senn | 2013-03-15 | 2 | -11/+13 |
|/ | | | | | | | | The similarity of `Relation#uniq` to `Array#uniq` is confusing. Since our Relation API is close to SQL terms I renamed `#uniq` to `#distinct`. There is no deprecation. `#uniq` and `#uniq!` are aliases and will continue to work. I also updated the documentation to promote the use of `#distinct`. | ||||
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2013-03-05 | 1 | -1/+1 |
|\ | |||||
| * | Fix WhereChain docs to mention only not | Ernie Miller | 2013-03-04 | 1 | -1/+1 |
| | | |||||
* | | Remove .all usage from unscope doc examples [ci skip] | Carlos Antonio da Silva | 2013-03-04 | 1 | -4/+4 |
| | | |||||
* | | Use 1.9 hash style in changelog and doc examples [ci skip] | Carlos Antonio da Silva | 2013-03-04 | 1 | -3/+3 |
| | | |||||
* | | Created an unscope method for removing relations from a chain of | wangjohn | 2013-03-03 | 1 | -0/+94 |
| | | | | | | | | | | relations. Specific where values can be unscoped, and the unscope method still works when relations are merged or combined. | ||||
* | | Revert "Merge pull request #9207 from dylanahsmith/mysql-quote-numeric" | Steve Klabnik | 2013-02-27 | 1 | -5/+0 |
|/ | | | | | This reverts commit 408227d9c5ed7de26310d72a1a99c1ee02311c63, reversing changes made to dca0b57d03deffc933763482e615c3cf0b9a1d97. | ||||
* | Expand order(:symbol) to "table".symbol to prevent broken queries on PG. | Yves Senn | 2013-02-25 | 1 | -0/+5 |
| | | | | | | | | | | Fixes #9275. When `#order` is called with a Symbol this patch will prepend the quoted_table_name. Before the postgresql adapter failed to build queries containg a join and an order with a symbol. This expansion happens for all adapters. | ||||
* | Make explicit the method will raise an exception | Rafael Mendonça França | 2013-02-24 | 1 | -10/+10 |
| | | | | Taking the wise advice of @carlosantoniodasilva | ||||
* | remove AR auto-explain (config.auto_explain_threshold_in_seconds) | Yves Senn | 2013-02-24 | 1 | -1/+1 |
| | | | | | | | | | | We discussed that the auto explain feature is rarely used. This PR removes only the automatic explain. You can still display the explain output for any given relation using `ActiveRecord::Relation#explain`. As a side-effect this should also fix the connection problem during asset compilation (#9385). The auto explain initializer in the `ActiveRecord::Railtie` forced a connection. | ||||
* | adds a missing LIMIT 1 in #take docs | Xavier Noria | 2013-02-23 | 1 | -1/+1 |
| | |||||
* | Merge pull request #9345 from ↵ | Rafael Mendonça França | 2013-02-20 | 1 | -10/+10 |
|\ | | | | | | | | | wangjohn/change_name_of_query_method_argument_checker_for_clarity Renaming the check_empty_arguments method to something more descriptive. | ||||
| * | Renaming the check_empty_arguments method to something more descriptive. | wangjohn | 2013-02-20 | 1 | -10/+10 |
| | | | | | | | | | | The function is now called has_arguments? so that it's easier to tell that it's just checking to see if the args are blank or not. | ||||
* | | removes some remaining relation bang methods documentation [ci skip] | Xavier Noria | 2013-02-20 | 1 | -3/+0 |
| | | |||||
* | | adds an example in the docs of #not with multiple conditions [ci skip] | Xavier Noria | 2013-02-20 | 1 | -4/+8 |
|/ | |||||
* | Added comments about the check_empty_arguments method which is called | wangjohn | 2013-02-20 | 1 | -11/+27 |
| | | | | | for query methods in a where_clause. Also, modified the CHANGELOG entry because it had false information and added tests. | ||||
* | Raise an error when query methods have blank arguments, and when blank ↵ | John J Wang | 2013-02-19 | 1 | -9/+23 |
| | | | | arguments are meaningless. | ||||
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2013-02-15 | 2 | -0/+24 |
|\ | | | | | | | | | Conflicts: guides/source/upgrading_ruby_on_rails.md | ||||
| * | copy edits [ci skip] | Vijay Dev | 2013-02-15 | 1 | -1/+1 |
| | | |||||
| * | Add example for ActiveRecord::Base.joins using a string as argument | Maurizio De Santis | 2013-02-07 | 1 | -0/+5 |
| | | |||||
| * | Add example for ActiveRecord::Base.group using a string as argument | Maurizio De Santis | 2013-02-07 | 1 | -0/+3 |
| | | |||||
| * | Add documentation for ActiveRecord.select when use strings as arguments | Maurizio De Santis | 2013-02-07 | 1 | -0/+10 |
| | | |||||
| * | Add ActiveRecord.count documentation when used on group relations | Maurizio De Santis | 2013-02-07 | 1 | -0/+6 |
| | | |||||
* | | Use IN operator like arel for empty hash in where clause | robertomiranda | 2013-02-09 | 1 | -1/+1 |
| | | |||||
* | | Reverting e170014113 (Change behaviour with empty hash in where clause) | Guillermo Iguaran | 2013-02-08 | 1 | -1/+1 |
| | | |||||
* | | Reverting 16f6f25 (Change behaviour with empty array in where clause) | Guillermo Iguaran | 2013-02-08 | 1 | -2/+0 |
| | | |||||
* | | Change behaviour with empty array in where clause | robertomiranda | 2013-02-08 | 1 | -0/+2 |
| | | |||||
* | | Change behaviour with empty hash in where clause | robertomiranda | 2013-02-08 | 1 | -1/+1 |
| | | |||||
* | | active_record: Quote numeric values compared to string columns. | Dylan Smith | 2013-02-07 | 1 | -0/+5 |
|/ | |||||
* | Prevent Relation#merge from collapsing wheres on the RHS | Jon Leighton | 2013-01-27 | 1 | -17/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | This caused a bug with the new associations implementation, because now association conditions are represented as Arel nodes internally right up to when the whole thing gets turned to SQL. In Rails 3.2, association conditions get turned to raw SQL early on, which prevents Relation#merge from interfering. The current implementation was buggy when a default_scope existed on the target model, since we would basically end up doing: default_scope.merge(association_scope) If default_scope contained a where(foo: 'a') and association_scope contained a where(foo: 'b').where(foo: 'c') then the merger would see that the same column is representated on both sides of the merge and collapse the wheres to all but the last: where(foo: 'c') Now, the RHS of the merge is left alone. Fixes #8990 | ||||
* | `#count` in conjunction with `#uniq` performs distinct count. | Yves Senn | 2013-01-26 | 1 | -1/+2 |
| | | | | closes #6865 | ||||
* | reduce the number of queries on IN clauses, fix relation queries in `where` | Aaron Patterson | 2013-01-24 | 2 | -1/+6 |
| | |||||
* | stop converting strings to symbols | Aaron Patterson | 2013-01-24 | 1 | -1/+1 |
| | |||||
* | Revert "Merge pull request #8989 from robertomiranda/use-rails-4-find-by" | Guillermo Iguaran | 2013-01-18 | 1 | -1/+1 |
| | | | | | This reverts commit 637a7d9d357a0f3f725b0548282ca8c5e7d4af4a, reversing changes made to 5937bd02dee112646469848d7fe8a8bfcef5b4c1. | ||||
* | User Rails 4 find_by | robertomiranda | 2013-01-18 | 1 | -1/+1 |
| | |||||
* | Refactor predicate builder when receiving empty hash | Carlos Antonio da Silva | 2013-01-17 | 1 | -4/+4 |
| | | | | | | | There's no need to create a new arel table or reflect on the column association if the value is empty, these attributes are not used. Also no need to concat a new array, just append the query value. | ||||
* | These are already required through AS/rails | Akira Matsuda | 2013-01-07 | 2 | -3/+0 |
| | | | | | | * dependencies/autoload * concern * deprecation | ||||
* | refatctoring of some code repetition in spawn_methods | Angelo capilleri | 2012-12-31 | 1 | -8/+10 |
| | |||||
* | warning removed: shadowing outer local variable | Arun Agrawal | 2012-12-30 | 1 | -2/+2 |
| |