From: Rafael Kitover Date: Wed, 24 Mar 2010 19:44:15 +0000 (+0000) Subject: Pg version check for can_insert_returning X-Git-Tag: v0.08121~36 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=bab40deebe87977cb35055321a722d0d1ccebcd5;p=dbsrgits%2FDBIx-Class.git Pg version check for can_insert_returning --- diff --git a/lib/DBIx/Class/Storage/DBI/InterBase.pm b/lib/DBIx/Class/Storage/DBI/InterBase.pm index d2585ed..3664d9c 100644 --- a/lib/DBIx/Class/Storage/DBI/InterBase.pm +++ b/lib/DBIx/Class/Storage/DBI/InterBase.pm @@ -2,7 +2,7 @@ package DBIx::Class::Storage::DBI::InterBase; use strict; use warnings; -use base qw/DBIx::Class::Storage::DBI::InsertReturning/; +use base qw/DBIx::Class::Storage::DBI/; use mro 'c3'; use List::Util(); @@ -29,6 +29,8 @@ L. =cut +sub can_insert_returning { 1 } + sub _sequence_fetch { my ($self, $nextval, $sequence) = @_; diff --git a/lib/DBIx/Class/Storage/DBI/Pg.pm b/lib/DBIx/Class/Storage/DBI/Pg.pm index 1444cfe..05d4f47 100644 --- a/lib/DBIx/Class/Storage/DBI/Pg.pm +++ b/lib/DBIx/Class/Storage/DBI/Pg.pm @@ -17,9 +17,16 @@ warn __PACKAGE__.": DBD::Pg 2.9.2 or greater is strongly recommended\n" if ($DBD::Pg::VERSION < 2.009002); # pg uses (used?) version::qv() sub can_insert_returning { - # FIXME !!! - # pg before 8.2 doesn't support this, need to check version - return 1; + my $self = shift; + + my $pg_ver = $self->_get_dbh->get_info(18); + + my ($major, $minor) = $pg_ver =~ /^(\d+)\.(\d+)/; + + return 1 + if ($major > 8) || ($major == 8 && $minor >= 2); + + return 0; } sub with_deferred_fk_checks { @@ -37,6 +44,7 @@ sub with_deferred_fk_checks { after => sub { $txn_scope_guard->commit }); } +# only used when INSERT ... RETURNING is disabled sub last_insert_id { my ($self,$source,@cols) = @_; diff --git a/t/72pg.t b/t/72pg.t index ee6db29..f3ad48e 100644 --- a/t/72pg.t +++ b/t/72pg.t @@ -11,12 +11,11 @@ my ($dsn, $user, $pass) = @ENV{map { "DBICTEST_PG_${_}" } qw/DSN USER PASS/}; plan skip_all => <load_classes( map {s/.+:://;$_} @test_classes ) if @test_classes; +my $schema; + +for my $use_insert_returning (0..1) { + no warnings qw/redefine once/; + require DBIx::Class::Storage::DBI::Pg; + local *DBIx::Class::Storage::DBI::Pg::can_insert_returning = sub { + $use_insert_returning + }; ### pre-connect tests (keep each test separate as to make sure rebless() runs) -{ - my $s = DBICTest::Schema->connect($dsn, $user, $pass); + { + my $s = DBICTest::Schema->connect($dsn, $user, $pass); - ok (!$s->storage->_dbh, 'definitely not connected'); + ok (!$s->storage->_dbh, 'definitely not connected'); - # Check that datetime_parser returns correctly before we explicitly connect. - SKIP: { - eval { require DateTime::Format::Pg }; - skip "DateTime::Format::Pg required", 2 if $@; + # Check that datetime_parser returns correctly before we explicitly connect. + SKIP: { + eval { require DateTime::Format::Pg }; + skip "DateTime::Format::Pg required", 2 if $@; - my $store = ref $s->storage; - is($store, 'DBIx::Class::Storage::DBI', 'Started with generic storage'); + my $store = ref $s->storage; + is($store, 'DBIx::Class::Storage::DBI', 'Started with generic storage'); - my $parser = $s->storage->datetime_parser; - is( $parser, 'DateTime::Format::Pg', 'datetime_parser is as expected'); - } + my $parser = $s->storage->datetime_parser; + is( $parser, 'DateTime::Format::Pg', 'datetime_parser is as expected'); + } - ok (!$s->storage->_dbh, 'still not connected'); -} -{ - my $s = DBICTest::Schema->connect($dsn, $user, $pass); - # make sure sqlt_type overrides work (::Storage::DBI::Pg does this) - ok (!$s->storage->_dbh, 'definitely not connected'); - is ($s->storage->sqlt_type, 'PostgreSQL', 'sqlt_type correct pre-connection'); - ok (!$s->storage->_dbh, 'still not connected'); -} + ok (!$s->storage->_dbh, 'still not connected'); + } + { + my $s = DBICTest::Schema->connect($dsn, $user, $pass); + # make sure sqlt_type overrides work (::Storage::DBI::Pg does this) + ok (!$s->storage->_dbh, 'definitely not connected'); + is ($s->storage->sqlt_type, 'PostgreSQL', 'sqlt_type correct pre-connection'); + ok (!$s->storage->_dbh, 'still not connected'); + } ### connect, create postgres-specific test schema -my $schema = DBICTest::Schema->connect($dsn, $user, $pass); + $schema = DBICTest::Schema->connect($dsn, $user, $pass); -drop_test_schema($schema); -create_test_schema($schema); + drop_test_schema($schema); + create_test_schema($schema); ### begin main tests - # run a BIG bunch of tests for last-insert-id / Auto-PK / sequence # discovery -run_apk_tests($schema); #< older set of auto-pk tests -run_extended_apk_tests($schema); #< new extended set of auto-pk tests + run_apk_tests($schema); #< older set of auto-pk tests + run_extended_apk_tests($schema); #< new extended set of auto-pk tests +### type_info tests + my $test_type_info = { + 'artistid' => { + 'data_type' => 'integer', + 'is_nullable' => 0, + 'size' => 4, + }, + 'name' => { + 'data_type' => 'character varying', + 'is_nullable' => 1, + 'size' => 100, + 'default_value' => undef, + }, + 'rank' => { + 'data_type' => 'integer', + 'is_nullable' => 0, + 'size' => 4, + 'default_value' => 13, + }, + 'charfield' => { + 'data_type' => 'character', + 'is_nullable' => 1, + 'size' => 10, + 'default_value' => undef, + }, + 'arrayfield' => { + 'data_type' => 'integer[]', + 'is_nullable' => 1, + 'size' => undef, + 'default_value' => undef, + }, + }; + my $type_info = $schema->storage->columns_info_for('dbic_t_schema.artist'); + my $artistid_defval = delete $type_info->{artistid}->{default_value}; + like($artistid_defval, + qr/^nextval\('([^\.]*\.){0,1}artist_artistid_seq'::(?:text|regclass)\)/, + 'columns_info_for - sequence matches Pg get_autoinc_seq expectations'); + is_deeply($type_info, $test_type_info, + 'columns_info_for - column data types'); -### type_info tests -my $test_type_info = { - 'artistid' => { - 'data_type' => 'integer', - 'is_nullable' => 0, - 'size' => 4, - }, - 'name' => { - 'data_type' => 'character varying', - 'is_nullable' => 1, - 'size' => 100, - 'default_value' => undef, - }, - 'rank' => { - 'data_type' => 'integer', - 'is_nullable' => 0, - 'size' => 4, - 'default_value' => 13, - - }, - 'charfield' => { - 'data_type' => 'character', - 'is_nullable' => 1, - 'size' => 10, - 'default_value' => undef, - }, - 'arrayfield' => { - 'data_type' => 'integer[]', - 'is_nullable' => 1, - 'size' => undef, - 'default_value' => undef, - }, -}; -my $type_info = $schema->storage->columns_info_for('dbic_t_schema.artist'); -my $artistid_defval = delete $type_info->{artistid}->{default_value}; -like($artistid_defval, - qr/^nextval\('([^\.]*\.){0,1}artist_artistid_seq'::(?:text|regclass)\)/, - 'columns_info_for - sequence matches Pg get_autoinc_seq expectations'); -is_deeply($type_info, $test_type_info, - 'columns_info_for - column data types'); +####### Array tests + BEGIN { + package DBICTest::Schema::ArrayTest; + push @main::test_classes, __PACKAGE__; + use strict; + use warnings; + use base 'DBIx::Class::Core'; -####### Array tests + __PACKAGE__->table('dbic_t_schema.array_test'); + __PACKAGE__->add_columns(qw/id arrayfield/); + __PACKAGE__->column_info_from_storage(1); + __PACKAGE__->set_primary_key('id'); -BEGIN { - package DBICTest::Schema::ArrayTest; - push @main::test_classes, __PACKAGE__; - - use strict; - use warnings; - use base 'DBIx::Class::Core'; + } + SKIP: { + skip "Need DBD::Pg 2.9.2 or newer for array tests", 4 if $DBD::Pg::VERSION < 2.009002; - __PACKAGE__->table('dbic_t_schema.array_test'); - __PACKAGE__->add_columns(qw/id arrayfield/); - __PACKAGE__->column_info_from_storage(1); - __PACKAGE__->set_primary_key('id'); + lives_ok { + $schema->resultset('ArrayTest')->create({ + arrayfield => [1, 2], + }); + } 'inserting arrayref as pg array data'; -} -SKIP: { - skip "Need DBD::Pg 2.9.2 or newer for array tests", 4 if $DBD::Pg::VERSION < 2.009002; + lives_ok { + $schema->resultset('ArrayTest')->update({ + arrayfield => [3, 4], + }); + } 'updating arrayref as pg array data'; - lives_ok { $schema->resultset('ArrayTest')->create({ - arrayfield => [1, 2], + arrayfield => [5, 6], }); - } 'inserting arrayref as pg array data'; - - lives_ok { - $schema->resultset('ArrayTest')->update({ - arrayfield => [3, 4], - }); - } 'updating arrayref as pg array data'; - - $schema->resultset('ArrayTest')->create({ - arrayfield => [5, 6], - }); - my $count; - lives_ok { - $count = $schema->resultset('ArrayTest')->search({ - arrayfield => \[ '= ?' => [arrayfield => [3, 4]] ], #Todo anything less ugly than this? - })->count; - } 'comparing arrayref to pg array data does not blow up'; - is($count, 1, 'comparing arrayref to pg array data gives correct result'); -} + my $count; + lives_ok { + $count = $schema->resultset('ArrayTest')->search({ + arrayfield => \[ '= ?' => [arrayfield => [3, 4]] ], #Todo anything less ugly than this? + })->count; + } 'comparing arrayref to pg array data does not blow up'; + is($count, 1, 'comparing arrayref to pg array data gives correct result'); + } ########## Case check -BEGIN { - package DBICTest::Schema::Casecheck; - push @main::test_classes, __PACKAGE__; + BEGIN { + package DBICTest::Schema::Casecheck; + push @main::test_classes, __PACKAGE__; - use strict; - use warnings; - use base 'DBIx::Class::Core'; + use strict; + use warnings; + use base 'DBIx::Class::Core'; - __PACKAGE__->table('dbic_t_schema.casecheck'); - __PACKAGE__->add_columns(qw/id name NAME uc_name/); - __PACKAGE__->column_info_from_storage(1); - __PACKAGE__->set_primary_key('id'); -} + __PACKAGE__->table('dbic_t_schema.casecheck'); + __PACKAGE__->add_columns(qw/id name NAME uc_name/); + __PACKAGE__->column_info_from_storage(1); + __PACKAGE__->set_primary_key('id'); + } -my $name_info = $schema->source('Casecheck')->column_info( 'name' ); -is( $name_info->{size}, 1, "Case sensitive matching info for 'name'" ); + my $name_info = $schema->source('Casecheck')->column_info( 'name' ); + is( $name_info->{size}, 1, "Case sensitive matching info for 'name'" ); -my $NAME_info = $schema->source('Casecheck')->column_info( 'NAME' ); -is( $NAME_info->{size}, 2, "Case sensitive matching info for 'NAME'" ); + my $NAME_info = $schema->source('Casecheck')->column_info( 'NAME' ); + is( $NAME_info->{size}, 2, "Case sensitive matching info for 'NAME'" ); -my $uc_name_info = $schema->source('Casecheck')->column_info( 'uc_name' ); -is( $uc_name_info->{size}, 3, "Case insensitive matching info for 'uc_name'" ); + my $uc_name_info = $schema->source('Casecheck')->column_info( 'uc_name' ); + is( $uc_name_info->{size}, 3, "Case insensitive matching info for 'uc_name'" ); ## Test SELECT ... FOR UPDATE -SKIP: { - if(eval "require Sys::SigAction" && !$@) { - Sys::SigAction->import( 'set_sig_handler' ); - } - else { - skip "Sys::SigAction is not available", 6; - } + SKIP: { + if(eval "require Sys::SigAction" && !$@) { + Sys::SigAction->import( 'set_sig_handler' ); + } + else { + skip "Sys::SigAction is not available", 6; + } - my ($timed_out, $artist2); + my ($timed_out, $artist2); - for my $t ( - { - # Make sure that an error was raised, and that the update failed - update_lock => 1, - test_sub => sub { - ok($timed_out, "update from second schema times out"); - ok($artist2->is_column_changed('name'), "'name' column is still dirty from second schema"); + for my $t ( + { + # Make sure that an error was raised, and that the update failed + update_lock => 1, + test_sub => sub { + ok($timed_out, "update from second schema times out"); + ok($artist2->is_column_changed('name'), "'name' column is still dirty from second schema"); + }, }, - }, - { - # Make sure that an error was NOT raised, and that the update succeeded - update_lock => 0, - test_sub => sub { - ok(! $timed_out, "update from second schema DOES NOT timeout"); - ok(! $artist2->is_column_changed('name'), "'name' column is NOT dirty from second schema"); + { + # Make sure that an error was NOT raised, and that the update succeeded + update_lock => 0, + test_sub => sub { + ok(! $timed_out, "update from second schema DOES NOT timeout"); + ok(! $artist2->is_column_changed('name'), "'name' column is NOT dirty from second schema"); + }, }, - }, - ) { - # create a new schema - my $schema2 = DBICTest::Schema->connect($dsn, $user, $pass); - $schema2->source("Artist")->name("dbic_t_schema.artist"); - - $schema->txn_do( sub { - my $artist = $schema->resultset('Artist')->search( - { - artistid => 1 - }, - $t->{update_lock} ? { for => 'update' } : {} - )->first; - is($artist->artistid, 1, "select returns artistid = 1"); - - $timed_out = 0; - eval { - my $h = set_sig_handler( 'ALRM', sub { die "DBICTestTimeout" } ); - alarm(2); - $artist2 = $schema2->resultset('Artist')->find(1); - $artist2->name('fooey'); - $artist2->update; - alarm(0); - }; - $timed_out = $@ =~ /DBICTestTimeout/; - }); + ) { + # create a new schema + my $schema2 = DBICTest::Schema->connect($dsn, $user, $pass); + $schema2->source("Artist")->name("dbic_t_schema.artist"); + + $schema->txn_do( sub { + my $artist = $schema->resultset('Artist')->search( + { + artistid => 1 + }, + $t->{update_lock} ? { for => 'update' } : {} + )->first; + is($artist->artistid, 1, "select returns artistid = 1"); + + $timed_out = 0; + eval { + my $h = set_sig_handler( 'ALRM', sub { die "DBICTestTimeout" } ); + alarm(2); + $artist2 = $schema2->resultset('Artist')->find(1); + $artist2->name('fooey'); + $artist2->update; + alarm(0); + }; + $timed_out = $@ =~ /DBICTestTimeout/; + }); - $t->{test_sub}->(); - } -} + $t->{test_sub}->(); + } + } ######## other older Auto-pk tests -$schema->source("SequenceTest")->name("dbic_t_schema.sequence_test"); -for (1..5) { - my $st = $schema->resultset('SequenceTest')->create({ name => 'foo' }); - is($st->pkid1, $_, "Auto-PK for sequence without default: First primary key"); - is($st->pkid2, $_ + 9, "Auto-PK for sequence without default: Second primary key"); - is($st->nonpkid, $_ + 19, "Auto-PK for sequence without default: Non-primary key"); -} -my $st = $schema->resultset('SequenceTest')->create({ name => 'foo', pkid1 => 55 }); -is($st->pkid1, 55, "Auto-PK for sequence without default: First primary key set manually"); + $schema->source("SequenceTest")->name("dbic_t_schema.sequence_test"); + for (1..5) { + my $st = $schema->resultset('SequenceTest')->create({ name => 'foo' }); + is($st->pkid1, $_, "Auto-PK for sequence without default: First primary key"); + is($st->pkid2, $_ + 9, "Auto-PK for sequence without default: Second primary key"); + is($st->nonpkid, $_ + 19, "Auto-PK for sequence without default: Non-primary key"); + } + my $st = $schema->resultset('SequenceTest')->create({ name => 'foo', pkid1 => 55 }); + is($st->pkid1, 55, "Auto-PK for sequence without default: First primary key set manually"); ######## test non-serial auto-pk -if ($schema->storage->can_insert_returning) { - $schema->source('TimestampPrimaryKey')->name('dbic_t_schema.timestamp_primary_key_test'); - my $row = $schema->resultset('TimestampPrimaryKey')->create({}); - ok $row->id; -} + if ($schema->storage->can_insert_returning) { + $schema->source('TimestampPrimaryKey')->name('dbic_t_schema.timestamp_primary_key_test'); + my $row = $schema->resultset('TimestampPrimaryKey')->create({}); + ok $row->id; + } ######## test with_deferred_fk_checks -$schema->source('CD')->name('dbic_t_schema.cd'); -$schema->source('Track')->name('dbic_t_schema.track'); -lives_ok { - $schema->storage->with_deferred_fk_checks(sub { - $schema->resultset('Track')->create({ - trackid => 999, cd => 999, position => 1, title => 'deferred FK track' - }); - $schema->resultset('CD')->create({ - artist => 1, cdid => 999, year => '2003', title => 'deferred FK cd' + $schema->source('CD')->name('dbic_t_schema.cd'); + $schema->source('Track')->name('dbic_t_schema.track'); + lives_ok { + $schema->storage->with_deferred_fk_checks(sub { + $schema->resultset('Track')->create({ + trackid => 999, cd => 999, position => 1, title => 'deferred FK track' + }); + $schema->resultset('CD')->create({ + artist => 1, cdid => 999, year => '2003', title => 'deferred FK cd' + }); }); - }); -} 'with_deferred_fk_checks code survived'; + } 'with_deferred_fk_checks code survived'; -is eval { $schema->resultset('Track')->find(999)->title }, 'deferred FK track', - 'code in with_deferred_fk_checks worked'; + is eval { $schema->resultset('Track')->find(999)->title }, 'deferred FK track', + 'code in with_deferred_fk_checks worked'; -throws_ok { - $schema->resultset('Track')->create({ - trackid => 1, cd => 9999, position => 1, title => 'Track1' - }); -} qr/constraint/i, 'with_deferred_fk_checks is off'; + throws_ok { + $schema->resultset('Track')->create({ + trackid => 1, cd => 9999, position => 1, title => 'Track1' + }); + } qr/constraint/i, 'with_deferred_fk_checks is off'; +} done_testing; -exit; - END { return unless $schema; drop_test_schema($schema); @@ -539,6 +540,7 @@ sub run_extended_apk_tests { my $search_path_save = eapk_get_search_path($schema); eapk_drop_all($schema); + %seqs = (); # make the test schemas and sequences $schema->storage->dbh_do(sub {