use Test::Exception;
use Catalyst::Helper::Model::DBIC::Schema;
use Storable 'dclone';
-eval "use Catalyst::Helper";
-plan skip_all => 'Catalyst::Helper required for tests' if $@;
-plan tests => 41;
+use Test::Requires qw(Catalyst::Helper DBIx::Class::Schema::Loader);
my $helper = Catalyst::Helper->new;
$helper->{base} = $Bin;
is_deeply $i->components, ['InflateColumn::DateTime', 'TimeStamp', 'Foo'],
'two extra components';
+my $flags = qr// =~ /\^/ ? '^' : "-xism";
$i = instance(args => [$static, q{constraint=^(foo|bar)$}]);
is $i->loader_args->{constraint}, qr/^(foo|bar)$/,
'constraint loader arg';
is $i->helper->{loader_args}{constraint},
- q{qr/(?-xism:^(foo|bar)$)/},
+ qq{qr/(?$flags:^(foo|bar)\$)/},
'constraint loader arg as string';
$i = instance(args => [$static, q{exclude=^(foo|bar)$}]);
'connect_info name_sep as string';
$i = instance(args => [
+ $static, $sqlite, 'on_connect_do=PRAGMA foreign_keys = ON'
+]);
+
+is $i->connect_info->{on_connect_do},
+ 'PRAGMA foreign_keys = ON', 'on_connect_do string';
+
+is $i->helper->{connect_info}{on_connect_do},
+ 'q{PRAGMA foreign_keys = ON}', 'on_connect_do string as string';
+
+$i = instance(args => [
$static, 'components=TimeStamp', $sqlite, '', $on_connect_do,
$quote_char, $name_sep
]);
is $i->helper->{connect_info}{AutoCommit}, 'q{0}',
'connect_info arg from extra hash as string';
+$i = instance(args => [
+ $static, 'components=TimeStamp', $sqlite, $on_connect_do,
+ $quote_char, $name_sep, 'auto_savepoint=1', 'AutoCommit=0',
+ 'db_schema=myschema',
+]);
+
+is $i->loader_args->{db_schema}, 'myschema',
+ 'loader arg after connect_info';
+
+ok ((not exists $i->helper->{connect_info}{db_schema}),
+ 'loader args removed from connect_info');
+
+done_testing;
+
sub instance {
Catalyst::Helper::Model::DBIC::Schema->new(
schema_class => 'AnotherSchemaClass',