Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2013-02-26 | 3 | -3/+3 |
|\ | |||||
| * | Typo fix | Carson McDonald | 2013-02-25 | 1 | -1/+1 |
| | | |||||
| * | BELONGS TO ASSOCIATION | Typo fix | libin | 2013-02-25 | 1 | -1/+1 |
| | | |||||
| * | Corrected link anchor and added colons for continuity | Doug Yun | 2013-02-19 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #9414 from senny/9275_order_with_symbol_and_join | Rafael Mendonça França | 2013-02-26 | 4 | -2/+34 |
|\ \ | | | | | | | Expand order(:symbol) to "table".symbol to prevent broken queries on PG. | ||||
| * | | Expand order(:symbol) to "table".symbol to prevent broken queries on PG. | Yves Senn | 2013-02-25 | 4 | -3/+35 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | | No need to send public methods | Akira Matsuda | 2013-02-26 | 3 | -3/+3 |
| | | | |||||
* | | | Are was release | Rafael Mendonça França | 2013-02-25 | 1 | -1/+1 |
| | | | |||||
* | | | removes redundant require | Xavier Noria | 2013-02-25 | 1 | -2/+0 |
| | | | | | | | | | | | | It turns out this file is required in active_record.rb. | ||||
* | | | typo | Xavier Noria | 2013-02-25 | 1 | -1/+1 |
| | | | |||||
* | | | AR loads activerecord-deprecated_finders, no need to add it to the Gemfile | Xavier Noria | 2013-02-25 | 2 | -6/+7 |
| | | | |||||
* | | | New CHANGELOG entries always on top [ci skip] | Rafael Mendonça França | 2013-02-25 | 1 | -4/+4 |
| | | | |||||
* | | | Do not override attributes on `dup` by default scopes | Hiroshige Umino | 2013-02-26 | 3 | -1/+13 |
| | | | |||||
* | | | Preparing for 4.0.0.beta1 release | David Heinemeier Hansson | 2013-02-25 | 2 | -2/+2 |
| | | | |||||
* | | | :scissors: | Rafael Mendonça França | 2013-02-25 | 1 | -1/+1 |
| | | | |||||
* | | | some minor AR changelog modifications [ci skip] | Yves Senn | 2013-02-25 | 1 | -3/+7 |
| | | | |||||
* | | | Merge pull request #9409 from wangjohn/adding_documentation_to_touch | Carlos Antonio da Silva | 2013-02-25 | 1 | -0/+7 |
|\ \ \ | |/ / |/| | | Added documentation to touch throwing an error | ||||
| * | | Added documentation about how touch now throws an error when one tries | wangjohn | 2013-02-25 | 1 | -0/+7 |
| | | | | | | | | | | | | to use it on an unpersisted object. | ||||
* | | | Merge pull request #9246 from Noemj/update_prepared_statements | Aaron Patterson | 2013-02-24 | 2 | -3/+26 |
|\ \ \ | |/ / |/| | | Changed update to use prepared statements | ||||
| * | | Changed update_record to use prepared statements. | Noemj | 2013-02-11 | 2 | -3/+26 |
| | | | |||||
* | | | Raising an ActiveRecordError when one tries to use .touch(name) on a new | wangjohn | 2013-02-25 | 3 | -0/+20 |
| | | | | | | | | | | | | | | | object that has not yet been persisted. This behavior follows the precedent set by update_columns. | ||||
* | | | Improve AR changelog [ci skip] | Carlos Antonio da Silva | 2013-02-24 | 1 | -2/+2 |
| | | | |||||
* | | | Remove warning | Rafael Mendonça França | 2013-02-24 | 1 | -1/+1 |
| | | | |||||
* | | | 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 | ||||
* | | | don't apply invalid ordering when preloading hmt associations. | Yves Senn | 2013-02-24 | 3 | -2/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | closes #8663. When preloading a hmt association there two possible scenarios: 1.) preload with 2 queries: first hm association, then hmt with id IN () 2.) preload with join: hmt association is loaded with a join on the hm association The bug was happening in scenario 1.) with a normal order clause on the hmt association. The ordering was also applied when loading the hm association, which resulted in the error. This patch only applies the ordering the the hm-relation if we are performing a join (2). Otherwise the order will only appear in the second query (1). | ||||
* | | | Merge pull request #9400 from senny/remove_auto_explain_threshold_in_seconds | Xavier Noria | 2013-02-24 | 7 | -155/+39 |
|\ \ \ | | | | | | | | | remove config.auto_explain_threshold_in_seconds | ||||
| * | | | remove AR auto-explain (config.auto_explain_threshold_in_seconds) | Yves Senn | 2013-02-24 | 7 | -155/+39 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | | | Updated doc to clarify about update_all and delete_all | Neeraj Singh | 2013-02-24 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | delete_all will call callbacks if depdent option is specified as :destroy. This behavior is not very clear from the documetation and hence issue #7832 was raised. closes #7832 | ||||
* | | | | Skip connection url test when the machine is using socket configuration. | Rafael Mendonça França | 2013-02-24 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | The connection url parssing don't accept the socket option | ||||
* | | | | Do not type cast all the database url values. | Rafael Mendonça França | 2013-02-24 | 8 | -56/+32 |
|/ / / | | | | | | | | | | | | | | | | We should only type cast when we need to use. Related to 4b005fb371c2e7af80df7da63be94509b1db038c | ||||
* | | | Merge pull request #9356 from senny/988_multiple_actions_for_after_commit | Steve Klabnik | 2013-02-24 | 3 | -14/+60 |
|\ \ \ | | | | | | | | | multiple actions for :on option with `after_commit` and `after_rollback` | ||||
| * | | | multiple actions for :on option with `after_commit` and `after_rollback` | Yves Senn | 2013-02-21 | 3 | -14/+60 |
| | | | | | | | | | | | | | | | | Closes #988. | ||||
* | | | | test case to prevent duplicated associations with custom PK. | Yves Senn | 2013-02-24 | 2 | -0/+12 |
| | | | | | | | | | | | | | | | | closes #9201 | ||||
* | | | | Oracle enhanced adapter shortens its name if it is longer than 30 bytes | Yasuo Honda | 2013-02-24 | 1 | -2/+10 |
| | | | | | | | | | | | | | | | | because of Oracle database index length spec. | ||||
* | | | | also rename the test-case class inside columns_test.rb | Yves Senn | 2013-02-24 | 1 | -1/+1 |
| | | | | |||||
* | | | | adds a missing LIMIT 1 in #take docs | Xavier Noria | 2013-02-23 | 1 | -1/+1 |
| | | | | |||||
* | | | | rename_column_test.rb -> columns_test.rb to reveal intent. | Yves Senn | 2013-02-23 | 1 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I renamed the test to better communicate it's intention. Since it also tests: - add_column - remove_column - change_column There is no reason to call it rename_column_test. | ||||
* | | | | forwardport #9388 rename/remove column preserves custom PK. | Yves Senn | 2013-02-23 | 1 | -1/+15 |
|/ / / | |||||
* | | | Merge pull request #9348 from schuetzm/doc_no_indices_with_create_join_table | Xavier Noria | 2013-02-21 | 1 | -0/+8 |
|\ \ \ | | | | | | | | | Add more documentation for create_join_table. | ||||
| * | | | Indent comment block by two spaces. | Marc Schütz | 2013-02-21 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | As requested by @fxn https://github.com/schuetzm/rails/commit/743d15bba182df80d003d205690ead988970299c#commitcomment-2661417 | ||||
| * | | | Add more documentation for create_join_table. | Marc Schütz | 2013-02-20 | 1 | -0/+8 |
| | | | | | | | | | | | | | | | | | | | | Explain that it doesn't create indices by default and that it also has a block form. | ||||
* | | | | Fix warning | Rafael Mendonça França | 2013-02-21 | 1 | -1/+1 |
|/ / / | |||||
* | | | ActiveRecord -> Active Record [ci skip] | Xavier Noria | 2013-02-20 | 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 relation bang methods from the AR changelog [ci skip] | Xavier Noria | 2013-02-20 | 1 | -12/+0 |
| | | | | |||||
* | | | | removes some remaining relation bang methods documentation [ci skip] | Xavier Noria | 2013-02-20 | 1 | -3/+0 |
| | | | | |||||
* | | | | puts a lambda around a default scope [ci skip] | Xavier Noria | 2013-02-20 | 1 | -1/+1 |
| | | | | |||||
* | | | | adds an example in the docs of #not with multiple conditions [ci skip] | Xavier Noria | 2013-02-20 | 1 | -4/+8 |
| | | | | |||||
* | | | | database.yml -> config/database.yml [ci skip] | Xavier Noria | 2013-02-20 | 1 | -1/+1 |
| | | | |