[Bast-commits] r8907 - in DBIx-Class/0.08/trunk/t: inflate lib lib/DBICTest lib/DBICTest/Schema

[ribasushi at dev.catalyst.perl.org]

Author: ribasushi
Date: 2010-03-06 12:18:01 +0000 (Sat, 06 Mar 2010)
New Revision: 8907

Modified:
   DBIx-Class/0.08/trunk/t/inflate/file_column.t
   DBIx-Class/0.08/trunk/t/lib/DBICTest/Schema.pm
   DBIx-Class/0.08/trunk/t/lib/DBICTest/Schema/FileColumn.pm
   DBIx-Class/0.08/trunk/t/lib/sqlite.sql
Log:
me-- not thinking

Modified: DBIx-Class/0.08/trunk/t/inflate/file_column.t
===================================================================
--- DBIx-Class/0.08/trunk/t/inflate/file_column.t	2010-03-06 11:44:58 UTC (rev 8906)
+++ DBIx-Class/0.08/trunk/t/inflate/file_column.t	2010-03-06 12:18:01 UTC (rev 8907)
@@ -3,17 +3,21 @@
 
 use Test::More;
 use lib qw(t/lib);
+
+# inject IC::File into the result baseclass for testing
+BEGIN {
+  $ENV{DBIC_IC_FILE_NOWARN} = 1;
+  require DBICTest::BaseResult;
+  DBICTest::BaseResult->load_components (qw/InflateColumn::File/);
+}
+
+
 use DBICTest;
-use DBICTest::Schema;
 use File::Compare;
 use Path::Class qw/file/;
 
-$ENV{DBIC_IC_FILE_NOWARN} = 1;
+my $schema = DBICTest->init_schema;
 
-DBICTest::Schema->load_classes ('FileColumn');
-my $schema = DBICTest::Schema->connect(DBICTest->_database);
-DBICTest->deploy_schema ($schema);
-
 plan tests => 10;
 
 my $rs = $schema->resultset('FileColumn');

Modified: DBIx-Class/0.08/trunk/t/lib/DBICTest/Schema/FileColumn.pm
===================================================================
--- DBIx-Class/0.08/trunk/t/lib/DBICTest/Schema/FileColumn.pm	2010-03-06 11:44:58 UTC (rev 8906)
+++ DBIx-Class/0.08/trunk/t/lib/DBICTest/Schema/FileColumn.pm	2010-03-06 12:18:01 UTC (rev 8907)
@@ -6,8 +6,6 @@
 use base qw/DBICTest::BaseResult/;
 use File::Temp qw/tempdir/;
 
-__PACKAGE__->load_components(qw/InflateColumn::File/);
-
 __PACKAGE__->table('file_columns');
 
 __PACKAGE__->add_columns(

Modified: DBIx-Class/0.08/trunk/t/lib/DBICTest/Schema.pm
===================================================================
--- DBIx-Class/0.08/trunk/t/lib/DBICTest/Schema.pm	2010-03-06 11:44:58 UTC (rev 8906)
+++ DBIx-Class/0.08/trunk/t/lib/DBICTest/Schema.pm	2010-03-06 12:18:01 UTC (rev 8907)
@@ -11,6 +11,7 @@
   BindType
   Employee
   CD
+  FileColumn
   Genre
   Link
   Bookmark

Modified: DBIx-Class/0.08/trunk/t/lib/sqlite.sql
===================================================================
--- DBIx-Class/0.08/trunk/t/lib/sqlite.sql	2010-03-06 11:44:58 UTC (rev 8906)
+++ DBIx-Class/0.08/trunk/t/lib/sqlite.sql	2010-03-06 12:18:01 UTC (rev 8907)
@@ -1,6 +1,6 @@
 -- 
 -- Created by SQL::Translator::Producer::SQLite
--- Created on Sat Mar  6 12:26:40 2010
+-- Created on Sat Mar  6 13:01:48 2010
 -- 
 ;
 
@@ -68,6 +68,14 @@
 );
 
 --
+-- Table: file_columns
+--
+CREATE TABLE file_columns (
+  id INTEGER PRIMARY KEY NOT NULL,
+  file varchar(255) NOT NULL
+);
+
+--
 -- Table: fourkeys
 --
 CREATE TABLE fourkeys (