diff --git a/docs/upgrades/upgrade_3.7.0-3.8.0.sql b/docs/upgrades/upgrade_3.7.0-3.8.0.sql
index ffbc791b8..d2a0d944e 100644
--- a/docs/upgrades/upgrade_3.7.0-3.8.0.sql
+++ b/docs/upgrades/upgrade_3.7.0-3.8.0.sql
@@ -95,6 +95,9 @@ delete from international where internationalId=36 and namespace='UserSubmission
 alter table UserSubmission change widgetId wobjectId int not null;
 alter table UserSubmission_submission change widgetId wobjectId int not null;
 
+insert into wobject (wobjectId, pageId, title, displayTitle, processMacros, description, dateAdded, addedBy, namespace, lastEdited, editedBy, templatePosition, sequenceNumber, startDate, endDate) select widgetId, pageId, title, displayTitle, processMacros, description, dateAdded, addedBy, namespace, lastEdited, editedBy, templatePosition, sequenceNumber, dateAdded, 1336444487 from widget where namespace='SQLReport';
+delete from widget where namespace='SQLReport';
+alter table SQLReport change widgetId wobjectId int not null;
 
 
 INSERT INTO international VALUES (38,'UserSubmission','English','(Select \"No\" if you\'re writing a HTML/Rich Edit submission.)');
