Aaron Patterson 2ef6270f8f 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

2011-03-22 09:34:33 -07:00

..

active_record/connection_adapters

introduce a fake AR adapter for mocking database return values

2011-02-04 13:34:57 -08:00

assets

move assets and models

2008-01-18 07:27:03 +00:00

cases

Merge branch 'master' into fuuu

2011-03-22 09:34:33 -07:00

connections

use rake to create test databases for us

2011-01-14 14:07:16 -08:00

fixtures

Merge branch 'master' into nested_has_many_through

2011-03-10 19:35:20 +00:00

migrations

in the middle of refactoring

2010-12-03 12:00:09 -08:00

models

oracle, y u defy me

2011-03-16 18:54:34 +00:00

schema

Merge branch 'master' into nested_has_many_through

2011-03-04 09:30:27 +00:00

config.rb

Merge branch 'ar-test-cleanup' of git://git.geeksomnia.com/rails

2008-01-21 17:20:51 +00:00