[Bast-commits] r3219 - in trunk/DBIx-Class-Journal: .
lib/DBIx/Class lib/DBIx/Class/Schema lib/DBIx/Class/Schema/Journal
lib/DBIx/Class/Schema/Journal/DB t t/lib t/lib/DBICTest
t/lib/DBICTest/Schema
castaway at dev.catalyst.perl.org
castaway at dev.catalyst.perl.org
Mon Apr 30 10:15:23 GMT 2007
Author: castaway
Date: 2007-04-30 10:15:23 +0100 (Mon, 30 Apr 2007)
New Revision: 3219
Added:
trunk/DBIx-Class-Journal/t/
trunk/DBIx-Class-Journal/t/01test.t
trunk/DBIx-Class-Journal/t/lib/
trunk/DBIx-Class-Journal/t/lib/DBICTest.pm
trunk/DBIx-Class-Journal/t/lib/DBICTest/
trunk/DBIx-Class-Journal/t/lib/DBICTest/Schema.pm
trunk/DBIx-Class-Journal/t/lib/DBICTest/Schema/
trunk/DBIx-Class-Journal/t/lib/DBICTest/Schema/Artist.pm
trunk/DBIx-Class-Journal/t/lib/DBICTest/Schema/CD.pm
trunk/DBIx-Class-Journal/t/lib/DBICTest/Schema/Track.pm
trunk/DBIx-Class-Journal/t/var/
Modified:
trunk/DBIx-Class-Journal/lib/DBIx/Class/Journal.pm
trunk/DBIx-Class-Journal/lib/DBIx/Class/Schema/Journal.pm
trunk/DBIx-Class-Journal/lib/DBIx/Class/Schema/Journal/DB.pm
trunk/DBIx-Class-Journal/lib/DBIx/Class/Schema/Journal/DB/Base.pm
Log:
Add some tests... or so
Modified: trunk/DBIx-Class-Journal/lib/DBIx/Class/Journal.pm
===================================================================
--- trunk/DBIx-Class-Journal/lib/DBIx/Class/Journal.pm 2007-04-29 17:34:17 UTC (rev 3218)
+++ trunk/DBIx-Class-Journal/lib/DBIx/Class/Journal.pm 2007-04-30 09:15:23 UTC (rev 3219)
@@ -10,7 +10,7 @@
$class->result_source->schema->_journal_schema->current_user(delete $attrs->{user_id});
- $self->next::method($attrs, @rest);
+ $class->next::method($attrs, @rest);
}
sub insert
@@ -26,6 +26,7 @@
$al->create({
changeset => $self->result_source->schema->_journal_schema->current_changeset(),
});
+ }
}
## On delete, update delete_id of AuditLog
Modified: trunk/DBIx-Class-Journal/lib/DBIx/Class/Schema/Journal/DB/Base.pm
===================================================================
--- trunk/DBIx-Class-Journal/lib/DBIx/Class/Schema/Journal/DB/Base.pm 2007-04-29 17:34:17 UTC (rev 3218)
+++ trunk/DBIx-Class-Journal/lib/DBIx/Class/Schema/Journal/DB/Base.pm 2007-04-30 09:15:23 UTC (rev 3219)
@@ -3,7 +3,7 @@
use base 'DBIx::Class';
__PACKAGE__->load_components(qw/Core/);
-__PACKAGE__->table('');
+__PACKAGE__->table('dummy');
1;
Modified: trunk/DBIx-Class-Journal/lib/DBIx/Class/Schema/Journal/DB.pm
===================================================================
--- trunk/DBIx-Class-Journal/lib/DBIx/Class/Schema/Journal/DB.pm 2007-04-29 17:34:17 UTC (rev 3218)
+++ trunk/DBIx-Class-Journal/lib/DBIx/Class/Schema/Journal/DB.pm 2007-04-30 09:15:23 UTC (rev 3219)
@@ -6,6 +6,9 @@
__PACKAGE__->mk_classdata('current_session');
__PACKAGE__->mk_classdata('current_changeset');
-DBIx::Class::Schema::Journal::DB->load_classes();
+DBIx::Class::Schema::Journal::DB->load_classes(qw/
+ ChangeSet
+ Change
+ /);
1;
Modified: trunk/DBIx-Class-Journal/lib/DBIx/Class/Schema/Journal.pm
===================================================================
--- trunk/DBIx-Class-Journal/lib/DBIx/Class/Schema/Journal.pm 2007-04-29 17:34:17 UTC (rev 3218)
+++ trunk/DBIx-Class-Journal/lib/DBIx/Class/Schema/Journal.pm 2007-04-30 09:15:23 UTC (rev 3219)
@@ -3,6 +3,7 @@
use base qw/DBIx::Class/;
use Scalar::Util 'blessed';
+use DBIx::Class::Schema::Journal::DB;
__PACKAGE__->mk_classdata('journal_storage_type');
__PACKAGE__->mk_classdata('journal_connection');
@@ -10,7 +11,7 @@
__PACKAGE__->mk_classdata('journal_user'); ## [ class, field for user id ]
__PACKAGE__->mk_classdata('_journal_schema');
-sub load_classes
+sub connection
{
my $self = shift;
$self->next::method(@_);
@@ -64,12 +65,13 @@
my $source = $self->source($s_name);
my $newclass = $self->get_audit_log_class_name($s_name);
DBIx::Class::Componentised->inject_base($newclass, 'DBIx::Class::Schema::Journal::DB::AuditLog');
- $newclass->table(lc($s_name) . "_audit_log");
+# $newclass->table(lc($s_name) . "_audit_log");
+ $newclass->result_source_instance->name(lc($s_name) . "_audit_log");
my $histclass = $self->get_audit_hisory_class_name($s_name);
DBIx::Class::Componentised->inject_base($histclass, 'DBIx::Class::Schema::Journal::DB::AuditHistory');
- $histclass->table(lc($s_name) . "_audit_hisory");
+ $histclass->result_source_instance->name(lc($s_name) . "_audit_hisory");
$histclass->add_columns(
map { $_ => $source->column_info($_) } $source->columns
);
Added: trunk/DBIx-Class-Journal/t/01test.t
===================================================================
--- trunk/DBIx-Class-Journal/t/01test.t (rev 0)
+++ trunk/DBIx-Class-Journal/t/01test.t 2007-04-30 09:15:23 UTC (rev 3219)
@@ -0,0 +1,20 @@
+use strict;
+use warnings;
+
+use Test::More;
+use lib qw(t/lib);
+use DBICTest;
+use Data::Dumper;
+
+BEGIN {
+ eval "use DBD::SQLite";
+ plan $@
+ ? ( skip_all => 'needs DBD::SQLite for testing' )
+ : ( tests => 2 );
+}
+
+my $schema = DBICTest->init_schema(no_populate => 1);
+
+ok($schema, 'Created a Schema');
+isa_ok($schema->_journal_schema, 'DBIx::Class::Schema::Journal::DB');
+
Added: trunk/DBIx-Class-Journal/t/lib/DBICTest/Schema/Artist.pm
===================================================================
--- trunk/DBIx-Class-Journal/t/lib/DBICTest/Schema/Artist.pm (rev 0)
+++ trunk/DBIx-Class-Journal/t/lib/DBICTest/Schema/Artist.pm 2007-04-30 09:15:23 UTC (rev 3219)
@@ -0,0 +1,30 @@
+package # hide from PAUSE
+ DBICTest::Schema::Artist;
+
+use base 'DBIx::Class::Core';
+
+__PACKAGE__->table('artist');
+__PACKAGE__->add_columns(
+ 'artistid' => {
+ data_type => 'integer',
+ is_auto_increment => 1
+ },
+ 'name' => {
+ data_type => 'varchar',
+ size => 100,
+ is_nullable => 1,
+ },
+);
+__PACKAGE__->set_primary_key('artistid');
+
+__PACKAGE__->mk_classdata('field_name_for', {
+ artistid => 'primary key',
+ name => 'artist name',
+});
+
+__PACKAGE__->has_many(
+ cds => 'DBICTest::Schema::CD', undef,
+ { order_by => 'year' },
+);
+
+1;
Added: trunk/DBIx-Class-Journal/t/lib/DBICTest/Schema/CD.pm
===================================================================
--- trunk/DBIx-Class-Journal/t/lib/DBICTest/Schema/CD.pm (rev 0)
+++ trunk/DBIx-Class-Journal/t/lib/DBICTest/Schema/CD.pm 2007-04-30 09:15:23 UTC (rev 3219)
@@ -0,0 +1,31 @@
+package # hide from PAUSE
+ DBICTest::Schema::CD;
+
+use base 'DBIx::Class::Core';
+
+__PACKAGE__->table('cd');
+__PACKAGE__->add_columns(
+ 'cdid' => {
+ data_type => 'integer',
+ is_auto_increment => 1,
+ },
+ 'artist' => {
+ data_type => 'integer',
+ },
+ 'title' => {
+ data_type => 'varchar',
+ size => 100,
+ },
+ 'year' => {
+ data_type => 'varchar',
+ size => 100,
+ },
+);
+__PACKAGE__->set_primary_key('cdid');
+__PACKAGE__->add_unique_constraint([ qw/artist title/ ]);
+
+__PACKAGE__->belongs_to( artist => 'DBICTest::Schema::Artist' );
+
+__PACKAGE__->has_many( tracks => 'DBICTest::Schema::Track' );
+
+1;
Added: trunk/DBIx-Class-Journal/t/lib/DBICTest/Schema/Track.pm
===================================================================
--- trunk/DBIx-Class-Journal/t/lib/DBICTest/Schema/Track.pm (rev 0)
+++ trunk/DBIx-Class-Journal/t/lib/DBICTest/Schema/Track.pm 2007-04-30 09:15:23 UTC (rev 3219)
@@ -0,0 +1,32 @@
+package # hide from PAUSE
+ DBICTest::Schema::Track;
+
+use base 'DBIx::Class::Core';
+
+__PACKAGE__->table('track');
+__PACKAGE__->add_columns(
+ 'trackid' => {
+ data_type => 'integer',
+ is_auto_increment => 1,
+ },
+ 'cd' => {
+ data_type => 'integer',
+ },
+ 'position' => {
+ data_type => 'integer',
+ accessor => 'pos',
+ },
+ 'title' => {
+ data_type => 'varchar',
+ size => 100,
+ },
+);
+__PACKAGE__->set_primary_key('trackid');
+
+__PACKAGE__->add_unique_constraint([ qw/cd position/ ]);
+__PACKAGE__->add_unique_constraint([ qw/cd title/ ]);
+
+__PACKAGE__->belongs_to( cd => 'DBICTest::Schema::CD' );
+__PACKAGE__->belongs_to( disc => 'DBICTest::Schema::CD' => 'cd');
+
+1;
Added: trunk/DBIx-Class-Journal/t/lib/DBICTest/Schema.pm
===================================================================
--- trunk/DBIx-Class-Journal/t/lib/DBICTest/Schema.pm (rev 0)
+++ trunk/DBIx-Class-Journal/t/lib/DBICTest/Schema.pm 2007-04-30 09:15:23 UTC (rev 3219)
@@ -0,0 +1,17 @@
+package # hide from PAUSE
+ DBICTest::Schema;
+
+use base qw/DBIx::Class::Schema/;
+
+__PACKAGE__->load_components(qw/+DBIx::Class::Schema::Journal/);
+
+no warnings qw/qw/;
+
+__PACKAGE__->load_classes(qw/
+ Artist
+ CD
+ Track
+/
+);
+
+1;
Added: trunk/DBIx-Class-Journal/t/lib/DBICTest.pm
===================================================================
--- trunk/DBIx-Class-Journal/t/lib/DBICTest.pm (rev 0)
+++ trunk/DBIx-Class-Journal/t/lib/DBICTest.pm 2007-04-30 09:15:23 UTC (rev 3219)
@@ -0,0 +1,275 @@
+package # hide from PAUSE
+ DBICTest;
+
+use strict;
+use warnings;
+use DBICTest::Schema;
+
+=head1 NAME
+
+DBICTest - Library to be used by DBIx::Class test scripts.
+
+=head1 SYNOPSIS
+
+ use lib qw(t/lib);
+ use DBICTest;
+ use Test::More;
+
+ my $schema = DBICTest->init_schema();
+
+=head1 DESCRIPTION
+
+This module provides the basic utilities to write tests against
+DBIx::Class.
+
+=head1 METHODS
+
+=head2 init_schema
+
+ my $schema = DBICTest->init_schema(
+ no_deploy=>1,
+ no_populate=>1,
+ );
+
+This method removes the test SQLite database in t/var/DBIxClass.db
+and then creates a new, empty database.
+
+This method will call deploy_schema() by default, unless the
+no_deploy flag is set.
+
+Also, by default, this method will call populate_schema() by
+default, unless the no_deploy or no_populate flags are set.
+
+=cut
+
+sub init_schema {
+ my $self = shift;
+ my %args = @_;
+ my $db_file = "t/var/DBIxClass.db";
+
+ unlink($db_file) if -e $db_file;
+ unlink($db_file . "-journal") if -e $db_file . "-journal";
+ mkdir("t/var") unless -d "t/var";
+
+ my $dsn = $ENV{"DBICTEST_DSN"} || "dbi:SQLite:${db_file}";
+ my $dbuser = $ENV{"DBICTEST_DBUSER"} || '';
+ my $dbpass = $ENV{"DBICTEST_DBPASS"} || '';
+
+ my $schema = DBICTest::Schema->compose_connection('DBICTest' => $dsn, $dbuser, $dbpass);
+ $schema->storage->on_connect_do(['PRAGMA synchronous = OFF']);
+ if ( !$args{no_deploy} ) {
+ __PACKAGE__->deploy_schema( $schema );
+ __PACKAGE__->populate_schema( $schema ) if( !$args{no_populate} );
+ }
+ return $schema;
+}
+
+=head2 deploy_schema
+
+ DBICTest->deploy_schema( $schema );
+
+This method does one of two things to the schema. It can either call
+the experimental $schema->deploy() if the DBICTEST_SQLT_DEPLOY environment
+variable is set, otherwise the default is to read in the t/lib/sqlite.sql
+file and execute the SQL within. Either way you end up with a fresh set
+of tables for testing.
+
+=cut
+
+sub deploy_schema {
+ my $self = shift;
+ my $schema = shift;
+
+ if ($ENV{"DBICTEST_SQLT_DEPLOY"}) {
+ return $schema->deploy();
+ } else {
+ open IN, "t/lib/sqlite.sql";
+ my $sql;
+ { local $/ = undef; $sql = <IN>; }
+ close IN;
+ ($schema->storage->dbh->do($_) || print "Error on SQL: $_\n") for split(/;\n/, $sql);
+ }
+}
+
+=head2 populate_schema
+
+ DBICTest->populate_schema( $schema );
+
+After you deploy your schema you can use this method to populate
+the tables with test data.
+
+=cut
+
+sub populate_schema {
+ my $self = shift;
+ my $schema = shift;
+
+ $schema->populate('Artist', [
+ [ qw/artistid name/ ],
+ [ 1, 'Caterwauler McCrae' ],
+ [ 2, 'Random Boy Band' ],
+ [ 3, 'We Are Goth' ],
+ ]);
+
+ $schema->populate('CD', [
+ [ qw/cdid artist title year/ ],
+ [ 1, 1, "Spoonful of bees", 1999 ],
+ [ 2, 1, "Forkful of bees", 2001 ],
+ [ 3, 1, "Caterwaulin' Blues", 1997 ],
+ [ 4, 2, "Generic Manufactured Singles", 2001 ],
+ [ 5, 3, "Come Be Depressed With Us", 1998 ],
+ ]);
+
+ $schema->populate('LinerNotes', [
+ [ qw/liner_id notes/ ],
+ [ 2, "Buy Whiskey!" ],
+ [ 4, "Buy Merch!" ],
+ [ 5, "Kill Yourself!" ],
+ ]);
+
+ $schema->populate('Tag', [
+ [ qw/tagid cd tag/ ],
+ [ 1, 1, "Blue" ],
+ [ 2, 2, "Blue" ],
+ [ 3, 3, "Blue" ],
+ [ 4, 5, "Blue" ],
+ [ 5, 2, "Cheesy" ],
+ [ 6, 4, "Cheesy" ],
+ [ 7, 5, "Cheesy" ],
+ [ 8, 2, "Shiny" ],
+ [ 9, 4, "Shiny" ],
+ ]);
+
+ $schema->populate('TwoKeys', [
+ [ qw/artist cd/ ],
+ [ 1, 1 ],
+ [ 1, 2 ],
+ [ 2, 2 ],
+ ]);
+
+ $schema->populate('FourKeys', [
+ [ qw/foo bar hello goodbye sensors/ ],
+ [ 1, 2, 3, 4, 'online' ],
+ [ 5, 4, 3, 6, 'offline' ],
+ ]);
+
+ $schema->populate('OneKey', [
+ [ qw/id artist cd/ ],
+ [ 1, 1, 1 ],
+ [ 2, 1, 2 ],
+ [ 3, 2, 2 ],
+ ]);
+
+ $schema->populate('SelfRef', [
+ [ qw/id name/ ],
+ [ 1, 'First' ],
+ [ 2, 'Second' ],
+ ]);
+
+ $schema->populate('SelfRefAlias', [
+ [ qw/self_ref alias/ ],
+ [ 1, 2 ]
+ ]);
+
+ $schema->populate('ArtistUndirectedMap', [
+ [ qw/id1 id2/ ],
+ [ 1, 2 ]
+ ]);
+
+ $schema->populate('Producer', [
+ [ qw/producerid name/ ],
+ [ 1, 'Matt S Trout' ],
+ [ 2, 'Bob The Builder' ],
+ [ 3, 'Fred The Phenotype' ],
+ ]);
+
+ $schema->populate('CD_to_Producer', [
+ [ qw/cd producer/ ],
+ [ 1, 1 ],
+ [ 1, 2 ],
+ [ 1, 3 ],
+ ]);
+
+ $schema->populate('TreeLike', [
+ [ qw/id parent name/ ],
+ [ 1, 0, 'foo' ],
+ [ 2, 1, 'bar' ],
+ [ 5, 1, 'blop' ],
+ [ 3, 2, 'baz' ],
+ [ 4, 3, 'quux' ],
+ [ 6, 2, 'fong' ],
+ ]);
+
+ $schema->populate('Track', [
+ [ qw/trackid cd position title/ ],
+ [ 4, 2, 1, "Stung with Success"],
+ [ 5, 2, 2, "Stripy"],
+ [ 6, 2, 3, "Sticky Honey"],
+ [ 7, 3, 1, "Yowlin"],
+ [ 8, 3, 2, "Howlin"],
+ [ 9, 3, 3, "Fowlin"],
+ [ 10, 4, 1, "Boring Name"],
+ [ 11, 4, 2, "Boring Song"],
+ [ 12, 4, 3, "No More Ideas"],
+ [ 13, 5, 1, "Sad"],
+ [ 14, 5, 2, "Under The Weather"],
+ [ 15, 5, 3, "Suicidal"],
+ [ 16, 1, 1, "The Bees Knees"],
+ [ 17, 1, 2, "Apiary"],
+ [ 18, 1, 3, "Beehind You"],
+ ]);
+
+ $schema->populate('Event', [
+ [ qw/id starts_at created_on/ ],
+ [ 1, '2006-04-25 22:24:33', '2006-06-22 21:00:05'],
+ ]);
+
+ $schema->populate('Link', [
+ [ qw/id title/ ],
+ [ 1, 'aaa' ]
+ ]);
+
+ $schema->populate('Bookmark', [
+ [ qw/id link/ ],
+ [ 1, 1 ]
+ ]);
+
+ $schema->populate('Collection', [
+ [ qw/collectionid name/ ],
+ [ 1, "Tools" ],
+ [ 2, "Body Parts" ],
+ ]);
+
+ $schema->populate('CollectionObject', [
+ [ qw/collection object/ ],
+ [ 1, 1 ],
+ [ 1, 2 ],
+ [ 1, 3 ],
+ [ 2, 4 ],
+ [ 2, 5 ],
+ ]);
+
+ $schema->populate('TypedObject', [
+ [ qw/objectid type value/ ],
+ [ 1, "pointy", "Awl" ],
+ [ 2, "round", "Bearing" ],
+ [ 3, "pointy", "Knife" ],
+ [ 4, "pointy", "Tooth" ],
+ [ 5, "round", "Head" ],
+ ]);
+
+ $schema->populate('Owners', [
+ [ qw/ownerid name/ ],
+ [ 1, "Newton" ],
+ [ 2, "Waltham" ],
+ ]);
+
+ $schema->populate('BooksInLibrary', [
+ [ qw/id owner title source/ ],
+ [ 1, 1, "Programming Perl", "Library" ],
+ [ 2, 1, "Dynamical Systems", "Library" ],
+ [ 3, 2, "Best Recipe Cookbook", "Library" ],
+ ]);
+}
+
+1;
More information about the Bast-commits
mailing list