diff --git a/lib/WebGUI/Widget/SQLReport.pm b/lib/WebGUI/Widget/SQLReport.pm
deleted file mode 100644
index 55384b0ac..000000000
--- a/lib/WebGUI/Widget/SQLReport.pm
+++ /dev/null
@@ -1,309 +0,0 @@
-package WebGUI::Widget::SQLReport;
-
-our $namespace = "SQLReport";
-
-#-------------------------------------------------------------------
-# WebGUI is Copyright 2001-2002 Plain Black Software.
-#-------------------------------------------------------------------
-# Please read the legal notices (docs/legal.txt) and the license
-# (docs/license.txt) that came with this distribution before using
-# this software.
-#-------------------------------------------------------------------
-# http://www.plainblack.com                     info@plainblack.com
-#-------------------------------------------------------------------
-
-use strict;
-use WebGUI::ErrorHandler;
-use WebGUI::International;
-use WebGUI::Macro;
-use WebGUI::Paginator;
-use WebGUI::Privilege;
-use WebGUI::Session;
-use WebGUI::Shortcut;
-use WebGUI::SQL;
-use WebGUI::URL;
-use WebGUI::Utility;
-use WebGUI::Widget;
-
-#-------------------------------------------------------------------
-sub duplicate {
-        my (%data, $newWidgetId, $pageId);
-        tie %data, 'Tie::CPHash';
-        %data = getProperties($namespace,$_[0]);
-	$pageId = $_[1] || $data{pageId};
-        $newWidgetId = create($pageId,$namespace,$data{title},$data{displayTitle},
-		$data{description},$data{processMacros},$data{templatePosition});
-	WebGUI::SQL->write("insert into SQLReport values($newWidgetId, ".quote($data{template}).", ".
-		quote($data{dbQuery}).", ".quote($data{DSN}).", ".quote($data{username}).", ".
-		quote($data{identifier}).", ".quote($data{convertCarriageReturns}).", ".
-		quote($data{paginateAfter}).", ".quote($data{preprocessMacros}).", ".
-		quote($data{debugMode}).")");
-}
-
-#-------------------------------------------------------------------
-sub purge {
-        purgeWidget($_[0],$_[1],$namespace);
-}
-
-#-------------------------------------------------------------------
-sub widgetName {
-	return WebGUI::International::get(1,$namespace);
-}
-
-#-------------------------------------------------------------------
-sub www_add {
-        my ($output, %hash);
-	tie %hash, 'Tie::IxHash';
-      	if (WebGUI::Privilege::canEditPage()) {
-                $output = helpLink(1,$namespace);
-		$output .= '<h1>'.WebGUI::International::get(2,$namespace).'</h1>';
-		$output .= formHeader();
-                $output .= WebGUI::Form::hidden("widget",$namespace);
-                $output .= WebGUI::Form::hidden("func","addSave");
-                $output .= '<table>';
-                $output .= tableFormRow(WebGUI::International::get(99),
-			WebGUI::Form::text("title",20,128,widgetName()));
-                $output .= tableFormRow(WebGUI::International::get(174),
-			WebGUI::Form::checkbox("displayTitle",1,1));
-                $output .= tableFormRow(WebGUI::International::get(175),
-			WebGUI::Form::checkbox("processMacros",1,1));
-		%hash = WebGUI::Widget::getPositions();
-                $output .= tableFormRow(WebGUI::International::get(363),
-			WebGUI::Form::selectList("templatePosition",\%hash));
-                $output .= tableFormRow(WebGUI::International::get(85),
-			WebGUI::Form::textArea("description",'','','',1));
-                $output .= tableFormRow(WebGUI::International::get(15,$namespace),
-                        WebGUI::Form::checkbox("preprocessMacros",1));
-                $output .= tableFormRow(WebGUI::International::get(16,$namespace),
-                        WebGUI::Form::checkbox("debugMode",1));
-                $output .= tableFormRow(WebGUI::International::get(4,$namespace),
-                        WebGUI::Form::textArea("dbQuery",''));
-                $output .= tableFormRow(WebGUI::International::get(3,$namespace),
-			WebGUI::Form::textArea("template",'','','',1));
-                $output .= tableFormRow(WebGUI::International::get(5,$namespace),
-			WebGUI::Form::text("DSN",20,255,$session{config}{dsn}));
-                $output .= tableFormRow(WebGUI::International::get(6,$namespace),
-			WebGUI::Form::text("username",20,255,$session{config}{dbuser}));
-                $output .= tableFormRow(WebGUI::International::get(7,$namespace),
-			WebGUI::Form::password("identifier",20,255));
-                $output .= tableFormRow(WebGUI::International::get(14,$namespace),
-                        WebGUI::Form::text("paginateAfter",20,30,50));
-                $output .= tableFormRow(WebGUI::International::get(13,$namespace),
-			WebGUI::Form::checkbox("convertCarriageReturns",1));
-                $output .= formSave();
-                $output .= '</table></form>';
-                return $output;
-        } else {
-                return WebGUI::Privilege::insufficient();
-        }
-	return $output;
-}
-
-#-------------------------------------------------------------------
-sub www_addSave {
-	my ($widgetId);
-	if (WebGUI::Privilege::canEditPage()) {
-		$widgetId = create($session{page}{pageId},$session{form}{widget},
-			$session{form}{title},$session{form}{displayTitle},
-			$session{form}{description},$session{form}{processMacros},
-			$session{form}{templatePosition});
-		WebGUI::SQL->write("insert into SQLReport values($widgetId, ".
-			quote($session{form}{template}).", ".
-			quote($session{form}{dbQuery}).", ".
-			quote($session{form}{DSN}).", ".
-			quote($session{form}{username}).", ".
-			quote($session{form}{identifier}).", ".
-			"'$session{form}{convertCarriageReturns}', ".
-			"'$session{form}{paginateAfter}', ".
-			"'$session{form}{preprocessMacros}', ".
-			"'$session{form}{debugMode}'".
-			")");
-		return "";
-	} else {
-		return WebGUI::Privilege::insufficient();
-	}
-}
-
-#-------------------------------------------------------------------
-sub www_copy {
-        if (WebGUI::Privilege::canEditPage()) {
-                duplicate($session{form}{wid});
-                return "";
-        } else {
-                return WebGUI::Privilege::insufficient();
-        }
-}
-
-#-------------------------------------------------------------------
-sub www_edit {
-        my ($output, %data, %hash, @array);
-	tie %data, 'Tie::CPHash';
-	tie %hash, 'Tie::IxHash';
-        if (WebGUI::Privilege::canEditPage()) {
-		%data = getProperties($namespace,$session{form}{wid});
-                $output = helpLink(1,$namespace);
-                $output .= '<h1>'.WebGUI::International::get(8,$namespace).'</h1>';
-		$output .= formHeader();
-                $output .= WebGUI::Form::hidden("wid",$session{form}{wid});
-                $output .= WebGUI::Form::hidden("func","editSave");
-                $output .= '<table>';
-                $output .= tableFormRow(WebGUI::International::get(99),
-			WebGUI::Form::text("title",20,128,$data{title}));
-                $output .= tableFormRow(WebGUI::International::get(174),
-			WebGUI::Form::checkbox("displayTitle","1",$data{displayTitle}));
-                $output .= tableFormRow(WebGUI::International::get(175),
-			WebGUI::Form::checkbox("processMacros","1",$data{processMacros}));
-		%hash = WebGUI::Widget::getPositions();
-                $array[0] = $data{templatePosition};
-                $output .= tableFormRow(WebGUI::International::get(363),
-			WebGUI::Form::selectList("templatePosition",\%hash,\@array));
-                $output .= tableFormRow(WebGUI::International::get(85),
-			WebGUI::Form::textArea("description",$data{description},50,10,1));
-                $output .= tableFormRow(WebGUI::International::get(15,$namespace),
-                        WebGUI::Form::checkbox("preprocessMacros",1,$data{preprocessMacros}));
-                $output .= tableFormRow(WebGUI::International::get(16,$namespace),
-                        WebGUI::Form::checkbox("debugMode",1,$data{debugMode}));
-                $output .= tableFormRow(WebGUI::International::get(4,$namespace),
-                        WebGUI::Form::textArea("dbQuery",$data{dbQuery},50,10));
-                $output .= tableFormRow(WebGUI::International::get(3,$namespace),
-			WebGUI::Form::textArea("template",$data{template},50,10,1));
-                $output .= tableFormRow(WebGUI::International::get(5,$namespace),
-			WebGUI::Form::text("DSN",20,255,$data{DSN}));
-                $output .= tableFormRow(WebGUI::International::get(6,$namespace),
-			WebGUI::Form::text("username",20,255,$data{username}));
-                $output .= tableFormRow(WebGUI::International::get(7,$namespace),
-			WebGUI::Form::password("identifier",20,255,$data{identifier}));
-                $output .= tableFormRow(WebGUI::International::get(14,$namespace),
-                        WebGUI::Form::text("paginateAfter",20,30,$data{paginateAfter}));
-                $output .= tableFormRow(WebGUI::International::get(13,$namespace),
-			WebGUI::Form::checkbox("convertCarriageReturns",1,$data{convertCarriageReturns}));
-                $output .= formSave();
-                $output .= '</table></form>';
-                return $output;
-        } else {
-                return WebGUI::Privilege::insufficient();
-        }
-}
-
-#-------------------------------------------------------------------
-sub www_editSave {
-        my ($widgetId, $displayTitle, $image, $attachment);
-        if (WebGUI::Privilege::canEditPage()) {
-		update();
-                WebGUI::SQL->write("update SQLReport set template=".quote($session{form}{template}).
-			", dbQuery=".quote($session{form}{dbQuery}).
-			", convertCarriageReturns='$session{form}{convertCarriageReturns}'".
-			", DSN=".quote($session{form}{DSN}).
-			", username=".quote($session{form}{username}).
-			", identifier=".quote($session{form}{identifier}).
-			", paginateAfter='$session{form}{paginateAfter}'".
-			", preprocessMacros='$session{form}{preprocessMacros}'".
-			", debugMode='$session{form}{debugMode}'".
-			" where widgetId=$session{form}{wid}");
-                return "";
-        } else {
-                return WebGUI::Privilege::insufficient();
-        }
-}
-
-#-------------------------------------------------------------------
-sub www_view {
-	my (@row, $i, $rownum, $p, $ouch, %data, $output, $sth, $dbh, @result, 
-		@template, $temp, $col, $errorMessage, $url);
-	tie %data, 'Tie::CPHash';
-	%data = getProperties($namespace,$_[0]);
-	if (%data) {
-		if ($data{preprocessMacros}) {
-			$data{dbQuery} = WebGUI::Macro::process($data{dbQuery});
-		}
-		if ($data{displayTitle} == 1) {
-			$output = "<h1>".$data{title}."</h1>";
-		}
-		$output .= WebGUI::International::get(17,$namespace)." ".$data{dbQuery}."<p>" if ($data{debugMode});
-		if ($data{description} ne "") {
-			$output .= $data{description}.'<p>';
-                }
-	        if ($data{DSN} =~ /\DBI\:\w+\:\w+/) {
-        	        $dbh = DBI->connect($data{DSN},$data{username},$data{identifier});
-       	 	} else {
-                	$output .= WebGUI::International::get(9,$namespace).'<p>' if ($data{debugMode});
-			WebGUI::ErrorHandler::warn("SQLReport [$_[0]] The DSN specified is of an improper format.");
-        	}
-		if (defined $dbh) {
-			if ($data{dbQuery} =~ /select/i || $data{dbQuery} =~ /show/i || $data{dbQuery} =~ /describe/i) {
-				$sth = WebGUI::SQL->unconditionalRead($data{dbQuery},$dbh);
-				unless ($sth->errorCode < 1) {
-					$errorMessage = $sth->errorMessage;
-                                	$output .= WebGUI::International::get(11,$namespace).' : '.
-						$errorMessage.'<p>' if ($data{debugMode});
-                                	WebGUI::ErrorHandler::warn("There was a problem with the query: ".
-						$errorMessage);
-				} else {
-					if ($data{template} ne "") {
-						@template = split(/\^\-\;/,$data{template});
-					} else {
-						$i = 0;
-						$template[0] = '<table width="100%"><tr>';
-						$template[1] = '<tr>';
-						foreach $col ($sth->getColumnNames) {
-							$template[0] .= '<td class="tableHeader">'.$col.'</td>';
-							$template[1] .= '<td class="tableData">^'.$i.';</td>';
-							$i++;
-						}
-						$template[0] .= '</tr>';
-						$template[1] .= '</tr>';
-						$template[2] = '</table>';
-						$i = 0;
-					}
-					$output .= $template[0];
-					while (@result = $sth->array) {
-						$temp = $template[1];
-						$temp =~ s/\^(\d*)\;/$result[$1]/g;	# Shouldn't this be \d+ ?
-						$rownum = $i + 1 ;
-						$temp =~ s/\^rownum\;/$rownum/g;
-						if ($data{convertCarriageReturns}) {
-							$temp =~ s/\n/\<br\>/g;
-						}
-						$row[$i] = $temp;	
-						$i++;
-					}
-                        		if ($sth->rows < 1) {
-	                			$output .= $template[2];
-        	                       		$output .= WebGUI::International::get(18,$namespace).'<p>';
-                	        	} else {
-						$url = WebGUI::URL::page();
-						foreach (keys %{$session{form}}) {
-							unless ($_ eq "pn") {
-								$url = WebGUI::URL::append($url, WebGUI::URL::escape($_.'='.$session{form}{$_}));
-							}
-						}
-                				$p = WebGUI::Paginator->new($url,\@row,$data{paginateAfter});
-                				$output .= $p->getPage($session{form}{pn});
-    	        	    			$output .= $template[2];
-        	        			$output .= $p->getBar($session{form}{pn});
-					}
-					$sth->finish;
-				}
-                        } else {
-                                $output .= WebGUI::International::get(10,$namespace).'<p>' if ($data{debugMode});
-                                WebGUI::ErrorHandler::warn("SQLReport [$_[0]] The SQL query is improperly formatted.");
-                        }
-			$dbh->disconnect();
-		} else {
-			$output .= WebGUI::International::get(12,$namespace).'<p>' if ($data{debugMode});
-			WebGUI::ErrorHandler::warn("SQLReport [$_[0]] Could not connect to remote database.");
-		}	
-	}
-	if ($data{processMacros} == 1) {
-		$output = WebGUI::Macro::process($output);
-	}
-	return $output;
-}
-
-
-
-
-
-
-
-1;
diff --git a/lib/WebGUI/Wobject/SQLReport.pm b/lib/WebGUI/Wobject/SQLReport.pm
new file mode 100644
index 000000000..684b1ef06
--- /dev/null
+++ b/lib/WebGUI/Wobject/SQLReport.pm
@@ -0,0 +1,280 @@
+package WebGUI::Wobject::SQLReport;
+
+#-------------------------------------------------------------------
+# WebGUI is Copyright 2001-2002 Plain Black Software.
+#-------------------------------------------------------------------
+# Please read the legal notices (docs/legal.txt) and the license
+# (docs/license.txt) that came with this distribution before using
+# this software.
+#-------------------------------------------------------------------
+# http://www.plainblack.com                     info@plainblack.com
+#-------------------------------------------------------------------
+
+use strict;
+use WebGUI::ErrorHandler;
+use WebGUI::HTMLForm;
+use WebGUI::Icon;
+use WebGUI::International;
+use WebGUI::Macro;
+use WebGUI::Paginator;
+use WebGUI::Privilege;
+use WebGUI::Session;
+use WebGUI::SQL;
+use WebGUI::URL;
+use WebGUI::Utility;
+use WebGUI::Wobject;
+
+our @ISA = qw(WebGUI::Wobject);
+our $namespace = "SQLReport";
+our $name = WebGUI::International::get(1,$namespace);
+
+#-------------------------------------------------------------------
+sub duplicate {
+        my ($w);
+	$w = $_[0]->SUPER::duplicate($_[1]);
+        $w = WebGUI::Wobject::SQLReport->new({wobjectId=>$w,namespace=>$namespace});
+        $w->set({
+		template=>$_[0]->get("template"),
+		dbQuery=>$_[0]->get("dbQuery"),
+		DSN=>$_[0]->get("DSN"),
+		username=>$_[0]->get("username"),
+		identifier=>$_[0]->get("identifier"),
+		convertCarriageReturns=>$_[0]->get("convertCarriageReturns"),
+		paginateAfter=>$_[0]->get("paginateAfter"),
+		preprocessMacros=>$_[0]->get("preprocessMacros"),
+		debugMode=>$_[0]->get("debugMode")
+		});
+}
+
+#-------------------------------------------------------------------
+sub new {
+        my ($self, $class, $property);
+        $class = shift;
+        $property = shift;
+        $self = WebGUI::Wobject->new($property);
+        bless $self, $class;
+}
+
+#-------------------------------------------------------------------
+sub set {
+        $_[0]->SUPER::set($_[1],[qw(template dbQuery DSN username identifier convertCarriageReturns paginateAfter preprocessMacros debugMode)]);
+}
+
+#-------------------------------------------------------------------
+sub www_add {
+        my ($output, %hash);
+	tie %hash, 'Tie::IxHash';
+      	if (WebGUI::Privilege::canEditPage()) {
+                $output = helpLink(1,$namespace);
+		$output .= '<h1>'.WebGUI::International::get(2,$namespace).'</h1>';
+		$output .= formHeader();
+                $output .= WebGUI::Form::hidden("widget",$namespace);
+                $output .= WebGUI::Form::hidden("func","addSave");
+                $output .= '<table>';
+                $output .= tableFormRow(WebGUI::International::get(99),
+			WebGUI::Form::text("title",20,128,widgetName()));
+                $output .= tableFormRow(WebGUI::International::get(174),
+			WebGUI::Form::checkbox("displayTitle",1,1));
+                $output .= tableFormRow(WebGUI::International::get(175),
+			WebGUI::Form::checkbox("processMacros",1,1));
+		%hash = WebGUI::Widget::getPositions();
+                $output .= tableFormRow(WebGUI::International::get(363),
+			WebGUI::Form::selectList("templatePosition",\%hash));
+                $output .= tableFormRow(WebGUI::International::get(85),
+			WebGUI::Form::textArea("description",'','','',1));
+                $output .= tableFormRow(WebGUI::International::get(15,$namespace),
+                        WebGUI::Form::checkbox("preprocessMacros",1));
+                $output .= tableFormRow(WebGUI::International::get(16,$namespace),
+                        WebGUI::Form::checkbox("debugMode",1));
+                $output .= tableFormRow(WebGUI::International::get(4,$namespace),
+                        WebGUI::Form::textArea("dbQuery",''));
+                $output .= tableFormRow(WebGUI::International::get(3,$namespace),
+			WebGUI::Form::textArea("template",'','','',1));
+                $output .= tableFormRow(WebGUI::International::get(5,$namespace),
+			WebGUI::Form::text("DSN",20,255,$session{config}{dsn}));
+                $output .= tableFormRow(WebGUI::International::get(6,$namespace),
+			WebGUI::Form::text("username",20,255,$session{config}{dbuser}));
+                $output .= tableFormRow(WebGUI::International::get(7,$namespace),
+			WebGUI::Form::password("identifier",20,255));
+                $output .= tableFormRow(WebGUI::International::get(14,$namespace),
+                        WebGUI::Form::text("paginateAfter",20,30,50));
+                $output .= tableFormRow(WebGUI::International::get(13,$namespace),
+			WebGUI::Form::checkbox("convertCarriageReturns",1));
+                $output .= formSave();
+                $output .= '</table></form>';
+                return $output;
+        } else {
+                return WebGUI::Privilege::insufficient();
+        }
+	return $output;
+}
+
+#-------------------------------------------------------------------
+sub www_addSave {
+	my ($widgetId);
+	if (WebGUI::Privilege::canEditPage()) {
+		$widgetId = create($session{page}{pageId},$session{form}{widget},
+			$session{form}{title},$session{form}{displayTitle},
+			$session{form}{description},$session{form}{processMacros},
+			$session{form}{templatePosition});
+		WebGUI::SQL->write("insert into SQLReport values($widgetId, ".
+			quote($session{form}{template}).", ".
+			quote($session{form}{dbQuery}).", ".
+			quote($session{form}{DSN}).", ".
+			quote($session{form}{username}).", ".
+			quote($session{form}{identifier}).", ".
+			"'$session{form}{convertCarriageReturns}', ".
+			"'$session{form}{paginateAfter}', ".
+			"'$session{form}{preprocessMacros}', ".
+			"'$session{form}{debugMode}'".
+			")");
+		return "";
+	} else {
+		return WebGUI::Privilege::insufficient();
+	}
+}
+
+#-------------------------------------------------------------------
+sub www_copy {
+        if (WebGUI::Privilege::canEditPage()) {
+		$_[0]->duplicate;
+                return "";
+        } else {
+                return WebGUI::Privilege::insufficient();
+        }
+}
+
+#-------------------------------------------------------------------
+sub www_edit {
+        my ($output, $f, $dsn, $username, $paginateAfter);
+        if (WebGUI::Privilege::canEditPage()) {
+		$dsn = $_[0]->get("DSN") || $session{config}{dsn};
+		$username = $_[0]->get("username") || $session{config}{dbuser};
+		$paginateAfter = $_[0]->get("paginateAfter") || 50;
+		$f = WebGUI::HTMLForm->new;
+                $output = helpIcon(1,$namespace);
+                $output .= '<h1>'.WebGUI::International::get(8,$namespace).'</h1>';
+		$f->yesNo("preprocessMacros",WebGUI::International::get(15,$namespace),$_[0]->get("preprocessMacros"));
+                $f->yesNo("debugMode",WebGUI::International::get(16,$namespace),$_[0]->get("debugMode"));
+		$f->textarea("dbQuery",WebGUI::International::get(4,$namespace),$_[0]->get("dbQuery"));
+        	$f->HTMLArea("template",WebGUI::International::get(3,$namespace),$_[0]->get("template"));        
+                $f->text("DSN",WebGUI::International::get(5,$namespace),$dsn);
+		$f->text("username",WebGUI::International::get(6,$namespace),$username);
+		$f->password("identifier",WebGUI::International::get(7,$namespace),$_[0]->get("identifier"));
+		$f->integer("paginateAfter",WebGUI::International::get(14,$namespace),$paginateAfter);
+		$f->yesNo("convertCarriageReturns",WebGUI::International::get(13,$namespace),$_[0]->get("convertCarriageReturns"));
+		$output .= $_[0]->SUPER::www_edit($f->printRowsOnly);
+                return $output;
+        } else {
+                return WebGUI::Privilege::insufficient();
+        }
+}
+
+#-------------------------------------------------------------------
+sub www_editSave {
+        my ($widgetId, $displayTitle, $image, $attachment);
+        if (WebGUI::Privilege::canEditPage()) {
+		$_[0]->SUPER::www_editSave();
+                $_[0]->set({
+			template=>$session{form}{template},
+			dbQuery=>$session{form}{dbQuery},
+			convertCarriageReturns=>$session{form}{convertCarriageReturns},
+			DSN=>$session{form}{DSN},
+			username=>$session{form}{username},
+			identifier=>$session{form}{identifier},
+			paginateAfter=>$session{form}{paginateAfter},
+			preprocessMacros=>$session{form}{preprocessMacros},
+			debugMode=>$session{form}{debugMode}
+			});
+                return "";
+        } else {
+                return WebGUI::Privilege::insufficient();
+        }
+}
+
+#-------------------------------------------------------------------
+sub www_view {
+	my ($dsn, $query, @row, $i, $rownum, $p, $ouch, $output, $sth, $dbh, @result, @template, $temp, $col, $errorMessage, $url);
+	$query = WebGUI::Macro::process($_[0]->get("dbQuery")) if ($_[0]->get("preprocessMacros"));
+	$dsn = $_[0]->get("DSN");
+	$output = $_[0]->displayTitle;
+        $output .= $_[0]->description;
+	$output .= WebGUI::International::get(17,$namespace)." ".$query."<p>" if ($_[0]->get("debugMode"));
+	if ($dsn =~ /\DBI\:\w+\:\w+/) {
+                $dbh = DBI->connect($dsn,$_[0]->get("username"),$_[0]->get("identifier"));
+       	} else {
+               	$output .= WebGUI::International::get(9,$namespace).'<p>' if ($_[0]->get("debugMode"));
+		WebGUI::ErrorHandler::warn("SQLReport [".$_[0]->get("wobjectId")."] The DSN specified is of an improper format.");
+        }
+	if (defined $dbh) {
+		if ($query =~ /select/i || $query =~ /show/i || $query =~ /describe/i) {
+			$sth = WebGUI::SQL->unconditionalRead($query,$dbh);
+			unless ($sth->errorCode < 1) {
+				$errorMessage = $sth->errorMessage;
+                               	$output .= WebGUI::International::get(11,$namespace).' : '.$errorMessage.'<p>' if ($_[0]->get("debugMode"));
+                               	WebGUI::ErrorHandler::warn("There was a problem with the query: ".$errorMessage);
+			} else {
+				if ($_[0]->get("template") ne "") {
+					@template = split(/\^\-\;/,$_[0]->get("template"));
+				} else {
+					$i = 0;
+					$template[0] = '<table width="100%"><tr>';
+					$template[1] = '<tr>';
+					foreach $col ($sth->getColumnNames) {
+						$template[0] .= '<td class="tableHeader">'.$col.'</td>';
+						$template[1] .= '<td class="tableData">^'.$i.';</td>';
+						$i++;
+					}
+					$template[0] .= '</tr>';
+					$template[1] .= '</tr>';
+					$template[2] = '</table>';
+					$i = 0;
+				}
+				$output .= $template[0];
+				while (@result = $sth->array) {
+					$temp = $template[1];
+					$temp =~ s/\^(\d*)\;/$result[$1]/g;	# Shouldn't this be \d+ ?
+					$rownum = $i + 1;
+					$temp =~ s/\^rownum\;/$rownum/g;
+					if ($_[0]->get("convertCarriageReturns")) {
+						$temp =~ s/\n/\<br\>/g;
+					}
+					$row[$i] = $temp;	
+					$i++;
+				}
+                       		if ($sth->rows < 1) {
+	               			$output .= $template[2];
+                               		$output .= WebGUI::International::get(18,$namespace).'<p>';
+               	        	} else {
+					$url = WebGUI::URL::page();
+					foreach (keys %{$session{form}}) {
+						unless ($_ eq "pn") {
+							$url = WebGUI::URL::append($url, WebGUI::URL::escape($_.'='.$session{form}{$_}));
+						}
+					}
+               				$p = WebGUI::Paginator->new($url,\@row,$_[0]->get("paginateAfter"));
+               				$output .= $p->getPage($session{form}{pn});
+    	       	    			$output .= $template[2];
+                			$output .= $p->getBar($session{form}{pn});
+				}
+				$sth->finish;
+			}
+               	} else {
+               		$output .= WebGUI::International::get(10,$namespace).'<p>' if ($_[0]->get("debugMode"));
+                        WebGUI::ErrorHandler::warn("SQLReport [".$_[0]->get("wobjectId")."] The SQL query is improperly formatted.");
+                }
+		$dbh->disconnect();
+	} else {
+		$output .= WebGUI::International::get(12,$namespace).'<p>' if ($_[0]->get("debugMode"));
+		WebGUI::ErrorHandler::warn("SQLReport [".$_[0]->get("wobjectId")."] Could not connect to remote database.");
+	}	
+	return $_[0]->processMacros($output);
+}
+
+
+
+
+
+
+
+1;