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

diff --cc Changes
index 54514fb,803a6af..ebd1a0a
--- 1/Changes
--- 2/Changes
+++ b/Changes
@@@ -18,10 -121,10 +121,7 @@@ Revision history for DBIx::Clas
          - nuke ResultSource caching of ->resultset for consistency reasons
          - fix for -and conditions when updating or deleting on a ResultSet
  
--0.06001 2006-04-08 21:48:43
--        - minor fix to update in case of undefined rels
--        - fixes for cascade delete
--        - substantial improvements and fixes to deploy
++0.06001
          - Added fix for quoting with single table
          - Substantial fixes and improvements to deploy
          - slice now uses search directly

diff --cc t/lib/sqlite.sql
index ac5f9f3,e4d4e6a..db76e3b
--- 1/t/lib/sqlite.sql
--- 2/t/lib/sqlite.sql
+++ b/t/lib/sqlite.sql
@@@ -1,6 -1,6 +1,6 @@@
  -- 
  -- Created by SQL::Translator::Producer::SQLite
- -- Created on Fri May 12 01:09:57 2006
 --- Created on Thu Jun  6 23:36:19 2006
++-- Created on Sun Jul 23 00:23:30 2006
  -- 
  BEGIN TRANSACTION;
  
@@@ -38,18 -48,32 +48,32 @@@ CREATE TABLE artist 
  );
  
  --
 +-- Table: twokeytreelike
 +--
 +CREATE TABLE twokeytreelike (
 +  id1 integer NOT NULL,
 +  id2 integer NOT NULL,
 +  parent1 integer NOT NULL,
 +  parent2 integer NOT NULL,
 +  name varchar(100) NOT NULL,
 +  PRIMARY KEY (id1, id2)
 +);
 +
 +--
+ -- Table: fourkeys_to_twokeys
+ --
+ CREATE TABLE fourkeys_to_twokeys (
+   f_foo integer NOT NULL,
+   f_bar integer NOT NULL,
+   f_hello integer NOT NULL,
+   f_goodbye integer NOT NULL,
+   t_artist integer NOT NULL,
+   t_cd integer NOT NULL,
+   autopilot character NOT NULL,
+   PRIMARY KEY (f_foo, f_bar, f_hello, f_goodbye, t_artist, t_cd)
+ );
+ 
+ --
 --- Table: twokeytreelike
 ---
 -CREATE TABLE twokeytreelike (
 -  id1 integer NOT NULL,
 -  id2 integer NOT NULL,
 -  parent1 integer NOT NULL,
 -  parent2 integer NOT NULL,
 -  name varchar(100) NOT NULL,
 -  PRIMARY KEY (id1, id2)
 -);
 -
 ---
  -- Table: self_ref_alias
  --
  CREATE TABLE self_ref_alias (
@@@ -87,6 -111,23 +111,14 @@@ CREATE TABLE track 
  );
  
  --
 --- Table: treelike
 ---
 -CREATE TABLE treelike (
 -  id INTEGER PRIMARY KEY NOT NULL,
 -  parent integer NOT NULL,
 -  name varchar(100) NOT NULL
 -);
 -
 ---
+ -- Table: self_ref
+ --
+ CREATE TABLE self_ref (
+   id INTEGER PRIMARY KEY NOT NULL,
+   name varchar(100) NOT NULL
+ );
+ 
+ --
  -- Table: link
  --
  CREATE TABLE link (
@@@ -104,21 -146,12 +137,21 @@@ CREATE TABLE tags 
  );
  
  --
 +-- Table: treelike
 +--
 +CREATE TABLE treelike (
 +  id INTEGER PRIMARY KEY NOT NULL,
 +  parent integer NOT NULL,
 +  name varchar(100) NOT NULL
 +);
 +
 +--
- -- Table: tags
+ -- Table: event
  --
- CREATE TABLE tags (
-   tagid INTEGER PRIMARY KEY NOT NULL,
-   cd integer NOT NULL,
-   tag varchar(100) NOT NULL
+ CREATE TABLE event (
+   id INTEGER PRIMARY KEY NOT NULL,
+   starts_at datetime NOT NULL,
+   created_on timestamp NOT NULL
  );
  
  --