Merge 'multicreate' into 'multi_stuff'

merge from branches/multicreate

diff --cc t/66relationship.t
index fe0196c,ad095ad..7ed5b60
--- 1/t/66relationship.t
--- 2/t/66relationship.t
+++ b/t/66relationship.t
@@@ -8,7 -7,7 +8,7 @@@ use DBICTest
  
  my $schema = DBICTest->init_schema();
  
- plan tests => 74;
 -plan tests => 66;
++plan tests => 68;
  
  # has_a test
  my $cd = $schema->resultset("CD")->find(4);

diff --cc t/96multi_create.t
index b5c10f7,cf77442..965ab54
--- 1/t/96multi_create.t
--- 2/t/96multi_create.t
+++ b/t/96multi_create.t
@@@ -6,11 -6,11 +6,11 @@@ use Test::Exception
  use lib qw(t/lib);
  use DBICTest;
  
- plan tests => 70;
 -plan tests => 104;
++plan tests => 85;
  
  my $schema = DBICTest->init_schema();
  
- # simple create + parent (the stuff $rs belongs_to)
 -diag '* simple create + parent (the stuff $rs belongs_to)';
++diag '* simple create + parent (the stuff $rs belongs_to)'
  eval {
    my $cd = $schema->resultset('CD')->create({
      artist => { 

diff --cc t/lib/DBICTest/Schema.pm
Simple merge

diff --cc t/lib/sqlite.sql
index 263b234,4122015..78cbdcc
--- 1/t/lib/sqlite.sql
--- 2/t/lib/sqlite.sql
+++ b/t/lib/sqlite.sql
@@@ -38,17 -38,18 +38,29 @@@ CREATE TABLE cd_artwork 
  CREATE INDEX cd_artwork_idx_cd_id_cd_artwor ON cd_artwork (cd_id);
  
  --
 +-- Table: bindtype_test
 +--
 +CREATE TABLE bindtype_test (
 +  id INTEGER PRIMARY KEY NOT NULL,
 +  bytea blob,
 +  blob blob,
 +  clob clob
 +);
 +
 +
 +--
+ -- Table: artwork_to_artist
+ --
+ CREATE TABLE artwork_to_artist (
+   artwork_cd_id integer NOT NULL,
+   artist_id integer NOT NULL,
+   PRIMARY KEY (artwork_cd_id, artist_id)
+ );
+ 
+ CREATE INDEX artwork_to_artist_idx_artist_id_artwork_to_arti ON artwork_to_artist (artist_id);
+ CREATE INDEX artwork_to_artist_idx_artwork_cd_id_artwork_to_ ON artwork_to_artist (artwork_cd_id);
+ 
+ --
  -- Table: bookmark
  --
  CREATE TABLE bookmark (