From: Matt S Trout Date: Tue, 11 Apr 2006 16:01:09 +0000 (+0000) Subject: Merge 'trunk' into 'DBIx-Class-current' X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=fed966517e558cfc9ee505d44add2d04e77a7d3d;p=dbsrgits%2FDBIx-Class-Historic.git Merge 'trunk' into 'DBIx-Class-current' r9411@obrien (orig r1386): castaway | 2006-03-29 16:30:55 +0100 ResultSetManager example from CaptainCarlos r9412@obrien (orig r1387): nigel | 2006-03-30 14:20:42 +0100 Cleaned up reference to DBIx::Class::Manual::FAQ which no longer exists r9413@obrien (orig r1388): nigel | 2006-03-30 14:23:04 +0100 Cleaned up reference to DBIx::Class::Manual::FAQ which no longer exists r9414@obrien (orig r1389): castaway | 2006-03-30 18:53:26 +0100 Typo fixups and small documentation expansions r9426@obrien (orig r1396): matthewt | 2006-04-01 01:10:06 +0100 Storage::DBI error reporting improvement from Dan Sully r9443@obrien (orig r1397): castaway | 2006-04-01 18:05:24 +0100 added "having" r9444@obrien (orig r1398): castaway | 2006-04-01 22:28:34 +0100 New doc r9447@obrien (orig r1401): purge | 2006-04-03 18:25:18 +0100 New tests for cascade_delete, including fail. r9449@obrien (orig r1403): dsully | 2006-04-03 23:16:35 +0100 Wrap DBI->connnect and ->sth calls in eval to properly throw an exception. r9453@obrien (orig r1407): nigel | 2006-04-04 13:48:50 +0100 Added some track test data and a cascading relationship test r9454@obrien (orig r1408): purge | 2006-04-04 13:52:56 +0100 Fix to cascade_delete courtesy mst. r9458@obrien (orig r1412): castaway | 2006-04-04 20:52:05 +0100 Use DocMap r9461@obrien (orig r1414): matthewt | 2006-04-05 01:16:49 +0100 Rid of a wantarray r9497@obrien (orig r1418): nigel | 2006-04-06 15:20:32 +0100 Applied mst fixes for delete on resultsetin [839] to update. Factored out common code r9498@obrien (orig r1419): matthewt | 2006-04-06 16:54:56 +0100 Fixup to Cursor, updated Changes r9520@obrien (orig r1420): captainL | 2006-04-06 18:36:57 +0100 fixed multiple column count distincts in SQLite and Oracle r9528@obrien (orig r1423): nigel | 2006-04-07 12:03:36 +0100 Made storage txn_* functions log DBI operations to SQL debug trace r9534@obrien (orig r1429): matthewt | 2006-04-08 18:43:08 +0100 fix to update with undefined relations r9558@obrien (orig r1434): castaway | 2006-04-08 22:27:33 +0100 Skip distinct tests on old sqlite versions r9568@obrien (orig r1435): matthewt | 2006-04-08 22:53:55 +0100 0.06001 changes --- fed966517e558cfc9ee505d44add2d04e77a7d3d diff --cc Changes index b1d2c80,d7e4333..c33cc68 --- a/Changes +++ b/Changes @@@ -1,12 -1,15 +1,20 @@@ Revision history for DBIx::Class + - added remove_column(s) to ResultSource/ResultSourceProxy + - added add_column alias to ResultSourceProxy + - added source_name to ResultSource + - load_classes now uses source_name and sets it if necessary + 0.06001 + - minor fix to update in case of undefined rels + - fixes for cascade delete + - substantial improvements and fixes to deploy - Added fix for quoting with single table + - Substantial fixes and improvements to deploy + - slice now uses search directly + - fixes for update() on resultset + - bugfix to Cursor to avoid error during DESTROY + - transaction DBI operations now in debug trace output 0.06000 - Lots of documentation improvements diff --cc t/run/01core.tl index d2fcd24,9ef60a0..5d04001 --- a/t/run/01core.tl +++ b/t/run/01core.tl @@@ -1,7 -1,20 +1,20 @@@ sub run_tests { my $schema = shift; - plan tests => 46; -plan tests => 44; ++plan tests => 49; + + # 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; + } + my @art = $schema->resultset("Artist")->search({ }, { order_by => 'name DESC'});