fix package import and upgrade tests, add sql upgrade tests

lib/WebGUI/AssetPackage.pm

@@ -161,6 +161,7 @@ sub importAssetData {
     WebGUI::Asset->loadModule( $class );
 
     my %properties = %{ $data->{properties} };
+    delete $properties{tagId};
     if ($options->{inheritPermissions}) {
         delete $properties{ownerUserId};
         delete $properties{groupIdView};
@@ -173,6 +174,13 @@ sub importAssetData {
         $properties{isDefault} = 1;
     }
 
+    if ($options->{clearPackageFlag}) {
+        $properties{isPackage} = 0;
+    }
+    if ($options->{setDefaultTemplate}) {
+        $properties{isDefault} = 1;
+    }
+
     my $asset = eval { $class->new($session, $id, $version); };
 
     if (! Exception::Class->caught()) { # update an existing revision

lib/WebGUI/Upgrade/File/wgpkg.pm

@@ -8,6 +8,7 @@ use WebGUI::Session;
 use WebGUI::Storage;
 use WebGUI::VersionTag;
 use File::Spec;
+use Try::Tiny;
 
 sub run {
     my $class = shift;
@@ -16,15 +17,13 @@ sub run {
     my $session = WebGUI::Session->open($configFile);
     $session->user({userId => 3});
 
+    my $versionTag = WebGUI::VersionTag->getWorking($session);
     (undef, undef, my $shortname) = File::Spec->splitpath($file);
     $shortname =~ s/\.[^.]*$//;
-
-    my $versionTag = WebGUI::VersionTag->getWorking($session);
     $versionTag->set({name => "Upgrade to $version - $shortname"});
 
     my $package = $class->import_package($session, $file);
 
-warn $versionTag->getId;
     $versionTag->commit;
     $session->var->end;
     $session->close;
@@ -41,8 +40,13 @@ sub import_package {
     $storage->addFileFromFilesystem( $file );
 
     # Import the package into the import node
-    my $package = eval {
-        WebGUI::Asset->getImportNode($session)->importPackage( $storage );
+    my $package = try {
+        my $node = WebGUI::Asset->getImportNode($session);
+        $node->importPackage( $storage, {
+            overwriteLatest    => 1,
+            clearPackageFlag   => 1,
+            setDefaultTemplate => 1,
+        } );
     };
 
     $storage->delete;