rails.git - Mirror of official rails repo with custom fixes.

	Commit message (Collapse)	Author	Age	Files	Lines
*	pg, support default values for enum types. Closes #7814.	Yves Senn	2014-05-30	4	-2/+24
\| \| \| \| \|	This is an intermediate solution. It is related to the refactoring @sgrif is making and will change in the future.
*	pg, `default_sequence_name` respects schema. Closes #7516.	Yves Senn	2014-05-30	3	-10/+12
\|
*	Merge pull request #11896 from nkondratyev/fix_pg_columns_for_distinct	Yves Senn	2014-05-30	3	-1/+17
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fixed #columns_for_distinct of postgresql adapter Conflicts: activerecord/CHANGELOG.md
\| *	Fixed `columns_for_distinct` of postgresql adapter	Nikolay Kondratyev	2013-08-15	3	-1/+17
\| \|
* \|	pg, `reset_pk_sequence!` respects schemas. Closes #14719.	Yves Senn	2014-05-30	5	-11/+34
\| \|
* \|	pg, `PostgreSQL::Name` to hold schema qualified names.	Yves Senn	2014-05-30	4	-19/+96
\| \|
* \|	Don't reference comments that do not exist	Sean Griffin	2014-05-29	1	-2/+0
\| \|
* \|	Move `type_cast_for_write` behavior over to the serialized type object	Sean Griffin	2014-05-29	6	-86/+47
\| \|
* \|	Refactor serialized types to be partially defined as custom properties	Sean Griffin	2014-05-29	10	-50/+52
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Many of the methods defined in `AttributeMethods::Serialization` can be refactored onto this type as well, but this is a reasonable small step. Removes the `Type` class, and the need for `decorate_columns` to handle serialized types.
* \|	Result sets never override a model's column type	Sean Griffin	2014-05-29	3	-1/+51
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	MySQL and PostgreSQL provide a column type override in order to properly type cast computed columns included in a result set. This should never override the known types of full fledged columns. In addition to messing up computed properties, this would have led to inconsistent behavior between a record created with `new`, and a record created with `last` on the mysql adapter in the following cases: - `tinyint(1)` with `emulate_booleans` set to `false` - `text`, `string`, `binary`, and `decimal` columns
* \|	Merge pull request #15397 from sgrif/sg-column-class	Yves Senn	2014-05-29	5	-6/+15
\|\ \ \| \| \| \| \| \|	Ensure we always use instances of the adapter specific column class
\| * \|	Ensure we always use instances of the adapter specific column class	Sean Griffin	2014-05-28	5	-6/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Create a consistent API across adapters for building new columns - Use it for custom properties so we don't get `UndefinedMethodError`s in stuff I'm implementing elsewhere.
* \| \|	Use github url for homepage of log4r [ci skip]	Zachary Scott	2014-05-28	1	-1/+1
\|/ /
* \|	Merge pull request #15392 from arthurnn/move_open_transactions	Rafael Mendonça França	2014-05-28	2	-4/+4
\|\ \ \| \| \| \| \| \|	Keep closer to other methods that touch @transaction
\| * \|	Keep closer to other methods that touch @transaction	Arthur Neves	2014-05-28	2	-4/+4
\| \| \|
* \| \|	Maintain column order when overriding existing columns	Sean Griffin	2014-05-28	2	-3/+13
\|/ / \| \| \| \| \| \| \| \| \| \|	Working towards re-implementing serialized attributes to use the properties API exposed the need for this, as serializing a column shouldn't change the order of the columns.
* \|	Merge pull request #15389 from sgrif/sg-property-inheritance	Rafael Mendonça França	2014-05-28	2	-5/+26
\|\ \ \| \| \| \| \| \|	Ensure custom properties work correctly with inheritance
\| * \|	Ensure custom properties work correctly with inheritance	Sean Griffin	2014-05-28	2	-5/+26
\| \| \|
* \| \|	Merge pull request #15370 from sgrif/sg-type-namespace	Rafael Mendonça França	2014-05-28	41	-643/+592
\|\ \ \ \| \| \| \| \| \| \| \|	Move types to the top level `ActiveRecord` namespace
\| * \| \|	Move types to the top level `ActiveRecord` namespace	Sean Griffin	2014-05-27	41	-643/+592
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`ActiveRecord::ConnectionAdapters::Type::Value` => `ActiveRecord::Type::Value`
* \| \| \|	Formatting of content from b1db615 [ci skip]	Zachary Scott	2014-05-28	1	-3/+7
\| \| \| \|
* \| \| \|	Merge pull request #15380 from Gaurav2728/gaurav-transaction_isolation_error	Zachary Scott	2014-05-28	1	-0/+3
\|\ \ \ \ \| \|_\|/ / \|/\| \| \|	Initial doc for TransactionIsolationError [ci skip]
\| * \| \|	Initial doc for TransactionIsolationError [ci skip]	Gaurav Sharma	2014-05-28	1	-0/+3
\| \| \| \|
* \| \| \|	Merge pull request #15387 from sgrif/sg-remove-column-coder	Santiago Pastorino	2014-05-28	2	-34/+1
\|\ \ \ \ \| \|/ / / \|/\| \| \|	Remove unused `Column#coder`
\| * \| \|	Remove unused `Column#coder`	Sean Griffin	2014-05-28	2	-34/+1
\| \|/ / \| \| \| \| \| \| \| \| \| \| \| \|	It appears this property was added, but never actually used. It would be broken if it were, as it only type casts one way.
* / /	pg, keep `hstore` and `json` attributes as `Hash` in @attributes.	Yves Senn	2014-05-28	5	-2/+39
\|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The solution presented in this patch is not efficient. We should replace it in the near future. The following needs to be worked out: * Is `@attributes` storing the Ruby or SQL representation? * `cacheable_column?` is broken but `hstore` and `json` rely on that behavior Refs #15369. /cc @sgrif @rafaelfranca
* \|	Merge pull request #15374 from sgrif/sg-private-properties	Rafael Mendonça França	2014-05-27	12	-30/+12
\|\ \ \| \| \| \| \| \|	Remove AR Properties from the public API
\| * \|	Remove AR Properties from the public API	Sean Griffin	2014-05-27	12	-30/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Making this part of the public API was premature, let's make it private again while I continue to work on the surrounding code.
* \| \|	Add CHANGELOG entry for #15269 [ci skip]	Rafael Mendonça França	2014-05-27	1	-0/+4
\| \| \|
* \| \|	Merge pull request #15269 from arunagw/aa-fixes-8930	Rafael Mendonça França	2014-05-27	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \|	rake railties:install:migrations respects the order of railties
\| * \| \|	rake railties:install:migrations respects the order of railties	Arun Agrawal	2014-05-27	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This PR fixes #8930 and some stuff from #8985
* \| \| \|	Add test case for clear mappings	Akshay Vishnoi	2014-05-28	1	-0/+10
\| \| \| \|
* \| \| \|	Test Case - Change method name	Akshay Vishnoi	2014-05-28	1	-1/+1
\| \| \| \|
* \| \| \|	Merge pull request #15371 from sgrif/sg-silence-deprecation-warning	Rafael Mendonça França	2014-05-27	1	-0/+3
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Silence deprecation warning in test
\| * \| \| \|	Silence deprecation warning in test	Sean Griffin	2014-05-27	1	-0/+3
\| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \|	Missed a case that only occured for mysql/mysql2
* \| \| \|	Merge pull request #14834 from al2o3cr/issue14155	Aaron Patterson	2014-05-27	3	-2/+31
\|\ \ \ \ \| \|/ / / \|/\| \| \|	Correctly alias table names when joining more than once
\| * \| \|	WIP: pass existing joins to construct_join_dependency	Matt Jones	2014-05-16	3	-2/+31
\| \| \| \|
* \| \| \|	Merge pull request #15295 from sgrif/sg-deprecate-decimals	Rafael Mendonça França	2014-05-27	7	-2/+29
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Deprecate decimal columns being automatically treated as integers
\| * \| \| \|	Deprecate decimal columns being automatically treated as integers	Sean Griffin	2014-05-27	7	-2/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	With ActiveRecord::Properties, we now have a reasonable path for users to continue to keep this behavior if they want it. This is an edge case that has added a lot of complexity to the code base.
* \| \| \| \|	Merge pull request #15358 from arthurnn/redefine_habtm_fix	Rafael Mendonça França	2014-05-27	3	-25/+46
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fix redefine a has_and_belongs_to_many inside inherited class
\| * \| \| \| \|	Fix redefine a has_and_belongs_to_many inside inherited class	Arthur Neves	2014-05-27	3	-25/+46
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	After ad7b5efb55bcc2e0ccd3e7f22a81e984df8676d1, which changed how has_an_belongs_to_many used to work, we start raising an error when redefining the same has_an_belongs_to_many association. This commits fix that regression. [Fixes #14983]
* \| \| \| \| \|	Merge pull request #15359 from kuldeepaggarwal/f-remove-unwanted_to_sym	Yves Senn	2014-05-27	1	-1/+1
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|	remove unwanted `to_sym` call.
\| * \| \| \| \|	remove unwanted `to_sym` call.	Kuldeep Aggarwal	2014-05-26	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Fix syntax error from 5eae77c	Zachary Scott	2014-05-26	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Move test to the proper file	Rafael Mendonça França	2014-05-26	2	-7/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	All preload tests are in the eager_test file
* \| \| \| \| \|	Add test case for b13d260	Rafael Mendonça França	2014-05-26	1	-0/+9
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #15301 from zzak/issue_15212	Rafael Mendonça França	2014-05-26	1	-0/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Skip if the association was already loaded.
\| * \| \| \| \| \|	Skip if the association was already loaded.	Zachary Scott	2014-05-24	1	-0/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #15353 from sgrif/sg-mysql-condition	Rafael Mendonça França	2014-05-26	1	-2/+0
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unnecessary branch from quoting in Mysql
\| * \| \| \| \| \| \|	Remove unnecessary branch from quoting in Mysql	Sean Griffin	2014-05-26	1	-2/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is already the behavior for `BigDecimal` in the abstract adapter.