From: Rafael Kitover Date: Sat, 6 Mar 2010 17:00:14 +0000 (+0000) Subject: remove BindType2 test class X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=ba19fccc5a38a4eb1eb25abbe181338f1dac9753;p=dbsrgits%2FDBIx-Class-Historic.git remove BindType2 test class --- diff --git a/maint/gen-schema.pl b/maint/gen-schema.pl index 907ed11..70e30ae 100755 --- a/maint/gen-schema.pl +++ b/maint/gen-schema.pl @@ -4,10 +4,11 @@ use strict; use warnings; use lib qw(lib t/lib); +use DBICTest; use DBICTest::Schema; use SQL::Translator; -my $schema = DBICTest::Schema->connect; +my $schema = DBICTest::Schema->connect(DBICTest->_database); print scalar ($schema->storage->deployment_statements( $schema, 'SQLite', diff --git a/t/750firebird.t b/t/750firebird.t index 27879a6..55ba209 100644 --- a/t/750firebird.t +++ b/t/750firebird.t @@ -198,14 +198,14 @@ EOF } # test blobs (stolen from 73oracle.t) - eval { $dbh->do('DROP TABLE "bindtype_test2"') }; + eval { $dbh->do('DROP TABLE "bindtype_test"') }; $dbh->do(q[ - CREATE TABLE "bindtype_test2" + CREATE TABLE "bindtype_test" ( "id" INT PRIMARY KEY, "bytea" INT, - "a_blob" BLOB, - "a_clob" BLOB SUB_TYPE TEXT + "blob" BLOB, + "clob" BLOB SUB_TYPE TEXT ) ]); @@ -215,10 +215,10 @@ EOF my $maxloblen = length $binstr{'large'}; local $dbh->{'LongReadLen'} = $maxloblen; - my $rs = $schema->resultset('BindType2'); + my $rs = $schema->resultset('BindType'); my $id = 0; - foreach my $type (qw( a_blob a_clob )) { + foreach my $type (qw( blob clob )) { foreach my $size (qw( small large )) { $id++; @@ -254,7 +254,7 @@ sub cleanup { diag $@ if $@; } - foreach my $table (qw/artist bindtype_test2 sequence_test/) { + foreach my $table (qw/artist bindtype_test sequence_test/) { eval { $dbh->do(qq[DROP TABLE "$table"]) }; diag $@ if $@; } diff --git a/t/lib/DBICTest/Schema.pm b/t/lib/DBICTest/Schema.pm index 6f5169c..a3e4484 100644 --- a/t/lib/DBICTest/Schema.pm +++ b/t/lib/DBICTest/Schema.pm @@ -9,7 +9,6 @@ __PACKAGE__->load_classes(qw/ Artist SequenceTest BindType - BindType2 Employee CD FileColumn diff --git a/t/lib/DBICTest/Schema/BindType2.pm b/t/lib/DBICTest/Schema/BindType2.pm deleted file mode 100644 index 0ebbb8e..0000000 --- a/t/lib/DBICTest/Schema/BindType2.pm +++ /dev/null @@ -1,29 +0,0 @@ -package # hide from PAUSE - DBICTest::Schema::BindType2; - -use base qw/DBICTest::BaseResult/; - -__PACKAGE__->table('bindtype_test2'); - -__PACKAGE__->add_columns( - 'id' => { - data_type => 'integer', - is_auto_increment => 1, - }, - 'bytea' => { - data_type => 'bytea', - is_nullable => 1, - }, - 'a_blob' => { - data_type => 'blob', - is_nullable => 1, - }, - 'a_clob' => { - data_type => 'clob', - is_nullable => 1, - }, -); - -__PACKAGE__->set_primary_key('id'); - -1; diff --git a/t/lib/sqlite.sql b/t/lib/sqlite.sql index 4dcc31b..22f416c 100644 --- a/t/lib/sqlite.sql +++ b/t/lib/sqlite.sql @@ -1,8 +1,7 @@ -- -- Created by SQL::Translator::Producer::SQLite --- Created on Thu Feb 11 07:23:33 2010 +-- Created on Sat Mar 6 11:57:45 2010 -- -; -- -- Table: artist @@ -27,16 +26,6 @@ CREATE TABLE bindtype_test ( ); -- --- Table: bindtype_test2 --- -CREATE TABLE bindtype_test2 ( - id INTEGER PRIMARY KEY NOT NULL, - bytea blob, - a_blob blob, - a_clob clob -); - --- -- Table: collection -- CREATE TABLE collection ( @@ -455,4 +444,4 @@ CREATE INDEX fourkeys_to_twokeys_idx_t_artist_t_cd ON fourkeys_to_twokeys (t_art -- View: year2000cds -- CREATE VIEW year2000cds AS - SELECT cdid, artist, title, year, genreid, single_track FROM cd WHERE year = "2000" \ No newline at end of file + SELECT cdid, artist, title, year, genreid, single_track FROM cd WHERE year = "2000"