--- trunk/lib/Frey/SQL.pm	2008/11/17 15:14:07	370
+++ trunk/lib/Frey/SQL.pm	2008/11/19 15:28:23	455
@@ -1,5 +1,8 @@
 package Frey::SQL;
 use Moose;
+extends 'Frey';
+
+with 'Frey::Web';
 
 use MooseX::Types::Moose qw(Str Int ArrayRef);
 use MooseX::Types::Structured qw/Dict/;
@@ -11,10 +14,8 @@
 	is => 'rw',
 	isa => 'Str',
 	required => 1,
-	default => sub {
-		my ($self) = @_;
-		'select * from ' . $self->table;
-	},
+	default => 'select * from sponge',
+	documentation => 'SQL query to filter data',
 );
 
 has table => (
@@ -22,6 +23,7 @@
 	isa => 'Str',
 	required => 1,
 	default => 'sponge',
+	documentation => 'Name of table to create from sponge data',
 );
 
 has 'sponge' => (
@@ -33,17 +35,15 @@
 	required => 1,
 );
 
-sub data {
+sub as_data {
 	my ($self) = @_;
 
 	my $dbh=DBI->connect('dbi:AnyData(RaiseError=>1):');
 
+	my $data = $self->as_sponge->{rows};
+	unshift @$data, $self->as_sponge->{NAME};
 
-
-	my $data = $self->sponge->{rows};
-	unshift @$data, $self->sponge->{NAME};
-
-	warn "# data = ",dump( $data );
+	warn "# data = ",dump( $data ) if $self->debug;
 
 	$dbh->func( $self->table, 'ARRAY', $data, 'ad_import' );