This project is archived and is in readonly mode.

Changeset [2ef6270f8fbbefba8d4f10504497e198d8e7deea] by Aaron Patterson

Revision 2ef6270f8fbbefba8d4f10504497e198d8e7deea, committed by Aaron Patterson · March 22nd, 2011 @ 04:34 PM

Merge branch 'master' into fuuu

master: Do not show optional (.:format) block for wildcard route [#6605 state:resolved] pushing id insertion and prefetch primary keys down to Relation#insert use prepared statements to fetch the last insert id escaping binary data encoding when inserting to sqlite3. Thanks Naruse! [#6559 state:resolved] schemas set by set_table_name are respected by the mysql adapter. [#5322 state:resolved] Reapply extensions when using except and only SJIS is an alias to Windows-31J in ruby trunk. Use SHIFT_JIS for this test Improved resolver docs a bit [action_view] docs for FileSystemResolver [action_view] added custom patterns to template resolver https://github.com/rails/rails/commit/2ef6270f8fbbefba8d4f10504497e...

A actionpack/test/fixtures/custom_pattern/another.html.erb
A actionpack/test/fixtures/custom_pattern/html/another.erb
A actionpack/test/fixtures/custom_pattern/html/path.erb
A actionpack/test/template/resolver_patterns_test.rb
A activerecord/test/cases/adapters/mysql/schema_test.rb
M actionpack/lib/action_dispatch/routing/mapper.rb
M actionpack/lib/action_view/template/resolver.rb
M actionpack/lib/action_view/testing/resolvers.rb
M actionpack/test/action_dispatch/routing/mapper_test.rb
M actionpack/test/template/render_test.rb
M activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb
M activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
M activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
M activerecord/lib/active_record/persistence.rb
M activerecord/lib/active_record/relation.rb
M activerecord/lib/active_record/relation/spawn_methods.rb
M activerecord/test/cases/adapters/sqlite/sqlite_adapter_test.rb
M activerecord/test/cases/relations_test.rb