X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F746mssql.t;h=f9142f70229dd472aa360b8ca32d27f4fef0c474;hb=b8c333730df3277fee493df7ba6601ce1bb5f6ec;hp=0dbd4792e3afef45bb9cc6ab45b52179990150ab;hpb=e06ad5d5eca3cad12045953e06fd6b6c72c1027d;p=dbsrgits%2FDBIx-Class.git diff --git a/t/746mssql.t b/t/746mssql.t index 0dbd479..f9142f7 100644 --- a/t/746mssql.t +++ b/t/746mssql.t @@ -12,8 +12,7 @@ my ($dsn, $user, $pass) = @ENV{map { "DBICTEST_MSSQL_ODBC_${_}" } qw/DSN USER PA plan skip_all => 'Set $ENV{DBICTEST_MSSQL_ODBC_DSN}, _USER and _PASS to run this test' unless ($dsn && $user); -plan tests => 33; - +DBICTest::Schema->load_classes('ArtistGUID'); my $schema = DBICTest::Schema->connect($dsn, $user, $pass); { @@ -29,6 +28,11 @@ my $schema = DBICTest::Schema->connect($dsn, $user, $pass); isa_ok( $schema->storage, 'DBIx::Class::Storage::DBI::ODBC::Microsoft_SQL_Server' ); +{ + my $schema2 = $schema->connect ($schema->storage->connect_info); + ok (! $schema2->storage->connected, 'a re-connected cloned schema starts unconnected'); +} + $schema->storage->dbh_do (sub { my ($storage, $dbh) = @_; eval { $dbh->do("DROP TABLE artist") }; @@ -41,17 +45,37 @@ CREATE TABLE artist ( primary key(artistid) ) SQL - }); my %seen_id; -# fresh $schema so we start unconnected -$schema = DBICTest::Schema->connect($dsn, $user, $pass); +my @opts = ( + { on_connect_call => 'use_dynamic_cursors' }, + {}, +); +my $new; + +# test Auto-PK with different options +for my $opts (@opts) { + SKIP: { + $schema = DBICTest::Schema->connect($dsn, $user, $pass, $opts); + + eval { + $schema->storage->ensure_connected + }; + if ($@ =~ /dynamic cursors/) { + skip +'Dynamic Cursors not functional, tds_version 8.0 or greater required if using'. +' FreeTDS', 1; + } -# test primary key handling -my $new = $schema->resultset('Artist')->create({ name => 'foo' }); -ok($new->artistid > 0, "Auto-PK worked"); + $schema->resultset('Artist')->search({ name => 'foo' })->delete; + + $new = $schema->resultset('Artist')->create({ name => 'foo' }); + + ok($new->artistid > 0, "Auto-PK worked"); + } +} $seen_id{$new->artistid}++; @@ -73,6 +97,52 @@ $it->next; is( $it->next->name, "Artist 2", "iterator->next ok" ); is( $it->next, undef, "next past end of resultset ok" ); +# test GUID columns + +$schema->storage->dbh_do (sub { + my ($storage, $dbh) = @_; + eval { $dbh->do("DROP TABLE artist") }; + $dbh->do(<<'SQL'); +CREATE TABLE artist ( + artistid UNIQUEIDENTIFIER NOT NULL, + name VARCHAR(100), + rank INT NOT NULL DEFAULT '13', + charfield CHAR(10) NULL, + a_guid UNIQUEIDENTIFIER, + primary key(artistid) +) +SQL +}); + +# start disconnected to make sure insert works on an un-reblessed storage +$schema = DBICTest::Schema->connect($dsn, $user, $pass); + +my $row; +lives_ok { + $row = $schema->resultset('ArtistGUID')->create({ name => 'mtfnpy' }) +} 'created a row with a GUID'; + +ok( + eval { $row->artistid }, + 'row has GUID PK col populated', +); +diag $@ if $@; + +ok( + eval { $row->a_guid }, + 'row has a GUID col with auto_nextval populated', +); +diag $@ if $@; + +my $row_from_db = $schema->resultset('ArtistGUID') + ->search({ name => 'mtfnpy' })->first; + +is $row_from_db->artistid, $row->artistid, + 'PK GUID round trip'; + +is $row_from_db->a_guid, $row->a_guid, + 'NON-PK GUID round trip'; + # test MONEY type $schema->storage->dbh_do (sub { my ($storage, $dbh) = @_; @@ -87,18 +157,18 @@ SQL my $rs = $schema->resultset('Money'); -my $row; lives_ok { $row = $rs->create({ amount => 100 }); } 'inserted a money value'; -is $rs->find($row->id)->amount, '100.00', 'money value round-trip'; +cmp_ok $rs->find($row->id)->amount, '==', 100, 'money value round-trip'; lives_ok { $row->update({ amount => 200 }); } 'updated a money value'; -is $rs->find($row->id)->amount, '200.00', 'updated money value round-trip'; +cmp_ok $rs->find($row->id)->amount, '==', 200, + 'updated money value round-trip'; lives_ok { $row->update({ amount => undef }); @@ -108,10 +178,10 @@ is $rs->find($row->id)->amount, undef,'updated money value to NULL round-trip'; $schema->storage->dbh_do (sub { my ($storage, $dbh) = @_; - eval { $dbh->do("DROP TABLE Owners") }; - eval { $dbh->do("DROP TABLE Books") }; + eval { $dbh->do("DROP TABLE owners") }; + eval { $dbh->do("DROP TABLE books") }; $dbh->do(<<'SQL'); -CREATE TABLE Books ( +CREATE TABLE books ( id INT IDENTITY (1, 1) NOT NULL, source VARCHAR(100), owner INT, @@ -119,7 +189,7 @@ CREATE TABLE Books ( price INT NULL ) -CREATE TABLE Owners ( +CREATE TABLE owners ( id INT IDENTITY (1, 1) NOT NULL, name VARCHAR(100), ) @@ -128,15 +198,17 @@ SQL }); lives_ok ( sub { + # start a new connection, make sure rebless works + my $schema = DBICTest::Schema->connect($dsn, $user, $pass); $schema->populate ('Owners', [ [qw/id name /], [qw/1 wiggle/], [qw/2 woggle/], [qw/3 boggle/], - [qw/4 fREW/], - [qw/5 fRIOUX/], - [qw/6 fROOH/], - [qw/7 fRUE/], + [qw/4 fRIOUX/], + [qw/5 fRUE/], + [qw/6 fREW/], + [qw/7 fROOH/], [qw/8 fISMBoC/], [qw/9 station/], [qw/10 mirror/], @@ -148,7 +220,22 @@ lives_ok ( sub { ]); }, 'populate with PKs supplied ok' ); +lives_ok (sub { + # start a new connection, make sure rebless works + # test an insert with a supplied identity, followed by one without + my $schema = DBICTest::Schema->connect($dsn, $user, $pass); + for (2, 1) { + my $id = $_ * 20 ; + $schema->resultset ('Owners')->create ({ id => $id, name => "troglodoogle $id" }); + $schema->resultset ('Owners')->create ({ name => "troglodoogle " . ($id + 1) }); + } +}, 'create with/without PKs ok' ); + +is ($schema->resultset ('Owners')->count, 19, 'owner rows really in db' ); + lives_ok ( sub { + # start a new connection, make sure rebless works + my $schema = DBICTest::Schema->connect($dsn, $user, $pass); $schema->populate ('BooksInLibrary', [ [qw/source owner title /], [qw/Library 1 secrets0/], @@ -167,6 +254,101 @@ lives_ok ( sub { ]); }, 'populate without PKs supplied ok' ); +# make sure ordered subselects work +{ + my $owners = $schema->resultset ('Owners')->search ({}, { order_by => 'name' }); + my $al = $owners->current_source_alias; + my $sealed_owners = $owners->result_source->resultset->search ( + {}, + { + alias => $al, + from => [{ + -alias => $al, + -source_handle => $owners->result_source->handle, + $al => $owners->as_query, + }], + }, + ); + + $schema->storage->debug (1); + diag "\n"; + my @names = map { $_->name } ($owners->all); + my @subq_names = map { $_->name } ($sealed_owners->all); + + is_deeply ( + \@names, + \@subq_names, + 'Sort preserved from within a subquery' + ) || diag do { require Data::Dumper::Concise; Data::Dumper::Concise::Dumper (\@names, \@subq_names) }; + $schema->storage->debug (0); + + + + my $book_owner_ids = $schema->resultset ('BooksInLibrary') + ->search ({}, { join => 'owner', distinct => 1, order_by => 'owner.name' }) + ->get_column ('owner'); + + my $book_owners = $schema->resultset ('Owners')->search ({ + id => { -in => $book_owner_ids->as_query } + }); + + is ($book_owners->count, 8, 'Correct amount of book owners'); + + is_deeply ( + [ map { $_->id } ($book_owners->all) ], + [ $book_owner_ids->all ], + 'Sort is preserved across IN subqueries', + ); +} + +# make sure right-join-side single-prefetch ordering limit works +{ + my $rs = $schema->resultset ('BooksInLibrary')->search ( + { + 'owner.name' => { '!=', 'woggle' }, + }, + { + prefetch => 'owner', + order_by => 'owner.name', + } + ); + # this is the order in which they should come from the above query + my @owner_names = qw/boggle fISMBoC fREW fRIOUX fROOH fRUE wiggle wiggle/; + + is ($rs->all, 8, 'Correct amount of objects from right-sorted joined resultset'); + is_deeply ( + [map { $_->owner->name } ($rs->all) ], + \@owner_names, + 'Rows were properly ordered' + ); + + my $limited_rs = $rs->search ({}, {rows => 7, offset => 2}); + is ($limited_rs->count, 6, 'Correct count of limited right-sorted joined resultset'); + is ($limited_rs->count_rs->next, 6, 'Correct count_rs of limited right-sorted joined resultset'); + + my $queries; + $schema->storage->debugcb(sub { $queries++; }); + $schema->storage->debug(1); + + is_deeply ( + [map { $_->owner->name } ($limited_rs->all) ], + [@owner_names[2 .. 7]], + 'Limited rows were properly ordered' + ); + is ($queries, 1, 'Only one query with prefetch'); + + $schema->storage->debugcb(undef); + $schema->storage->debug(0); + + + is_deeply ( + [map { $_->name } ($limited_rs->search_related ('owner')->all) ], + [@owner_names[2 .. 7]], + 'Rows are still properly ordered after search_related' + ); +} + + # # try a prefetch on tables with identically named columns # @@ -177,92 +359,145 @@ $schema->storage->_sql_maker->{name_sep} = '.'; { # try a ->has_many direction - my $owners = $schema->resultset ('Owners')->search ({ - 'books.id' => { '!=', undef } - }, { + my $owners = $schema->resultset ('Owners')->search ( + { + 'books.id' => { '!=', undef }, + 'me.name' => { '!=', 'somebogusstring' }, + }, + { prefetch => 'books', - order_by => 'name', + order_by => { -asc => \['name + ?', [ test => 'xxx' ]] }, # test bindvar propagation rows => 3, # 8 results total - }); + }, + ); + + my ($sql, @bind) = @${$owners->page(3)->as_query}; + is_deeply ( + \@bind, + [ ([ 'me.name' => 'somebogusstring' ], [ test => 'xxx' ]) x 2 ], # double because of the prefetch subq + ); is ($owners->page(1)->all, 3, 'has_many prefetch returns correct number of rows'); is ($owners->page(1)->count, 3, 'has-many prefetch returns correct count'); - TODO: { - local $TODO = 'limit past end of resultset problem'; - is ($owners->page(3)->all, 2, 'has_many prefetch returns correct number of rows'); - is ($owners->page(3)->count, 2, 'has-many prefetch returns correct count'); - is ($owners->page(3)->count_rs->next, 2, 'has-many prefetch returns correct count_rs'); - - # make sure count does not become overly complex FIXME - is_same_sql_bind ( - $owners->page(3)->count_rs->as_query, - '( - SELECT COUNT( * ) - FROM ( - SELECT TOP 3 [me].[id] - FROM [owners] [me] - LEFT JOIN [books] [books] ON [books].[owner] = [me].[id] - WHERE ( [books].[id] IS NOT NULL ) - GROUP BY [me].[id] - ORDER BY [me].[id] DESC - ) [count_subq] - )', - [], - ); - } + is ($owners->page(3)->all, 2, 'has_many prefetch returns correct number of rows'); + is ($owners->page(3)->count, 2, 'has-many prefetch returns correct count'); + is ($owners->page(3)->count_rs->next, 2, 'has-many prefetch returns correct count_rs'); + # try a ->belongs_to direction (no select collapse, group_by should work) - my $books = $schema->resultset ('BooksInLibrary')->search ({ + my $books = $schema->resultset ('BooksInLibrary')->search ( + { 'owner.name' => [qw/wiggle woggle/], - }, { + }, + { distinct => 1, + having => \['1 = ?', [ test => 1 ] ], #test having propagation prefetch => 'owner', rows => 2, # 3 results total order_by => { -desc => 'owner' }, - # there is no sane way to order by the right side of a grouped prefetch currently :( - #order_by => { -desc => 'owner.name' }, - }); - + }, + ); + + ($sql, @bind) = @${$books->page(3)->as_query}; + is_deeply ( + \@bind, + [ + # inner + [ 'owner.name' => 'wiggle' ], [ 'owner.name' => 'woggle' ], [ source => 'Library' ], [ test => '1' ], + # outer + [ 'owner.name' => 'wiggle' ], [ 'owner.name' => 'woggle' ], [ source => 'Library' ], + ], + ); is ($books->page(1)->all, 2, 'Prefetched grouped search returns correct number of rows'); is ($books->page(1)->count, 2, 'Prefetched grouped search returns correct count'); - TODO: { - local $TODO = 'limit past end of resultset problem'; - is ($books->page(2)->all, 1, 'Prefetched grouped search returns correct number of rows'); - is ($books->page(2)->count, 1, 'Prefetched grouped search returns correct count'); - is ($books->page(2)->count_rs->next, 1, 'Prefetched grouped search returns correct count_rs'); - - # make sure count does not become overly complex FIXME - is_same_sql_bind ( - $books->page(2)->count_rs->as_query, - '( - SELECT COUNT( * ) - FROM ( - SELECT TOP 2 [me].[id] - FROM [books] [me] - JOIN [owners] [owner] ON [owner].[id] = [me].[owner] - WHERE ( ( ( [owner].[name] = ? OR [owner].[name] = ? ) AND [source] = ? ) ) - GROUP BY [me].[id], [me].[source], [me].[owner], [me].[title], [me].[price], [owner].[id], [owner].[name] - ORDER BY [me].[id] DESC - ) [count_subq] - )', - [ - [ 'owner.name' => 'wiggle' ], - [ 'owner.name' => 'woggle' ], - [ 'source' => 'Library' ], - ], - ); - } + is ($books->page(2)->all, 1, 'Prefetched grouped search returns correct number of rows'); + is ($books->page(2)->count, 1, 'Prefetched grouped search returns correct count'); + is ($books->page(2)->count_rs->next, 1, 'Prefetched grouped search returns correct count_rs'); +} + + +# Just to aid bug-hunting, delete block before merging +{ + + my $limited_rs = $schema->resultset ('BooksInLibrary')->search ( + { + 'owner.name' => { '!=', 'woggle' }, + }, + { + prefetch => 'owner', + order_by => 'owner.name', + rows => 7, + offset => 2, + } + ); + + +=begin + +Alan's SQL: + + SELECT me.id, me.surveyor_id, me.survey_site_id, me.year, surveyor.id, surveyor.name, surveyor.email, surveyor.phone, surveyor.login, surveyor.password, surveyor.is_active, surveyor.is_verifier, surveyor.arm_length, surveyor.eye_height, surveyor.year_joined + FROM ( + SELECT * + FROM ( + SELECT orig_query.*, ROW_NUMBER() OVER( ORDER BY (SELECT(1)) ) AS rno__row__index + FROM ( + SELECT me.id, me.surveyor_id, me.survey_site_id, me.year + FROM ( + SELECT TOP 100 PERCENT me.id, me.surveyor_id, me.survey_site_id, me.year + FROM surveyors_survey_sites me + JOIN surveyors surveyor ON surveyor.id = me.surveyor_id + ORDER BY surveyor.name + ) me + ) orig_query + ) rno_subq + WHERE rno__row__index BETWEEN 136 AND 150 + ) me + JOIN surveyors surveyor ON surveyor.id = me.surveyor_id + ORDER BY surveyor.name +=cut + + is_same_sql_bind ( + $limited_rs->as_query, + '( + SELECT TOP 100 PERCENT [me].[id], [me].[source], [me].[owner], [me].[title], [me].[price], [owner].[id], [owner].[name] + FROM ( + SELECT * + FROM ( + SELECT [me].*, ROW_NUMBER() OVER( ORDER BY (SELECT(1)) ) AS rno__row__index + FROM ( + SELECT [me].[id], [me].[source], [me].[owner], [me].[title], [me].[price] + FROM ( + SELECT TOP 100 PERCENT [me].[id], [me].[source], [me].[owner], [me].[title], [me].[price] + FROM [books] [me] + JOIN [owners] [owner] ON [owner].[id] = [me].[owner] + WHERE ( ( [owner].[name] != ? AND [source] = ? ) ) + ORDER BY [owner].[name] + ) [me] + ) [me] + ) rno_subq + WHERE rno__row__index BETWEEN 3 AND 9 + ) [me] + JOIN [owners] [owner] ON [owner].[id] = [me].[owner] + WHERE ( ( [owner].[name] != ? AND [source] = ? ) ) + ORDER BY [owner].[name] + )', + [ ([ 'owner.name' => 'woggle' ], [ source => 'Library' ]) x 2 ], + 'Expected SQL executed', + ); } +done_testing; + # clean up our mess END { if (my $dbh = eval { $schema->storage->_dbh }) { eval { $dbh->do("DROP TABLE $_") } - for qw/artist money_test Books Owners/; + for qw/artist money_test books owners/; } } # vim:sw=2 sts=2