Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #13307 from akshay-vishnoi/typo | Rafael Mendonça França | 2013-12-15 | 1 | -2/+2 |
|\ | | | | | Spelling and Grammar check [ci skip] | ||||
| * | Spelling and Grammar check [ci skip] | Akshay Vishnoi | 2013-12-16 | 1 | -2/+2 |
| | | |||||
* | | Improve CHANGELOG entry with examples [ci skip] | Rafael Mendonça França | 2013-12-15 | 1 | -0/+10 |
| | | |||||
* | | Merge pull request #13313 from ccutrer/temp-tables | Rafael Mendonça França | 2013-12-15 | 8 | -17/+83 |
|\ \ | | | | | | | | | | | | | | | | | | | support creating temporary tables from queries Conflicts: activerecord/CHANGELOG.md | ||||
| * | | support creating temporary tables from queries | Cody Cutrer | 2013-12-14 | 8 | -17/+83 |
| | | | | | | | | | | | | | | | also override drop_table in AbstractMySQLAdapter to properly drop temporary tables without committing the transaction | ||||
* | | | Improve the CHANGELOG entry [ci skip] | Rafael Mendonça França | 2013-12-15 | 1 | -3/+3 |
| | | | |||||
* | | | db:test:clone and prepare must load environment | Arthur Neves | 2013-12-14 | 2 | -3/+9 |
|/ / | | | | | | | | | | | db:test:clone and db:test:prepare use ActiveRecord::Base. configurations, so we need to load the rails environment, otherwise the config wont be in place. | ||||
* | | argument prefix warning removed | Arun Agrawal | 2013-12-13 | 1 | -1/+1 |
| | | | | | | | | * interpreted as a argument prefix | ||||
* | | Merge pull request #13306 from kassio/master | Rafael Mendonça França | 2013-12-13 | 2 | -4/+9 |
|\ \ | | | | | | | Fix mysql to support duplicated column names | ||||
| * | | Fix mysql to support duplicated column names | Kassio Borges | 2013-12-13 | 2 | -4/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will fix the [broken test](https://github.com/rails/rails/commit/4a2650836680f51490e999c3c8441a2f9adff96e) `test_with_limiting_with_custom_select`. The query's result was built in a hash with column name as key, if the result have a duplicated column name the last value was overriding the first one. | ||||
* | | | refactor, reuse assertions in range_test.rb. | Yves Senn | 2013-12-13 | 1 | -186/+111 |
| | | | |||||
* | | | extract PG range tests from datatype_test.rb into range_test.rb | Yves Senn | 2013-12-13 | 3 | -296/+321 |
|/ / | |||||
* | | Add a bunch of Relation -> Array delegate methods to the whitelist. This ↵ | Jeremy Kemper | 2013-12-12 | 2 | -32/+26 |
| | | | | | | | | won't last - aim to switch back to a blacklist for mutator methods. | ||||
* | | Merge pull request #12590 from laurocaetano/whitelist-to-delegate-array-methods | Rafael Mendonça França | 2013-12-12 | 4 | -104/+105 |
|\ \ | | | | | | | Create a whitelist of methods to be delegated to Array. | ||||
| * | | Use `public_send` instead of just use `send`. | Lauro Caetano | 2013-12-12 | 2 | -9/+9 |
| | | | |||||
| * | | Use a whitelist to delegate methods to array | Lauro Caetano | 2013-12-12 | 2 | -75/+38 |
| | | | |||||
| * | | Add changelog | laurocaetano | 2013-12-12 | 1 | -6/+15 |
| | | | |||||
| * | | Remove delegation test. | laurocaetano | 2013-12-12 | 1 | -17/+46 |
| | | | | | | | | | | | | | | | This test was removed, since Relation will not delegate class methods to Array. | ||||
* | | | extract cache counter logic to one method | Aaron Patterson | 2013-12-12 | 1 | -11/+10 |
| | | | |||||
* | | | remove duplicate code | Aaron Patterson | 2013-12-12 | 1 | -15/+6 |
| | | | |||||
* | | | extract a method for updating without a record object | Aaron Patterson | 2013-12-12 | 1 | -6/+10 |
| | | | |||||
* | | | extract methods out of the cache update method | Aaron Patterson | 2013-12-12 | 1 | -14/+22 |
| | | | |||||
* | | | pull a nil check up one frame | Aaron Patterson | 2013-12-12 | 1 | -6/+10 |
|/ / | |||||
* | | remove more nil checks | Aaron Patterson | 2013-12-12 | 1 | -6/+5 |
| | | |||||
* | | remove nil check | Aaron Patterson | 2013-12-12 | 2 | -7/+11 |
| | | | | | | | | | | calling replace_keys could possibly do a nil check twice, this commit reduces it to once. | ||||
* | | remove the nil check from set_inverse_instance | Aaron Patterson | 2013-12-12 | 4 | -4/+7 |
| | | | | | | | | | | methods that call set_inverse_instance with a record will not have to pay the cost of a nil check on every call | ||||
* | | make sure cached table name is a string. fixes #12582 | Aaron Patterson | 2013-12-12 | 3 | -1/+12 |
| | | |||||
* | | Merge pull request #13293 from akshay-vishnoi/typo | Carlos Antonio da Silva | 2013-12-12 | 2 | -5/+5 |
|\| | | | | | Spelling and Grammar checks [ci skip] | ||||
| * | Spelling and Grammar checks | Akshay Vishnoi | 2013-12-12 | 2 | -5/+5 |
| | | |||||
* | | Merge pull request #13291 from strzibny/new_unique_constraint | Yves Senn | 2013-12-12 | 1 | -1/+5 |
|\ \ | |/ |/| | Translate new unique constraint error message for sqlite >= 3.8.2 | ||||
| * | Translate new unique constraint for sqlite >= 3.8.2 | Josef Stribny | 2013-12-12 | 1 | -1/+5 |
| | | |||||
* | | Get rid of hack for freezing time on AR tests | Carlos Antonio da Silva | 2013-12-12 | 2 | -23/+5 |
| | | | | | | | | | | We can now make use of the existent #travel/#travel_to helper methods added to AS test case and available in all tests. | ||||
* | | Changelog improvements [ci skip] | Carlos Antonio da Silva | 2013-12-12 | 1 | -7/+7 |
| | | |||||
* | | Merge pull request #13264 from ↵ | Rafael Mendonça França | 2013-12-11 | 3 | -2/+16 |
|\ \ | | | | | | | | | | | | | laurocaetano/fix_dynamic_finder_with_reserved_words Prevent invalid code when using dynamic finders with reserved ruby word. | ||||
| * | | Prevent invalid code when using dynamic finders with Ruby's reserved words. | Lauro Caetano | 2013-12-11 | 3 | -2/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The dynamic finder was creating the method signature with the parameters name, which may have reserved words and this way creating invalid Ruby code. Closes: #13261 Example: # Before Dog.find_by_alias('dog name') # Was creating this method def self.find_by_alias(alias, options = {}) # After Dog.find_by_alias('dog name') # Will create this method def self.find_by_alias(_alias, options = {}) | ||||
* | | | Move the parameter normalization to the initialize method | Rafael Mendonça França | 2013-12-11 | 1 | -4/+5 |
| | | | | | | | | | | | | | | | activerecord-deprecated_finders expects the parameters denormalized in its initialize method | ||||
* | | | Revert the whole refactoring in the association builder classes. | Rafael Mendonça França | 2013-12-11 | 8 | -47/+64 |
| | | | | | | | | | | | | This is to get activerecord-deprecated_finders work again | ||||
* | | | Mark the arguments needed by activerecord-deprecated_finders with a TODO | Rafael Mendonça França | 2013-12-11 | 4 | -2/+20 |
| | | | |||||
* | | | Revert "Merge pull request #12518 from vipulnsward/remove_count_options" | Rafael Mendonça França | 2013-12-11 | 5 | -17/+20 |
| | | | | | | | | | | | | | | | | | | | | | It is needed for activerecord-depecated_finders This reverts commit dcff027a5242b20c0c90eb062dddb22ccf51aed9, reversing changes made to 3a2093984ff49d86db1efeff0c7581e788ecfb9f. | ||||
* | | | Bring back the valid_options class accessor | Rafael Mendonça França | 2013-12-11 | 6 | -9/+14 |
|/ / | | | | | | | It is need in activerecord-deprecated_finders | ||||
* | | Merge pull request #13236 from jetthoughts/13230_type_cast_bug_in_agr_functions | Yves Senn | 2013-12-10 | 3 | -1/+23 |
|\ \ | | | | | | | Fix type cast on group sum with custom expression | ||||
| * | | Fix type cast on group sum with custom expression | Paul Nikitochkin | 2013-12-10 | 3 | -1/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | | For PG adapters with custom expression and grouped result of aggregate functions have not found correct column type for it. Extract column type from query result. Closes: #13230 | ||||
* | | | Fix warnings on mysql2 explain test | Carlos Antonio da Silva | 2013-12-10 | 1 | -3/+3 |
| | | | |||||
* | | | Merge pull request #13248 from yahonda/support_mysql573_explain | Jeremy Kemper | 2013-12-09 | 1 | -3/+3 |
|\ \ \ | | | | | | | | | Support MySQL 5.7 explain | ||||
| * | | | Support MySQL 5.7 explain | Yasuo Honda | 2013-12-10 | 1 | -3/+3 |
| |/ / | |||||
* / / | Remove `DEFAULT NULL` for primary key column to support MySQL 5.7.3 | Yasuo Honda | 2013-12-10 | 3 | -7/+7 |
|/ / | | | | | | | Since MySQL 5.7.3 m13 does now allow primary key column is null. | ||||
* | | fix typo, "state_state" should be "stale_state" [ci skip] | Scott M | 2013-12-07 | 1 | -1/+1 |
| | | |||||
* | | Very tiny typo fix [ci skip] | Robin Dupret | 2013-12-06 | 1 | -1/+1 |
| | | |||||
* | | _enum_methods_module should be kept private | Godfrey Chan | 2013-12-05 | 1 | -6/+7 |
| | | |||||
* | | Make clear that the enum array should not be changed once defined. [ci skip] | Godfrey Chan | 2013-12-05 | 1 | -1/+12 |
| | |