From fb4d77e95874dad2f37294f181e69d83e989ca7d Mon Sep 17 00:00:00 2001 From: Doug Bell Date: Fri, 8 Feb 2008 01:21:20 +0000 Subject: [PATCH] fix: possibly fixed. --- t/Asset/Asset_diagnose.t | 38 ++++++++++++++++++++++++++------------ 1 file changed, 26 insertions(+), 12 deletions(-) diff --git a/t/Asset/Asset_diagnose.t b/t/Asset/Asset_diagnose.t index 4515463b4..91b9bebae 100644 --- a/t/Asset/Asset_diagnose.t +++ b/t/Asset/Asset_diagnose.t @@ -45,16 +45,30 @@ SKIP: { } foreach my $asset ( @assets ) { - eval "use $asset"; - my $def = $asset->definition($session); - my $tableName = $def->[0]->{tableName}; - my $classIds = $session->db->buildArrayRef("select distinct(assetId) from asset where className LIKE ? order by assetId", [$asset.'%']); - my $tableIds = $session->db->buildArrayRef(sprintf("select distinct(assetId) from %s order by assetId", $tableName)); - my $skipDetails = is_deeply($classIds, $tableIds, - sprintf("Comparing assetIds for %s",$asset) - ); - SKIP: { - skip("No details needed for $asset", 1) if $skipDetails; - cmp_bag($classIds, $tableIds, "Checking asset vs table for $asset"); - } + eval "use $asset"; + my $def = $asset->definition($session); + my $tableName = $def->[0]->{tableName}; + my $classIds + = $session->db->buildArrayRef( + q{ + select distinct(assetId) + from asset + where className = ? OR className LIKE ? + order by assetId + }, + [$asset, $asset.'::%'] + ); + + my $tableIds + = $session->db->buildArrayRef( + sprintf("select distinct(assetId) from %s order by assetId", $tableName) + ); + + my $skipDetails = is_deeply($classIds, $tableIds, + sprintf("Comparing assetIds for %s",$asset) + ); + SKIP: { + skip("No details needed for $asset", 1) if $skipDetails; + cmp_bag($classIds, $tableIds, "Checking asset vs table for $asset"); + } }