From: Scotty Allen Date: Mon, 13 Feb 2006 21:20:08 +0000 (+0000) Subject: removed version.pm dependancy X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=58ff4acf704a746869ceb16668180f5472b9edef;p=dbsrgits%2FDBIx-Class-Historic.git removed version.pm dependancy --- diff --git a/Build.PL b/Build.PL index 42d81ab..8dbb25a 100644 --- a/Build.PL +++ b/Build.PL @@ -18,7 +18,6 @@ my %arguments = ( }, build_requires => { 'DBD::SQLite' => 1.11, - 'version' => 0, }, recommends => { 'Data::UUID' => 0, diff --git a/t/run/16joins.tl b/t/run/16joins.tl index 962ee48..b9ebeb4 100644 --- a/t/run/16joins.tl +++ b/t/run/16joins.tl @@ -2,7 +2,6 @@ sub run_tests { my $schema = shift; use IO::File; -use version; BEGIN { eval "use DBD::SQLite"; @@ -11,8 +10,17 @@ BEGIN { : ( tests => 41 ); } -my $is_broken_sqlite = version->new($schema->storage->dbh->get_info(18)) lt '3.2.6' && - $schema->storage->dbh->get_info(17) eq 'SQLite'; +# figure out if we've got a version of sqlite that is older than 3.2.6, in +# which case COUNT(DISTINCT()) doesn't work +my $is_broken_sqlite = 0; +my ($sqlite_major_ver,$sqlite_minor_ver,$sqlite_patch_ver) = + split /\./, $schema->storage->dbh->get_info(18); +if( $schema->storage->dbh->get_info(17) eq 'SQLite' && + ( ($sqlite_major_ver < 3) || + ($sqlite_major_ver == 3 && $sqlite_minor_ver < 2) || + ($sqlite_major_ver == 3 && $sqlite_minor_ver == 2 && $sqlite_patch_ver < 6) ) ) { + $is_broken_sqlite = 1; +} # test the abstract join => SQL generator my $sa = new DBIC::SQL::Abstract;