--- DBIx/Class/Schema/Versioned.pm	2007-05-18 21:43:39.000000000 +0930
+++ DBIx/Class/Schema/Versioned.pm	2007-05-21 13:09:15.055120497 +0930
@@ -52,7 +52,10 @@
 sub on_connect
 {
     my ($self) = @_;
-    my $vschema = DBIx::Class::Version->connect(@{$self->storage->connect_info()});
+    my $vschema = DBIx::Class::Version->connect(
+        @{$self->storage->connect_info()},
+        $self->storage->_sql_maker_opts
+    );
     my $vtable = $vschema->resultset('Table');
     my $pversion;
 
@@ -140,7 +143,7 @@
     my ($self, $rs) = @_;
 
     my $c = eval {
-        $rs->search({ 1, 0 })->count;
+        $rs->search({}, { where => '1 = 0' })->count;
     };
     return 0 if $@ || !defined $c;