use strict;
use warnings;
+use DBICTest::AuthorCheck;
use DBICTest::Schema;
=head1 NAME
}
sub _sqlite_dbfilename {
+ return "t/var/DBIxClass.db";
+}
+
+sub _sqlite_dbname {
my $self = shift;
my %args = @_;
- return "t/var/DBIxClass.db" if $args{sqlite_use_file} or $ENV{"DBICTEST_SQLITE_USE_FILE"};
+ return $self->_sqlite_dbfilename if $args{sqlite_use_file} or $ENV{"DBICTEST_SQLITE_USE_FILE"};
return ":memory:";
}
sub _database {
my $self = shift;
my %args = @_;
- my $db_file = $self->_sqlite_dbfilename(%args);
+ my $db_file = $self->_sqlite_dbname(%args);
unlink($db_file) if -e $db_file;
unlink($db_file . "-journal") if -e $db_file . "-journal";
my $dbuser = $ENV{"DBICTEST_DBUSER"} || '';
my $dbpass = $ENV{"DBICTEST_DBPASS"} || '';
- my @connect_info = ($dsn, $dbuser, $dbpass, { AutoCommit => 1 });
+ my @connect_info = ($dsn, $dbuser, $dbpass, { AutoCommit => 1, %args });
return @connect_info;
}
my $sql;
{ local $/ = undef; $sql = <IN>; }
close IN;
- ($schema->storage->dbh->do($_) || print "Error on SQL: $_\n") for split(/;\n/, $sql);
+ for my $chunk ( split (/;\s*\n+/, $sql) ) {
+ if ( $chunk =~ / ^ (?! --\s* ) \S /xm ) { # there is some real sql in the chunk - a non-space at the start of the string which is not a comment
+ $schema->storage->dbh->do($chunk) or print "Error on SQL: $chunk\n";
+ }
+ }
}
return;
}
]);
$schema->populate('Event', [
- [ qw/id starts_at created_on/ ],
- [ 1, '2006-04-25 22:24:33', '2006-06-22 21:00:05'],
+ [ qw/id starts_at created_on varchar_date varchar_datetime skip_inflation/ ],
+ [ 1, '2006-04-25 22:24:33', '2006-06-22 21:00:05', '2006-07-23', '2006-05-22 19:05:07', '2006-04-21 18:04:06'],
]);
$schema->populate('Link', [
]);
$schema->populate('BooksInLibrary', [
- [ qw/id owner title source/ ],
- [ 1, 1, "Programming Perl", "Library" ],
- [ 2, 1, "Dynamical Systems", "Library" ],
- [ 3, 2, "Best Recipe Cookbook", "Library" ],
+ [ qw/id owner title source price/ ],
+ [ 1, 1, "Programming Perl", "Library", 23 ],
+ [ 2, 1, "Dynamical Systems", "Library", 37 ],
+ [ 3, 2, "Best Recipe Cookbook", "Library", 65 ],
]);
}