Merge 'trunk' into 'DBIx-Class-current'

diff --cc t/lib/sqlite.sql
Simple merge

diff --cc t/run/04db.tl
index 2c91ed8,57aa819..6292fef
--- 1/t/run/04db.tl
--- 2/t/run/04db.tl
+++ b/t/run/04db.tl
@@@ -38,13 -38,8 +38,13 @@@ my $test_type_info = 
      'name' => {
          'data_type' => 'varchar',
          'is_nullable' => 0,
-         'size' => undef,
+         'size' => 100,
 -    }
 +    },
 +    'position' => {
 +        'data_type' => 'INTEGER',
 +        'is_nullable' => 0,
 +        'size' => undef,
 +    },
  };
  is_deeply($type_info, $test_type_info, 'columns_info_for - column data types');