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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2011-10-14	1	-2/+2
\| \|\ \ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \| \|	change activerecord query conditions example to avoid 'type' as column name	Steve Bourne	2011-10-12	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'Type' is a reserved column for STI. Changed conditions example to avoid using that column name as an example. The example isn't STI-related (and mentioning STI here is needless clutter), so changing to avoid accidentally encouraging users to use 'type' as a column name for other purposes.
\| * \| \| \| \| \| \| \| \| \| \| \|	Consider attempted action in exception message of ActiveRecord::StaleObjectError	Christian Bäuerlein	2011-10-14	2	-6/+7
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Includes stale record in StaleObjectError	Christian Bäuerlein	2011-10-14	3	-3/+29
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Rails 4 is just around the corner. Stuck with 1.8 until then.	Jeremy Kemper	2011-10-13	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Tests gotta run in 1.8 too	Jeremy Kemper	2011-10-13	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Fix that changing a store should mark the store attribute as changed	David Heinemeier Hansson	2011-10-25	2	-0/+6
\|/ / / / / / / / / / / /
* / / / / / / / / / / /	Added ActiveRecord::Base.store for declaring simple single-column key/value ↵	David Heinemeier Hansson	2011-10-13	7	-1/+93
\|/ / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	stores [DHH]
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #3274 from arunagw/warning_removed_mysql2	Vijay Dev	2011-10-10	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ambiguous first argument; put parentheses or even spaces Warning removed!
\| * \| \| \| \| \| \| \| \| \| \|	ambiguous first argument; put parentheses or even spaces Warning removed!	Arun Agrawal	2011-10-10	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Active Record changelog mistakes	Josef Šimánek	2011-10-10	1	-7/+8
\|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Use broken YAML that will fail with Syck as well as Psych. Fixes ↵	Jon Leighton	2011-10-09	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	test_broken_yaml_exception in fixtures_test.rb on Ruby 1.8.7. Cherry-pick from 3-1-stable: b8d46924e70e0847e92e1d2dbaaec8c11381072c
* \| \| \| \| \| \| \| \| \| \|	Remove stray whitespace	Jeremy Kemper	2011-10-09	1	-4/+1
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Only use LOWER for mysql case insensitive uniqueness check when column has a ↵	Joseph Palermo	2011-10-09	10	-12/+139
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	case sensitive collation.
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #500 from cyril/patch-1	Jeremy Kemper	2011-10-08	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use quotes for command substitution
\| * \| \| \| \| \| \| \| \| \| \|	Use quotes for command substitution	Cyril Wack	2011-05-10	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Fixed BodyProxy.new for tests! for wrong argument	Arun Agrawal	2011-10-08	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	use thread locals and an instance variable within QueryCache#BodyProxy to ↵	Mark J. Titorenko	2011-10-07	3	-3/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	maintain appropriate linkage with AR database connection across threads
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #3232 from Juanmcuello/pg_prepared_statements	Aaron Patterson	2011-10-06	2	-3/+23
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use the schema_search_path in prepared statements.
\| * \| \| \| \| \| \| \| \| \| \| \|	refs #3232. Prepared statements and postgreSQL schemas.	Juan M. Cuello	2011-10-05	1	-0/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add tests for prepared statements with multiple schemas in postgreSQL.
\| * \| \| \| \| \| \| \| \| \| \| \|	Use the schema_search_path in prepared statements.	Juan M. Cuello	2011-10-05	1	-3/+4
\| \| \|_\|_\|_\|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	To allow the use of prepared statements when changing schemas in postgres, the schema search path is added to the sql key.
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #3203 from jrmehle/fix_clone_structure	Vijay Dev	2011-10-06	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	db:test:clone_structure if path to .sql file contains spaces or dashes
\| * \| \| \| \| \| \| \| \| \| \| \|	Quoted path to <Rails.env>_structure.sql file in db:test:clone_structure task.	Jared Mehle	2011-10-03	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Leaving the path unquoted causes errors in paths containing spaces or dashes.
* \| \| \| \| \| \| \| \| \| \| \| \|	Transactional fixtures enlist all active database connections.	Jeremy Kemper	2011-10-05	7	-10/+61
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	You can use multiple databases in your tests without disabling transactional fixtures.
* \| \| \| \| \| \| \| \| \| \| \| \|	Raise an exception on unknown primary key inside AssociationReflection.	Jon Leighton	2011-10-05	3	-4/+36
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	An association between two models cannot be made if a relevant key is unknown, so fail fast rather than generating invalid SQL. Fixes #3207.
* \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Raise error on unknown primary key."	Jon Leighton	2011-10-05	12	-54/+18
\| \|/ / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit ee2be435b1e5c0e94a4ee93a1a310e0471a77d07.
* \| \| \| \| \| \| \| \| \| \| \|	Raise error on unknown primary key.	Jon Leighton	2011-10-05	12	-18/+54
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If we don't have a primary key when we ask for it, it's better to fail fast. Fixes GH #2307.
* \| \| \| \| \| \| \| \| \| \| \|	Changing rake db:schema:dump to run :environment as well as :load_config, as ↵	Ben Woosley	2011-10-04	1	-1/+1
\|/ / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	running :load_config alone will lead to the dumper being run without including extensions such as those included in foreigner and spatial_adapter. This reverses a change made here: https://github.com/rails/rails/commit/5df72a238e9fcb18daf6ab6e6dc9051c9106d7bb#L0L324 I'm assuming here that :load_config needs to be invoked separately from :environment, as it is elsewhere in the file for db operations, if not the alternative is to go back to "task :dump => :environment do". Signed-off-by: José Valim <jose.valim@gmail.com>
* \| \| \| \| \| \| / / / /	To support ActiveRecord unit tests for IBM DB2	Yasuo Honda	2011-10-02	1	-0/+2
\| \|_\|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Add CHANGELOG entries	Santiago Pastorino	2011-09-29	1	-1/+25
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Don't call self.class unless necessary. Closes #3171.	Jon Leighton	2011-09-29	2	-2/+3
\| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Fixed failed test under 1.8.7 as map.keys order in indeterminable	Rocky Jaiswal	2011-09-28	2	-2/+2
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2011-09-28	1	-1/+1
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	fixing docs for delete_sql where quotes should be used in this example.	Diego Plentz	2011-09-26	1	-1/+1
\| \| \|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Don't require a DB connection when setting primary key.	Jon Leighton	2011-09-26	3	-1/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #2807.
* \| \| \| \| \| \| \| \|	Merge pull request #3030 from htanata/fix_habtm_select_query_method	Jon Leighton	2011-09-26	3	-4/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix: habtm doesn't respect select query method
* \| \| \| \| \| \| \| \|	Fix belongs_to polymorphic with custom primary key on target.	Jon Leighton	2011-09-26	5	-18/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #3104.
* \| \| \| \| \| \| \| \|	CollectionProxy#replace should change the DB records rather than just ↵	Jon Leighton	2011-09-26	2	-1/+12
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	mutating the array. Fixes #3020.
* \| \| \| \| \| \| \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2011-09-21	1	-0/+29
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	copy edits 908f2616	Vijay Dev	2011-09-20	1	-4/+4
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Document ActiveRecord::QueryMethods#select	Ryan Bigg	2011-09-17	1	-0/+29
\| \| \|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	fix test error when running with postgresql.	Arun Agrawal	2011-09-18	1	-2/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This Sqlite3 should be in if block. Was giving error because sqlite3 is not loaded
* \| \| \| \| \| \| \|	to_xml should also rely on serializable hash.	José Valim	2011-09-18	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Fixed test for JRuby.	Arun Agrawal	2011-09-18	1	-1/+2
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \|	for Sqlite3 in AR-JDBC.It's Jdbc::SQLite3::VERSION
* \| \| \| \| \| \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2011-09-15	2	-1/+37
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	minor edit	Vijay Dev	2011-09-14	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add documentation for the extending method in ActiveRecord:QueryMethods	Ryan Bigg	2011-09-14	1	-0/+36
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	[:class_name] option in belongs_to should mention belongs_to and not has_one	Erik Behrends	2011-09-13	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	update 3.1 release date in changelogs	Vijay Dev	2011-09-14	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Stop trying to be clever about when to define attribute methods.	Jon Leighton	2011-09-14	2	-34/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	There is no meaningful performance penalty in defining attribute methods, since it only happens once. There is also no reason not to define them, since they get thrown in an included module, so they will not 'overwrite' anything. In fact, this is desirable, since it allows us to call super.