aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* CollectionProxy uses the arel of its association's scope.Jefferson Lai2014-04-024-0/+23
| | | | | | CollectionProxy should be able to reuse the behavior (methods) of its parent class, but with its own state. This change allows CollectionProxy to use the arel object corresponding to its association's scope.
* cleanup, `reset_pg_session` in range_test.rbYves Senn2014-04-021-2/+5
| | | | | Also do not use transactional fixtures. We drop the type and the table after every run, so there is nothing for the transaction to clean up.
* Merge pull request #14550 from tgxworld/fix_failing_enum_test_random_orderYves Senn2014-04-023-9/+21
|\ | | | | Allow postgresql enum_test to be run in random order.
| * Allow postgresql enum_test to be run in random order.Guo Xiang Tan2014-04-013-9/+21
| | | | | | | | Creating and dropping similar tables within the same connection causes postgresql to look up old values in the cache of tables which have already been dropped.
* | Merge pull request #14560 from abwinkler999/typo-in-RELEASING_RAILSRafael Mendonça França2014-04-021-1/+1
|\ \ | |/ |/| Changed 'so' to 'see'
| * Changed 'so' to 'see'Benjamin Winkler2014-04-021-1/+1
|/
* Merge branch 'rmc'Aaron Patterson2014-04-013-30/+24
|\ | | | | | | | | | | | | | | * rmc: push move_string in to `move` combine move_regexp and move_string so we only loop over states once do not create memo objects since we'll just throw them away only ask if `t` is empty once.
| * push move_string in to `move`Aaron Patterson2014-04-011-14/+12
| |
| * combine move_regexp and move_string so we only loop over states onceAaron Patterson2014-04-011-9/+6
| |
| * do not create memo objects since we'll just throw them awayAaron Patterson2014-04-012-9/+11
| |
| * only ask if `t` is empty once.Aaron Patterson2014-04-011-4/+1
| |
* | Clarify 'database does not exist' message and implementation.Jeremy Kemper2014-04-016-26/+23
| | | | | | | | | | | | | | | | | | | | | | * Clarify what the situation is and what to do. * Advise loading schema using `rake db:setup` instead of migrating. * Use a rescue in the initializer rather than extending the error message in-place. * Preserve the original backtrace of other errors by using `raise` rather than raising again with `raise error`. References 0ec45cd15d0a2f5aebc75e23d841b6c12f3ba763
* | fix, adjust OID query without range support to include required fields.Yves Senn2014-04-011-3/+4
| | | | | | | | | | This is a follow-up fix to f7a6b115fea9f675190a79b701c7034214678f19 and 06082f66d541e581110406bbac3bc395bace3f86
* | refactor, use `typtype` instead of `typinput` to segment PG types.Yves Senn2014-04-011-3/+3
| |
* | PostgreSQL, register custom domains. Closes #14305.Yves Senn2014-04-013-1/+68
| | | | | | | | | | | | | | This patch registers custom domains in our OID-type_map. They will behave exactly as the type specified by `pg_type.typbasetype`. /cc @matthewd
* | Merge pull request #14513 from senny/pg/responsible_oidRafael Mendonça França2014-04-016-107/+104
|\ \ | | | | | | PostgreSQL determine `Column#type` through corresponding OID. #7814
| * | PostgreSQL determine `Column#type` through corresponding OID. #7814Yves Senn2014-04-016-107/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I ran the whole test suite and compared the old to the new types. Following is the list of types that did change with this patch: ``` DIFFERENT TYPE FOR mood: NEW: enum, BEFORE: DIFFERENT TYPE FOR floatrange: NEW: floatrange, BEFORE: float ``` The `floatrange` is a custom type. The old type `float` was simply a coincidence form the name `floatrange` and our type-guessing.
* | | Merge pull request #14548 from eileencodes/refactor_capture_sql_in_testsRafael Mendonça França2014-03-311-3/+1
|\ \ \ | | | | | | | | refactor assert_sql query to reuse capture_sql
| * | | refactor assert_sql query to reuse capture_sqleileencodes2014-03-311-3/+1
|/ / / | | | | | | | | | | | | | | | | | | set assert_sql to reuse the capture_sql method from above instead of repeating the code in response to comments on issue #14546
* | | Merge pull request #14546 from ↵Aaron Patterson2014-03-313-2/+23
|\ \ \ | |_|/ |/| | | | | | | | eileencodes/fix_delete_all_to_not_use_IN_statement Fix delete all to not produce sql in statement
| * | fix delete_all to remove records directlyeileencodes2014-03-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When delete_all is run on a CollectionProxy and has a dependency of delete_all the SQL that is produced has an IN statement. (DELETE FROM `associated_model` where `associated_model` .`parent_id` = 1 AND `associated_model`.`id` IN (1, 2, 3...)). This only happens if the association is not loaded (both loaded and non-loaded delete_all should behave the same. This is a huge problem when it comes to deleting many records because the query becomes very slow. Instead the SQL produced should be (DELETE FROM `assoicated_model` where `associated_model`.`parent_model_id`=1). I fixed this by making sure the check for loaded and destroy also makes sure that the dependent is not delete_all, so the conditional goes to the else and deletes the records directly without the IN statement.
| * | add test to compare sql statements in delete_all queryeileencodes2014-03-311-1/+16
| | | | | | | | | | | | | | | | | | delete_all sql if an association is not loaded should behave the same as if the association is loaded. This test ensures the SQL statements are exactly the same.
| * | add capture_sql method to compare sql statements and compareeileencodes2014-03-311-0/+6
| |/ | | | | | | | | Other methods compare specific patterns, this method outputs the actual sql query that is generated.
* | Merge pull request #14539 from lparedes/masterGuillermo Iguaran2014-03-312-3/+23
|\ \ | | | | | | Do not overwrite selected and disabled attributes
| * | Add test for selected and disabled custom attributes in options_for_selectLaura Paredes2014-03-311-1/+21
| | |
| * | Do not overwrite selected and disabled attributesLaura Paredes2014-03-301-2/+2
| | |
* | | Merge pull request #14542 from arthurnn/fix_release_taskRafael Mendonça França2014-03-311-2/+2
|\ \ \ | | | | | | | | Fix release task
| * | | Fix release taskArthur Neves2014-03-311-2/+2
|/ / / | | | | | | | | | | | | Add a parentheses. related: b4c96490eeb1fbb944e116c7703dd528b37fc08a
* | | Merge pull request #14532 from thedarkone/polymorphic-preload-fixAaron Patterson2014-03-313-34/+28
|\ \ \ | |_|/ |/| | Fix polymorphic preloads on NOT NULL _type columns
| * | Simplify Preloader#grouped_records code.thedarkone2014-03-303-25/+17
| | | | | | | | | | | | | | | | | | The new method relies on AR::Associations::Association knowing about both reflection and a model class. AR::Base#association now raises a descriptive error when trying to access non-existent associations. Previously it would blow up with a confusing NoMethodError: undefined method `association_class' for nil:NilClass.
| * | Fix polymorphic preloads on NOT NULL _type columns.thedarkone2014-03-302-10/+12
| | | | | | | | | | | | Defer to Association#klass instead of having a custom/duplicate code.
* | | refactor, put `PostgreSQLColumn` into `column.rb`.Yves Senn2014-03-312-218/+222
| | | | | | | | | | | | | | | We have `connection_adapters/column.rb` so it's easier to remember that the column in in a separate file.
* | | Merge pull request #14535 from iancanderson/patch-1Arun Agrawal2014-03-311-1/+1
|\ \ \ | | | | | | | | Tiny doc fix for Strong Parameters
| * | | Tiny doc fix for Strong ParametersIan C. Anderson2014-03-301-1/+1
|/ / / | | | | | | - accepts_nested_attribute_for -> accepts_nested_attributes_for
* | | Merge pull request #14509 from lukesteensen/pg-array-defaultsRafael Mendonça França2014-03-305-3/+26
|\ \ \ | |_|/ |/| | remove calls to sql_type on pg columns
| * | fix mysql buildsLuke Steensen2014-03-301-1/+1
| | |
| * | fix bug on non empty defaults for pg array columnsLuke Steensen2014-03-304-2/+25
| | | | | | | | | | | | fixes #10613
* | | Merge pull request #14528 from planas/patch-1Rafael Mendonça França2014-03-301-0/+1
|\ \ \ | |/ / |/| | Require yaml explicitly on #database_configuration
| * | Require yaml explicitlyAdrià Planas2014-03-291-0/+1
| | |
* | | No need to call to_symRafael Mendonça França2014-03-301-2/+2
| |/ |/| | | | | It is already called inside type_to_sql method.
* | Merge pull request #14474 from tgxworld/table_cleanup_after_each_testYves Senn2014-03-302-167/+198
|\ \ | |/ |/| Refactor test to use DdlHelper.
| * Refactor test to use DdlHelper.Guo Xiang Tan2014-03-292-167/+198
|/ | | | | | | Follow-Up to https://github.com/rails/rails/pull/14400 This ensures that all tables are removed after each test and thereby allowing us to run the tests in a random order.
* Merge pull request #13890 from achempion/syntax-error-backtraceYves Senn2014-03-293-0/+47
|\ | | | | append link to bad code when error type is SyntaxError
| * Append link to bad code to backtrace when exception is SyntaxErrorBoris Kuznetsov2014-03-273-0/+47
| |
* | Merge pull request #14524 from tgxworld/fix_unsubscribe_from_notificationsYves Senn2014-03-294-12/+12
|\ \ | | | | | | | | | Fix tests not unsubscribing from Notifications.
| * | Fix tests not unsubscribing from Notifications.Guo Xiang Tan2014-03-284-8/+8
| | | | | | | | | | | | See https://github.com/rails/rails/blob/master/activesupport/lib/active_support/notifications.rb#L131
* | | Merge pull request #14526 from chancancode/fix_ar_equalityXavier Noria2014-03-293-8/+9
|\ \ \ | | | | | | | | Ensure we are returning either `true` or `false` for `#==`
| * | | Ensure we are returning either `true` or `false` for `#==`Godfrey Chan2014-03-293-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | 460eb83d cused `ActiveRecord::Base#==` to sometimes return `nil` in some cases, this ensures we always return a boolean value. Also fixed a similar problem in AR reflections.
* | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2014-03-294-2/+20
|\ \ \ \ | |/ / / |/| | |
| * | | copy edit [ci skip]Vijay Dev2014-03-291-1/+1
| | | |