--- trunk/lib/Strix/Schema.pm	2008/07/10 15:22:39	80
+++ trunk/lib/Strix/Schema.pm	2008/08/12 22:28:26	169
@@ -1,38 +1,19 @@
 package Strix::Schema;
 
-use Fey::DBIManager;
-use Fey::DBIManager::Source;
-use Fey::Loader;
 use Fey::ORM::Schema;
-
-use Storable;
-use Data::Dump qw/dump/;
-use URI::Escape;
+use Frey::Schema;
 
 my $dsn = 'dbi:Pg:dbname=new';
-$dsn = 'dbi:SQLite:dbname=./var/strix.sqlite';
-
-my $schema_file = 'var/schema.' . uri_escape( $dsn );
-
-warn "Database $dsn schema cache $schema_file\n";
-
-my $source = Fey::DBIManager::Source->new( dsn => $dsn );
+#$dsn = 'dbi:SQLite:dbname=./var/strix.sqlite';
 
-my $schema;
-#if ( 0 ) { # FIXME
-if ( -e $schema_file ) {
-	$schema = retrieve $schema_file or die "can't read schema from $schema_file: $!";
-} else {
-	$schema = Fey::Loader->new( dbh => $source->dbh() )->make_schema();
-	store $schema, $schema_file or warn "can't store schema into $schema_file: $!";
-}
+my ( $schema, $source ) = Frey::Schema->schema_source( $dsn );
 
 has_schema $schema;
 
-warn Strix::Schema->SQLFactoryClass();
+#warn Strix::Schema->SQLFactoryClass();
 
 __PACKAGE__->DBIManager()->add_source($source);
 
-warn "loaded.";
+$source->dbh->do( qq{ set client_encoding = 'utf-8' } ) if $dsn =~ /Pg/;
 
 1;