Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'refs/pull/2909/head' of https://github.com/rails/rails into rawr | Aaron Patterson | 2011-09-07 | 1 | -0/+6 |
| | | | | | | * https://github.com/rails/rails: Postgresql adapter: added current_schema check for table_exists? Postgresql adapter: added current_schema check for table_exists? | ||||
* | Add ROWNUM to test first and last to support Oracle. | Yasuo Honda | 2011-09-07 | 1 | -2/+2 |
| | |||||
* | Don't include any of includes, preload, joins, eager_load in the through ↵ | Jon Leighton | 2011-09-07 | 1 | -3/+5 |
| | | | | association scope. | ||||
* | Merge pull request #2485 from akaspick/exists_fix | Jon Leighton | 2011-09-07 | 1 | -0/+9 |
|\ | | | | | fix exists? to return false if passed nil (which may come from a missing | ||||
| * | fix exists? to return false if passed nil (which may come from a missing URL ↵ | Andrew Kaspick | 2011-08-10 | 1 | -0/+9 |
| | | | | | | | | param) | ||||
* | | Merge pull request #2897 from rsutphin/ar31-remove_connection | Aaron Patterson | 2011-09-06 | 1 | -1/+20 |
| | | | | | | | | Patch for issue #2820 | ||||
* | | Nested through associations: preloads from the default scope of a through ↵ | Jon Leighton | 2011-09-06 | 1 | -0/+9 |
| | | | | | | | | model should not be included in the association scope. (We're already excluding includes.) Fixes #2834. | ||||
* | | Ensure we are not comparing a string with a symbol in ↵ | Jon Leighton | 2011-09-06 | 1 | -0/+10 |
| | | | | | | | | HasManyAssociation#inverse_updates_counter_cache?. Fixes #2755, where a counter cache could be decremented twice as far as it was supposed to be. | ||||
* | | Disable active record marshalling tests on Ruby 1.8.7 on Travis CI, as they ↵ | Jon Leighton | 2011-09-06 | 2 | -0/+25 |
| | | | | | | | | have been failing intermittently for a long while due to what appears to be a Ruby bug. If anyone has the skills/expertise/time to debug this, please speak to the Travis guys. | ||||
* | | #first doesn't take an order in this test | Damien Mathieu | 2011-09-06 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #2877 from dmathieu/fix_tests_pg_18 | Santiago Pastorino | 2011-09-05 | 1 | -2/+2 |
|\ \ | | | | | | | Last orders the records by id | ||||
| * | | first and last orders the records by id | Damien Mathieu | 2011-09-06 | 1 | -2/+2 |
| | | | |||||
* | | | Merge pull request #2716 from jbbarth/fix_invert_rename_index | Aaron Patterson | 2011-09-05 | 1 | -2/+2 |
|\ \ \ | | | | | | | | | Fix bad options order in AR::Migration::CommandRecorder#invert_rename_index | ||||
| * | | | Fixed bad options order in ↵ | jbbarth | 2011-08-28 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | ActiveRecord::Migration::CommandRecorder#invert_rename_index | ||||
* | | | | Don't find belongs_to target when the foreign_key is NULL. Fixes #2828 | Georg Friedrich | 2011-09-05 | 1 | -0/+6 |
| |/ / |/| | | |||||
* | | | Use LIMIT sql word in last when it's possible | Damien Mathieu | 2011-09-05 | 1 | -1/+18 |
| | | | |||||
* | | | use LIMIT SQL word in first - Closes #2783 | Damien Mathieu | 2011-09-05 | 1 | -0/+9 |
| | | | |||||
* | | | Sort here to make sure the order is ok. | Arun Agrawal | 2011-09-05 | 1 | -1/+1 |
| | | | |||||
* | | | We need to recorder here. Need to drop the order from default scope. | Arun Agrawal | 2011-09-05 | 1 | -0/+20 |
| | | | | | | | | | Fixes #2832 | ||||
* | | | Revert "Fixes bug in ActiveRecord::QueryMethods, #1697" | Jon Leighton | 2011-09-04 | 1 | -5/+0 |
| | | | | | | | | | | | | | | | | | | This reverts commit 0df27c98d982ec87d2fb48cfda82694eb267993e. Reverted due to failing test, see #2845. | ||||
* | | | Need to add here to pass the test | Arun Agrawal | 2011-09-03 | 1 | -0/+1 |
| | | | | | | | | | As in previous commit it's removed. | ||||
* | | | * Psych errors with poor yaml formatting are proxied. Fixes #2645, #2731 | Aaron Patterson | 2011-09-01 | 1 | -0/+16 |
| | | | |||||
* | | | Fixes bug in ActiveRecord::QueryMethods, #1697 | Joshua Wehner | 2011-08-31 | 1 | -0/+5 |
| | | | | | | | | | Replace split on comma with a regexp that will reverse all ASC/DESC specifically | ||||
* | | | Ensure correct ordering of results in ↵ | Raimonds Simanovskis | 2011-08-30 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | test_update_all_with_joins_and_offset_and_order Last two asserts in this test assume that all_comments are ordered by posts.id and then by comments.id therefore additional ordering is added. Without it test was failing on Oracle which returned results in different order. | ||||
* | | | Merge pull request #2750 from rsim/fix_test_column_names_are_escaped_for_oracle | Jon Leighton | 2011-08-30 | 1 | -1/+7 |
| | | | | | | | | | | | | Fix test column names are escaped for oracle | ||||
* | | | Merge pull request #2021 from dasch/more_postgres_utils | Aaron Patterson | 2011-08-29 | 2 | -15/+18 |
|\ \ \ | | | | | | | | | Make #extract_schema_and_table an instance method in Utils | ||||
| * | | | Make #extract_schema_and_table an instance method in Utils | Daniel Schierbeck | 2011-07-09 | 2 | -15/+18 |
| | | | | | | | | | | | | | | | | Also, move the utils test into its own test case. | ||||
* | | | | The join_nodes must be passed to the JoinDependency initializer and ↵ | Jon Leighton | 2011-08-29 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | therefore counted by the alias tracker. This is because the association_joins are aliased on initialization and then the tables are cached, so it is no use to alias the join_nodes later. Fixes #2556. | ||||
* | | | | Create an AbstractMysqlAdapter to abstract the common code between ↵ | Jon Leighton | 2011-08-29 | 2 | -20/+20 |
| | | | | | | | | | | | | | | | | MysqlAdapter and Mysql2Adapter. | ||||
* | | | | fixing typo | Aaron Patterson | 2011-08-28 | 1 | -1/+1 |
| | | | | |||||
* | | | | clear and disable query cache when an exception is raised from called middleware | Aaron Patterson | 2011-08-28 | 1 | -1/+27 |
| |/ / |/| | | |||||
* | | | Force binary data inserted for a string data type to utf-8 and log an | Aaron Patterson | 2011-08-25 | 1 | -0/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | error. Strings tagged as binary will be stored in sqlite3 as blobs. It is an error to insert binary data to a string column, so an error is emitted in the log file. People are highly encouraged to track down the source of the binary strings and make sure that the encoding is set correctly before inserting to the database. | ||||
* | | | do not compute table names for abstract classes | Akira Matsuda | 2011-08-24 | 1 | -0/+4 |
| | | | |||||
* | | | Fix PredicateBuilder clobbering select_values in subquery. | Ernie Miller | 2011-08-20 | 1 | -0/+13 |
| | | | |||||
* | | | Fix assumption of primary key name in PredicateBuilder subquery. | Ernie Miller | 2011-08-20 | 1 | -0/+10 |
| | | | |||||
* | | | prevent sql injection attacks by escaping quotes in column names | Aaron Patterson | 2011-08-16 | 1 | -0/+17 |
| | | | |||||
* | | | Revert "Merge pull request #2543 from htanata/unused_require_in_ar_test" | Santiago Pastorino | 2011-08-16 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | This reverts commit 87152f2604e73b218df90befda576f0acfed0bbf, reversing changes made to 0d3615f04c79f6e90d8ab33fdfc920b8faac9cb8. | ||||
* | | | Remove unused require. | Hendy Tanata | 2011-08-16 | 1 | -1/+0 |
| | | | |||||
* | | | Support for multi-table updates with limits, offsets and orders | Jon Leighton | 2011-08-15 | 1 | -0/+30 |
| | | | |||||
* | | | Support updates with joins. Fixes #522. | Jon Leighton | 2011-08-15 | 1 | -0/+8 |
| | | | |||||
* | | | Ensure empty has_many :through association preloaded via joins is marked as ↵ | Jon Leighton | 2011-08-15 | 1 | -0/+8 |
| | | | | | | | | | | | | loaded. Fixes #2054. | ||||
* | | | Fix default scope thread safety. Thanks @thedarkone for reporting. | Jon Leighton | 2011-08-13 | 1 | -0/+18 |
| | | | |||||
* | | | Merge pull request #2514 from myronmarston/fix_active_record_observer_disabling | José Valim | 2011-08-13 | 1 | -0/+12 |
|\ \ \ | | | | | | | | | Allow ActiveRecord observers to be disabled. | ||||
| * | | | Allow ActiveRecord observers to be disabled. | Myron Marston | 2011-08-12 | 1 | -0/+12 |
| | |/ | |/| | | | | We have to use Observer#update rather than Observer#send since the enabled state is checked in #update before forwarding the method call on. | ||||
* / | | Work around for lolruby bug. (Read on for explanation.) | Jon Leighton | 2011-08-13 | 2 | -5/+14 |
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were experiencing CI test failures, for example: * 3-1-stable: http://travis-ci.org/#!/rails/rails/builds/79473/L407 * master: http://travis-ci.org/#!/rails/rails/builds/79507/L80 These failures only happened on 1.8.7-p352, and we were only able to reproduce on the Travis CI VM worker. We even tried creating a new 32 bit Ubuntu VM and running the tests on that, and it all worked fine. After some epic trial and error, we discovered that replacing the following: fuu = Marshal.load(Marshal.dump(fuu)) with: marshalled = Marshal.dump(fuu) fuu = Marshal.load(marshalled) seemed to prevent the failure. We have NO IDEA why this is. If anyone has some great insight to contribute then that is welcome. Otherwise, hopefully this will just help us get the CI green again. Many thanks to @joshk for help with sorting this out. | ||||
* | | Fully marshal AR::Base objects. Fixes #2431. | Jon Leighton | 2011-08-08 | 1 | -0/+13 |
| | | |||||
* | | Make it the responsibility of the connection to hold onto an ARel visitor ↵ | Jon Leighton | 2011-08-08 | 5 | -24/+19 |
| | | | | | | | | for generating SQL. This improves the code architecture generally, and solves some problems with marshalling. Adapter authors please take note: you now need to define an Adapter.visitor_for method, but it degrades gracefully with a deprecation warning for now. | ||||
* | | Fixed test_disable_referential_integrity on Oracle | Raimonds Simanovskis | 2011-08-08 | 1 | -0/+3 |
| | | | | | | On Oracle disable_referential_integrity before execution of block will disable foreign key constraints and after block will enable them but when constraints are enabled then they are validated. Therefore created record with invalid foreign key should be deleted before enabling foreign key constraints. | ||||
* | | Revert "to_key on a destroyed model should return nil". Closes #2440 | Santiago Pastorino | 2011-08-05 | 1 | -1/+1 |
| | | | | | | | | This reverts commit c5448721b5054b8a467958d60427fdee15eac604. | ||||
* | | Fix test for Rubinius | Santiago Pastorino | 2011-08-05 | 1 | -1/+1 |
| | |