aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #21742 from vngrs/fix_ar_locking_docSean Griffin2015-09-231-2/+2
|\ | | | | Fix ActiveRecord::Locking doc [ci skip]
| * Fix ActiveRecord::Locking doc [ci skip]Mehmet Emin İNAÇ2015-09-241-2/+2
|/
* Merge pull request #21218 from repinel/fix-as-callback-terminatorKasper Timm Hansen2015-09-237-36/+45
|\ | | | | WIP: Fix the AS::Callbacks terminator regression from 4.2.3
| * Fix the AS::Callbacks terminator regression from 4.2.3Roque Pinel2015-09-227-36/+45
| | | | | | | | | | | | Rails 4.2.3 AS::Callbacks will not halt chain if `false` is returned. That is the behavior of specific callbacks like AR::Callbacks and AM::Callbacks.
* | Merge pull request #21736 from eliotsykes/document-bearer-prefixKasper Timm Hansen2015-09-231-5/+7
|\ \ | | | | | | Document Bearer prefix for Authorization header [ci skip]
| * | Document Bearer prefix for Authorization header [ci skip]Eliot Sykes2015-09-231-5/+7
| | |
* | | Merge pull request #21721 from ronakjangir47/remove_mocha_railties_app_generatorKasper Timm Hansen2015-09-231-87/+106
|\ \ \ | | | | | | | | Removed Mocha from app generators tests
| * | | Removed Mocha from app generators testsRonak Jangir2015-09-231-87/+106
| |/ /
* | | Merge pull request #21739 from ronakjangir47/subsecond_precision_supportedSean Griffin2015-09-231-0/+1
|\ \ \ | | | | | | | | skipped assertion on datetime seconds precision as it is only valid for newer mysql verions
| * | | skipped assertion on datetime seconds precision as it is only valid for ↵Ronak Jangir2015-09-241-0/+1
| |/ / | | | | | | | | | newer mysql versions
* | | don't access the response object before a request was madeAaron Patterson2015-09-231-1/+10
| | | | | | | | | | | | | | | | | | | | | It doesn't make sense to access the response object before a request is made (how was a response object created without making a request?) This commit splits testing default headers and default header mutation tests and removes access to the pre-request response object.
* | | split cookie testsAaron Patterson2015-09-231-1/+6
| | | | | | | | | | | | these should really be multiple tests.
* | | don't mutate a response object after to_aAaron Patterson2015-09-231-0/+2
|/ / | | | | | | | | | | When the response object is `to_a`'d, that means it's been written to the socket. It doesn't make sense to mutate the response object after it's been written (and this may raise an exception in the future).
* | Further remove reliance on subsecond precision in testsSean Griffin2015-09-231-6/+14
| |
* | Don't rely on subsecond precision being applied in testsSean Griffin2015-09-235-5/+24
| | | | | | | | | | | | When I originally reviewed the #20317, I believe these changes were present, but it appears that it was later updated so that they were removed. Since Travis hadn't re-run the build, this slipped through.
* | 0 precision is not the same as no precisionSean Griffin2015-09-231-8/+28
| | | | | | | | | | | | | | And we are passing them as separate types in the query, which means 0 precision is still not supported by older versions of MySQL. I also missed a handful of other cases where they need to be conditionally applied.
* | Don't attempt to specify datetime precision unless supportedSean Griffin2015-09-233-13/+32
| | | | | | | | | | | | | | | | | | Specifically, versions of MySQL prior to 5.6 do not support this, which is what's used on Travis by default. The method `mysql_56?` appeared to only ever be used to conditionally apply subsecond precision, so I've generalized it and used it more liberally. This should fix the test failures caused by #20317
* | Merge pull request #20317Sean Griffin2015-09-236-35/+67
|\ \ | | | | | | | | | | | | AR: take precision into count when assigning a value to timestamp attribute
| * | Fixed taking precision into count when assigning a value to timestamp attributeBogdan Gusiev2015-09-236-35/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Timestamp column can have less precision than ruby timestamp In result in how big a fraction of a second can be stored in the database. m = Model.create! m.created_at.usec == m.reload.created_at.usec # => false # due to different seconds precision in Time.now and database column If the precision is low enough, (mysql default is 0, so it is always low enough by default) the value changes when model is reloaded from the database. This patch fixes that issue ensuring that any timestamp assigned as an attribute is converted to column precision under the attribute.
* | | Merge pull request #21732 from amitsuroliya/mime_docsAbdelkader Boudih2015-09-232-6/+6
|\ \ \ | | | | | | | | Updated Mime Negotiations docs [ci skip]
| * | | Updated Mime Negotiations docs [ci skip]amitkumarsuroliya2015-09-232-6/+6
|/ / / | | | | | | As we all know that Accessing mime types via constants is deprecated. Now, we are using `Mime::Type[:JSON]` instead of `Mime::JSON`
* | | Merge pull request #21729 from y-yagi/fix_warning_in_arKasper Timm Hansen2015-09-231-1/+1
|\ \ \ | | | | | | | | remove warning from Calculations#sum
| * | | remove warning from Calculations#sumyuuji.yaginuma2015-09-231-1/+1
|/ / / | | | | | | | | | | | | | | | | | | This removes the following warning. ``` activerecord/lib/active_record/relation/calculations.rb:74: warning: `&' interpreted as argument prefix ```
* | | Merge pull request #21723 from y-yagi/fix_deprecate_msg_in_mailers_controllerAndrew White2015-09-232-3/+3
|\ \ \ | | | | | | | | stop using deprecated method in mailers controller
| * | | stop using deprecated method in mailers controlleryuuji.yaginuma2015-09-232-3/+3
| | | | | | | | | | | | | | | | Accessing mime types via constants is deprecated.
* | | | Merge pull request #21725 from yui-knk/fix/ar_sumRafael Mendonça França2015-09-231-3/+3
|\ \ \ \ | | | | | | | | | | Fix arguments of `AR::Calculations#sum`
| * | | | Fix arguments of `AR::Calculations#sum`yui-knk2015-09-231-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Arguments of `#sum` does not match with other shortcuts methods (count, average, minimum, and maximum). This commit fix these two points: * call `super` with only block arguments First argument of `super` method, `Enumerable#sum`, is `identity` and first argument of `AR::Calculations#sum` is `column_name`. `Enumerable#sum` does not expect `column_name` to be passed. * Change first argument of `sum` from array arguemnt to single argument to match other shortcuts methods. When `sum` accept array arguemnt, user can pass multi arguments and an exception is raised from `calculate`.
* | | | | Merge pull request #21728 from cllns/fix-engine-pathSean Griffin2015-09-221-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Remove leading slash from path
| * | | | | Remove leading slash from pathSean Collins2015-09-221-1/+1
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | The leading slash denotes an absolute path, rather than a relative one (which is more popular) [ci skip]
* | | | | Merge pull request #21727 from yui-knk/fix/remove_unused_argsSean Griffin2015-09-221-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | Remove not used argument `table_name` of `sanitize_sql_for_conditions`
| * | | | Remove not used argument `table_name` of `sanitize_sql_for_conditions`yui-knk2015-09-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This argument was needen when `sanitize_sql_for_conditions` internally called `sanitize_sql_hash_for_conditions`. But `sanitize_sql_hash_for_conditions` was deprecated (https://github.com/rails/rails/commit/eb921000a11bc87a3b001164fc367b84aee584c5) and deleted (https://github.com/rails/rails/commit/3a59dd212315ebb9bae8338b98af259ac00bbef3) (https://github.com/rails/rails/commit/4bd089f1d93fa168b0ae17dd8c92a5157a2537d7).
* | | | | Merge pull request #21726 from yui-knk/test/named_bind_aritySean Griffin2015-09-221-3/+9
|\ \ \ \ \ | |/ / / / |/| | | | Add tests for sanitize named bind arity
| * | | | Add tests for sanitize named bind arityyui-knk2015-09-231-3/+9
|/ / / /
* | | | ask the request object for the sessionAaron Patterson2015-09-221-1/+1
| | | | | | | | | | | | | | | | | | | | The flash middleware shouldn't know how to look up the session object. Just ask the request for that information.
* | | | don't deal with `nil` valuesAaron Patterson2015-09-222-1/+7
| |/ / |/| | | | | | | | | | | We can know whether or not there is a content type object, and just exit early. There is no need to `try` so hard.
* | | Merge pull request #21722 from ronakjangir47/test_delivery_methodsYves Senn2015-09-221-2/+4
|\ \ \ | | | | | | | | Added assertion for error messages for nil and unknown delivery methods
| * | | Added assertion for error messages for nil and unknown delivery methodsRonak Jangir2015-09-221-2/+4
| | | | | | | | | | | | As `deliver_now` `RuntimeError` for both nil & unknown delivery method so it’s good to have assertion for error messages
* | | | Merge pull request #21715 from rails/introduce_data_sourcesYves Senn2015-09-2216-34/+108
|\ \ \ \ | | | | | | | | | | introduce `conn.data_source_exists?` and `conn.data_sources`.
| * | | | introduce `conn.data_source_exists?` and `conn.data_sources`.Yves Senn2015-09-2216-34/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These new methods are used from the Active Record model layer to determine which relations are viable to back a model. These new methods allow us to change `conn.tables` in the future to only return tables and no views. Same for `conn.table_exists?`. The goal is to provide the following introspection methods on the connection: * `tables` * `table_exists?` * `views` * `view_exists?` * `data_sources` (views + tables) * `data_source_exists?` (views + tables)
* | | | | Merge pull request #21718 from thiagoaugusto/patch-4Rafael Mendonça França2015-09-221-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Update i18n.md [ci skip]
| * | | | | Update i18n.md [ci skip]Thiago Augusto2015-09-221-2/+2
|/ / / / /
* | | | | Remove unneeded generator variable.Kasper Timm Hansen2015-09-221-1/+0
| | | | |
* | | | | Merge pull request #21356 from ronakjangir47/remove_mocha_railtiesKasper Timm Hansen2015-09-222-15/+35
|\ \ \ \ \ | |_|_|/ / |/| | | | Removed mocha from Railites PluginGeneratorTest
| * | | | Removed mocha from Railites PluginGeneratorTestRonak Jangir2015-09-222-15/+35
| | | | |
* | | | | tests, use `if_exists: true` instead of `rescue nil`.Yves Senn2015-09-221-1/+1
| | | | |
* | | | | AMo typosAkira Matsuda2015-09-222-3/+3
|/ / / /
* | | | Merge pull request #21714 from thiagoaugusto/patch-2Richard Schneeman2015-09-221-2/+2
|\ \ \ \ | |/ / / |/| | | Update routing.md
| * | | Update routing.mdThiago Augusto2015-09-221-2/+2
|/ / /
* | | fix `bin/test -a sqlite3_mem`.Yves Senn2015-09-221-19/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should not run MysqlAdapter tests when running with `sqlite3_mem`. This also moves the test-case outside the MysqlAdapter namespace. This will prevent the following error when running everything: ``` 1) Error: TestAdapterWithInvalidConnection#test_inspect_on_Model_class_does_not_raise: TypeError: superclass mismatch for class MysqlAdapter ```
* | | Merge pull request #20569 from theSteveMitchell/masterYves Senn2015-09-223-15/+31
|\ \ \ | |_|/ |/| | | | | Check mysql structure_load for errors
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 12:15:28 +0000