Rafael Mendonça França
68a2a67116
Merge pull request #18948 from kaspth/automatic-collection-caching
...
Merge multi_fetch_fragments.
2015-02-25 11:54:07 -03:00
Abdelkader Boudih
5a6868b617
Merge pull request #19072 from y-yagi/mailer_doc
...
update docs to reflect that mailer generator add suffix to generated classes [ci skip]
2015-02-25 10:26:29 +00:00
yuuji.yaginuma
5ef18712c5
update docs to reflect that mailer generator add suffix to generated classes [ci skip]
2015-02-25 19:22:33 +09:00
Abdelkader Boudih
80ed46064d
Merge pull request #19069 from robertzk/patch-1
...
fix typo [ci-skip]
2015-02-25 06:45:00 +00:00
Robert Krzyzanowski
0e9e9d62aa
fix typo [ci-skip]
2015-02-25 00:25:58 -06:00
Aaron Patterson
149a1e16d4
cache quoted column names in SQLite3
...
we do this in other adapters, and it's a nice speed improvement
2015-02-24 18:28:00 -08:00
Aaron Patterson
4cd0da5c9a
Merge pull request #19068 from pda/ar-translate-exception-class-no-log
...
AR: translate_exception_class() no longer logs error.
2015-02-24 16:26:24 -08:00
Arthur Nogueira Neves
27ce16aa9b
Merge pull request #18936 from arthurnn/txn_callbacks
...
Spike on new transaction callbacks
2015-02-24 19:25:11 -05:00
Aaron Patterson
f4bee7ecbf
Merge pull request #17426 from jpcody/fixture_associations_fix
...
Rely on through table name in has_many fixtures
2015-02-24 16:24:38 -08:00
Arthur Neves
45755135fe
Rename tests
2015-02-24 19:16:45 -05:00
Arthur Neves
7d2a87281c
Add before_commit
...
[fixes #18903 ]
2015-02-24 19:16:28 -05:00
Arthur Neves
4a1bb9d0ce
Add transaction callbacks that wont enroll to the transaction.
...
Add after_commit_without_transaction_enrollment and
after_rollback_without_transaction_enrollment private callbacks so we
can create after_commit and after_rollback callbacks without having the
records automatic enrolled in the transaction.
[fixes #18904 ]
2015-02-24 19:13:56 -05:00
Paul Annesley
9c28529e71
AR: translate_exception_class() no longer logs error.
2015-02-24 15:44:37 -08:00
Jeremy Kemper
f4f94081dd
Add a failing test demonstrating regression with HEAD requests to Rack apps, re #18764
2015-02-24 15:59:21 -07:00
Robin Dupret
803ef74f9b
Tiny documentation edits [ci skip]
2015-02-24 22:22:15 +01:00
Sean Griffin
948424d556
Call attributes_for_update
in _update_record
w/ optimistic locking
...
Fixes #19057
2015-02-24 14:10:29 -07:00
Jeremy Kemper
26915a18b1
Fix c479480638508c20601af69ca46b5b606c2d5b4d to account for from_value -> from_clause in bdc5141652770fd227455681cde1f9899f55b0b9
2015-02-24 13:40:18 -07:00
Rafael Mendonça França
c479480638
Merge pull request #18744 from mfazekas/no-table-name-with-from
...
Fix appending table_name to select and group when used with subquery (fr...
2015-02-24 16:56:01 -03:00
Rafael Mendonça França
2bc72ae29c
Merge pull request #19066 from courtenay/mysql_boolean_limit_19065
...
Fix mysql's schema.rb dumper so it does not include limit on emulated booleans
2015-02-24 16:04:26 -03:00
Court3nay
ee87dbe048
Fix mysql's schema.rb dumper so it does not include limit on emulated boolean tinyint(1) fields
2015-02-24 13:59:00 -05:00
Rafael Mendonça França
a0580e974b
Merge pull request #19055 from ianks/model_name.to_json
...
activemodel: make .model_name json encodable
2015-02-24 15:04:20 -03:00
Ian Ker-Seymer
c5d62cb86d
activemodel: make .model_name json encodable
...
Previously, calling `User.model_name.to_json` would result in an infinite
recursion as `.model_name` inherited its `.as_json` behavior from Object. This
patch fixes that unexpected behavior by delegating `.as_json` to :name.
2015-02-24 11:00:32 -07:00
Rafael Mendonça França
efc6d49114
Use other controller instead of sharing the controller
2015-02-24 14:59:28 -03:00
Rafael Mendonça França
f6a31f5321
Make TestController available to all test classes
2015-02-24 14:14:15 -03:00
Rafael Mendonça França
6976e1da07
Merge pull request #19060 from iainbeeston/deprecate-skip-action-callback
...
Deprecate `AbstractController::Callbacks#skip_action_callback`
2015-02-24 13:33:16 -03:00
Yves Senn
72c1557254
rework disable_referential_integrity
for PostgreSQL.
...
[Toby Ovod-Everett & Andrey Nering & Yves Senn]
Closes #17726 .
Closes #10939 .
This patch makes three distinct modifications:
1. no longer fall back to disabling user triggers if system triggers can't be disabled
2. warn the user when referential integrity can't be disabled
3. restore aborted transactions when referential integrity can't be disabled
The motivation behind these changes is to make the behavior of Rails
transparent and less error-prone. To require superuser privileges is not optimal
but it's what Rails currently needs. Users who absolutely rely on disabling user triggers
can patch `disable_referential_integrity`.
We should investigate `SET CONSTRAINTS` as a possible solution which does not require
superuser privileges.
/cc @matthewd
2015-02-24 17:32:35 +01:00
Rafael Mendonça França
48dcaeab38
Merge pull request #19064 from kamipo/remove_unused_table
...
Remove unused table
2015-02-24 13:31:11 -03:00
Ryuta Kamizono
531063543b
Remove unused table
...
`postgresql_xml_data_type` table is used from nowhere.
2015-02-25 01:19:59 +09:00
Rafael Mendonça França
762bfee4a2
Merge pull request #19062 from kamipo/move_back_new_column_definition_into_table_definition
...
Move back `new_column_definition` into `TableDefinition`
2015-02-24 13:17:25 -03:00
Ryuta Kamizono
c137e54a78
Move back new_column_definition
into TableDefinition
...
Only `primary_key` should be extracted by d47357e in #19030 , but
`new_coclumn_definition` was also extracted because #17631 is merged
previously, then #19030 is auto merged without conflicts.
This commit is for move back `new_column_definition` into
`TableDefinition`.
2015-02-25 01:07:59 +09:00
Carlos Antonio da Silva
8adfd4fea7
Avoid creating an extra hash on the job test adapter
2015-02-24 07:23:05 -03:00
Iain Beeston
3fbc632843
Deprecate AbstractController::Callbacks#skip_action_callback
...
As part of #19029 , in future `skip_before_action`, `skip_after_action` and
`skip_around_action` will raise an ArgumentError if the specified
callback does not exist. `skip_action_callback` calls all three of these
methods and will almost certainly result in an ArgumentError. If anyone
wants to remove all three callbacks then they can still call the three
individual methods. Therefore let's deprecate `skip_action_callback` now
and remove it when #19029 is merged.
2015-02-24 08:17:24 +00:00
Rafael Mendonça França
29484043a7
Merge pull request #19052 from square/testing-singleton
...
`ActiveJob::QueueAdapters::TestAdapter` is now a singleton
2015-02-23 23:02:51 -03:00
Rafael Mendonça França
5cde302980
Merge pull request #19030 from kamipo/extract_short_hand_column_methods
...
Extract the short-hand column methods into `ColumnMethods`
2015-02-23 22:36:05 -03:00
Tamir Duberstein
802f855ecf
ActiveJob::QueueAdapters::TestAdapter
is now a singleton
...
Since `ActiveJob::TestHelper` globally sets
`ActiveJob::Base.queue_adapter` on setup, there is no benefit in
instantiating a new `TestAdapter` per tests. The original rationale was
to allow parallel tests to run without interference, but since they'd
all mutate the global `ActiveJob::Base.queue_adapter`, that was never
realized.
2015-02-23 17:31:36 -08:00
Santiago Pastorino
88b334ec69
Merge pull request #19038 from tchandy/cleaning_actionpack_tests
...
Cleaning actionpack tests
2015-02-23 17:39:20 -02:00
Rafael Mendonça França
acb12d3f4f
Merge pull request #17631 from kamipo/bigint_pk_support
...
Allow limit option for MySQL bigint primary key support.
2015-02-23 15:36:48 -03:00
Abdelkader Boudih
88c3bf4c48
Merge pull request #19048 from girasquid/patch-1
...
Fix typo
2015-02-23 18:34:43 +00:00
Luke Hutscal
37f0820fe6
Fix typo [ci skip]
...
I think this was supposed to be "roundTrip".
2015-02-23 13:32:54 -05:00
Ryuta Kamizono
b8d320c129
Allow :limit
option for MySQL bigint primary key support
...
Example:
create_table :foos, id: :primary_key, limit: 8 do |t|
end
# or
create_table :foos, id: false do |t|
t.column :id, limit: 8
end
2015-02-24 01:53:54 +09:00
Yves Senn
e71f5dad4e
some indenting and punctuation fixes. [ci skip]
2015-02-23 16:54:40 +01:00
Richard Schneeman
98d896e0ae
Merge pull request #18395 from shunsukeaida/improve_generator_name_suggestions
...
Improve generator name suggestions a bit.
2015-02-23 09:48:48 -06:00
Abdelkader Boudih
12afb78b1c
Merge pull request #19046 from yui-knk/fix/orm
...
[ci skip] Fix `Object-Relational` to `Object Relational`
2015-02-23 15:46:09 +00:00
yui-knk
53a9c669d4
[ci skip] Fix Object-Relational
to Object Relational
2015-02-24 00:39:59 +09:00
Rafael Mendonça França
069c03b2d1
Merge pull request #18937 from simi/optional-belongs-to
...
Require `belongs_to` by default.
2015-02-23 11:18:54 -03:00
Rafael Mendonça França
4938910445
Merge pull request #19032 from jvanbaarsen/changed-ajadapter-env-var
...
Changed the AJADAPTER to AJ_ADAPTER
2015-02-23 11:14:12 -03:00
Abdelkader Boudih
36fb65c5e3
Merge pull request #19044 from y-yagi/mime_type_doc
...
fix method name in mime type example. `Mime::Type.[]` doesn't exist. [ci skip]
2015-02-23 13:47:45 +00:00
yuuji.yaginuma
ea85b39536
fix method name in mime type example. Mime::Type.[]
doesn't exist. [ci skip]
2015-02-23 22:38:33 +09:00
Thiago Pradi
3c181f66a3
Removing old helper that was necessary for compatibility with Ruby 1.8.x
2015-02-22 23:42:51 -03:00
Thiago Pradi
48a0995c7e
Removing unused constants from abstract_unit
2015-02-22 23:42:50 -03:00