From: Justin Hunter <justin.d.hunter@gmail.com>
Date: Thu, 3 Dec 2009 15:39:11 +0000 (-0800)
Subject: while admittedly still broken, much progress has been made
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=a36eae8bdf8632421cff13ac48fd7f1517e19f89;p=dbsrgits%2FSQL-Translator-2.0-ish.git

while admittedly still broken, much progress has been made
---

diff --git a/t/13schema.t b/t/13schema.t
index fbbf7a2..ec9c038 100644
--- a/t/13schema.t
+++ b/t/13schema.t
@@ -6,9 +6,13 @@ use Test::Exception;
 use SQL::Translator::Constants qw(:sqlt_types :sqlt_constants);
 
 require_ok( 'SQL::Translator' );
+require_ok( 'SQL::Translator::Object::Column' );
+require_ok( 'SQL::Translator::Object::Constraint' );
+require_ok( 'SQL::Translator::Object::Index' );
 require_ok( 'SQL::Translator::Object::Schema' );
 require_ok( 'SQL::Translator::Object::Table' );
-require_ok( 'SQL::Translator::Object::Column' );
+require_ok( 'SQL::Translator::Object::Trigger' );
+require_ok( 'SQL::Translator::Object::View' );
 
 {
     #
@@ -33,11 +37,11 @@ require_ok( 'SQL::Translator::Object::Column' );
     #
     # $schema->add_*
     #
-    my $foo_table = SQL::Translator::Object::Table->new({ name => 'foo', schema => $schema });
+    my $foo_table = SQL::Translator::Object::Table->new({ name => 'foo' });
     $schema->add_table($foo_table) or warn $schema->error;
     isa_ok( $foo_table, 'SQL::Translator::Object::Table', 'Table "foo"' );
 
-    my $bar_table = SQL::Translator::Object::Table->new({ name => 'bar', schema => $schema }) or 
+    my $bar_table = SQL::Translator::Object::Table->new({ name => 'bar' }) or 
         warn SQL::Translator::Object::Table->error;
     $schema->add_table( $bar_table );
     isa_ok( $bar_table, 'SQL::Translator::Object::Table', 'Table "bar"' );
@@ -53,19 +57,19 @@ require_ok( 'SQL::Translator::Object::Column' );
 #    like( $bar_table->error, qr/can't use table name/i, 
 #        q[...because "foo" exists] );
 
-    my $redundant_table = new SQL::Translator::Object::Table({ name => 'foo', schema => $schema });
+    my $redundant_table = new SQL::Translator::Object::Table({ name => 'foo' });
     dies_ok(sub { $schema->add_table($redundant_table) }, '...because "foo" exists"');
     #is( $redundant_table, undef, qq[Can't create another "foo" table...] );
     #like( $schema->error, qr/can't use table name/i, 
     #    '... because "foo" exists' );
 
-    $redundant_table = new SQL::Translator::Object::Table({ name => '', schema => $schema });
+    $redundant_table = new SQL::Translator::Object::Table({ name => '' });
 #    is( $redundant_table, undef, qq[Can't add an anonymous table...] );
 #    like( $schema->error, qr/No table name/i,
 #        '... because it has no name ' );
     dies_ok(sub { $schema->add_table($redundant_table) }, '...because it has no name'); 
 
-    $redundant_table = SQL::Translator::Object::Table->new({ name => '', schema => $schema });
+    $redundant_table = SQL::Translator::Object::Table->new({ name => '' });
     #is( $redundant_table, undef, qq[Can't create an anonymous table] );
     #like( SQL::Translator::Object::Table->error, qr/No table name/i,
     #    '... because it has no name ' );
@@ -115,7 +119,7 @@ require_ok( 'SQL::Translator::Object::Column' );
     #
     # Field default new
     #
-    my $person_table_column = SQL::Translator::Object::Column->new({ name => 'foo', table => $person_table });
+    my $person_table_column = SQL::Translator::Object::Column->new( name => 'foo' );
     my $f1 = $person_table->add_column($person_table_column);
     isa_ok( $f1, 'SQL::Translator::Object::Column', 'Column' );
     is( $f1->name, 'foo', 'Field name is "foo"' );
@@ -192,14 +196,13 @@ require_ok( 'SQL::Translator::Object::Column' );
     #
     # Field methods
     #
-    is( $f1->name('person_name'), 'person_name',
-        'Field name is "person_name"' );
+    is( $f1->name('person_name'), 'person_name', 'Field name is "person_name"' );
     is( $f1->data_type('varchar'), 'varchar', 'Field data type is "varchar"' );
     is( $f1->size('30'), '30', 'Field size is "30"' );
     is( $f1->is_primary_key(0), '0', 'Field is_primary_key is negative' );
 
     $f1->extra({ foo => 'bar' });
-    $f1->extra( { baz => 'quux' } );
+    $f1->extra({ baz => 'quux' });
     my %extra = $f1->extra;
     is( $extra{'foo'}, 'bar', 'Field extra "foo" is "bar"' );
     is( $extra{'baz'}, 'quux', 'Field extra "baz" is "quux"' );
@@ -212,6 +215,7 @@ require_ok( 'SQL::Translator::Object::Column' );
         data_type => 'float',
         size      => '10,2',
     });
+
     is( $age->name, 'age', 'Field name is "age"' );
     is( $age->data_type, 'float', 'Field data type is "float"' );
     is( $age->size, '10,2', 'Field size is "10,2"' );
@@ -225,50 +229,50 @@ require_ok( 'SQL::Translator::Object::Column' );
     #
     my @indices = $person_table->get_indices;
     is( scalar @indices, 0, 'No indices' );
-    like( $person_table->error, qr/no indices/i, 'Error for no indices' );
-    my $index1 = $person_table->add_index( name => "foo" ) 
-        or warn $person_table->error;
-    isa_ok( $index1, 'SQL::Translator::Object::Schema::Index', 'Index' );
+    #like( $person_table->error, qr/no indices/i, 'Error for no indices' );
+#    my $index1 = $person_table->add_index(SQL::Translator::Object::Index->new( name => "foo" )) ;
+    my $index1 = $person_table->add_index({ name => "foo" });
+    isa_ok( $index1, 'SQL::Translator::Object::Index', 'Index' );
     is( $index1->name, 'foo', 'Index name is "foo"' );
 
     is( $index1->is_valid, undef, 'Index name is not valid...' );
-    like( $index1->error, qr/no fields/i, '...because it has no fields' );
+#    like( $index1->error, qr/no fields/i, '...because it has no fields' );
 
-    is( join(':', $index1->fields('foo,bar')), 'foo:bar', 
-        'Index accepts fields');
+#    is( join(':', $index1->fields('foo,bar')), 'foo:bar', 'Index accepts fields');
 
-    is( $index1->is_valid, undef, 'Index name is not valid...' );
-    like( $index1->error, qr/does not exist in table/i, 
-        '...because it used fields not in the table' );
+#    is( $index1->is_valid, undef, 'Index name is not valid...' );
+#    like( $index1->error, qr/does not exist in table/i, '...because it used fields not in the table' );
+    dies_ok(sub { $index1->fields('foo,bar') }, 'because it used fields not in the table');
 
-    is( join(':', $index1->fields(qw[foo age])), 'foo:age', 
-        'Index accepts fields');
+    is( join(':', $index1->fields('person_name,age')), 'person_name:age', 'Index accepts fields');
+    #is( join(':', $index1->fields(qw/foo age/)), 'foo:age', 'Index accepts fields');
     is( $index1->is_valid, 1, 'Index name is now valid' );
 
     is( $index1->type, NORMAL, 'Index type is "normal"' );
 
-    my $index2 = SQL::Translator::Object::Schema::Index->new( name => "bar" ) 
-        or warn SQL::Translator::Object::Schema::Index->error;
-    $index2    = $person_table->add_index( $index2 );
-    isa_ok( $index2, 'SQL::Translator::Object::Schema::Index', 'Index' );
+    my $index2 = SQL::Translator::Object::Index->new( name => "bar" );
+
+    $index2 = $person_table->add_index( $index2 );
+    isa_ok( $index2, 'SQL::Translator::Object::Index', 'Index' );
     is( $index2->name, 'bar', 'Index name is "bar"' );
 
-    my $indices = $person_table->get_indices;
-    is( scalar @$indices, 2, 'Two indices' );
-    is( $indices->[0]->name, 'foo', '"foo" index' );
-    is( $indices->[1]->name, 'bar', '"bar" index' );
+    @indices = $person_table->get_indices;
+    is( scalar @indices, 2, 'Two indices' );
+    is( $indices[0]->name, 'foo', '"foo" index' );
+    is( $indices[1]->name, 'bar', '"bar" index' );
 
     #
     # $table-> drop_index
     #
     my $dropped_index = $person_table->drop_index($index1->name);
-    isa_ok($dropped_index, 'SQL::Translator::Object::Schema::Index', 'Dropped index "foo"' );
+    isa_ok($dropped_index, 'SQL::Translator::Object::Index', 'Dropped index "foo"' );
     $person_table->add_index($index1);
     my $dropped_index2 = $person_table->drop_index($index1);
-    isa_ok($dropped_index2, 'SQL::Translator::Object::Schema::Index', 'Dropped index "foo" by object' );
+    isa_ok($dropped_index2, 'SQL::Translator::Object::Index', 'Dropped index "foo" by object' );
     is($dropped_index2->name, $index1->name, 'Dropped correct index "foo"');
-    my $dropped_index3 = $person_table->drop_index($index1->name);
-    like( $person_table->error, qr/doesn't exist/, qq[Can't drop non-existant index "foo"] );
+#    my $dropped_index3 = $person_table->drop_index($index1->name);
+#    like( $person_table->error, qr/doesn't exist/, qq[Can't drop non-existant index "foo"] );
+    dies_ok(sub { $person_table->drop_index($index1->name) }, qq[Can't drop non-existant index "foo"] );
 
     $person_table->add_index($index1);
 
@@ -277,11 +281,10 @@ require_ok( 'SQL::Translator::Object::Column' );
     #
     my @constraints = $person_table->get_constraints;
     is( scalar @constraints, 0, 'No constraints' );
-    like( $person_table->error, qr/no constraints/i, 
-        'Error for no constraints' );
-    my $constraint1 = $person_table->add_constraint( name => 'foo' ) 
-        or warn $person_table->error;
-    isa_ok( $constraint1, 'SQL::Translator::Object::Schema::Constraint', 'Constraint' );
+    #like( $person_table->error, qr/no constraints/i, 'Error for no constraints' );
+    my $constraint1 = $person_table->add_constraint({ name => 'foo', type => 'bar' });
+
+    isa_ok( $constraint1, 'SQL::Translator::Object::Constraint', 'Constraint' );
     is( $constraint1->name, 'foo', 'Constraint name is "foo"' );
 
     $fields = join(',', $constraint1->fields('age') );
@@ -294,118 +297,114 @@ require_ok( 'SQL::Translator::Object::Column' );
     $fields = join(',', $constraint1->fields('age,age') );
     is( $fields, 'age', 'Constraint field = "age"' );
 
-    $fields = join(',', $constraint1->fields('age', 'name') );
-    is( $fields, 'age,name', 'Constraint field = "age,name"' );
+#    $fields = join(',', $constraint1->fields('age', 'name') );
+#    is( $fields, 'age,person_name', 'Constraint field = "age,name"' );
 
-    $fields = join(',', $constraint1->fields( 'age,name,age' ) );
-    is( $fields, 'age,name', 'Constraint field = "age,name"' );
+    $fields = join(',', $constraint1->fields( 'age,person_name,age' ) );
+    is( $fields, 'age,person_name', 'Constraint field = "age,name"' );
 
-    $fields = join(',', $constraint1->fields( 'age, name' ) );
-    is( $fields, 'age,name', 'Constraint field = "age,name"' );
+    $fields = join(',', $constraint1->fields( 'age, person_name' ) );
+    is( $fields, 'age,person_name', 'Constraint field = "age,name"' );
 
-    $fields = join(',', $constraint1->fields( [ 'age', 'name' ] ) );
-    is( $fields, 'age,name', 'Constraint field = "age,name"' );
+    $fields = join(',', $constraint1->fields( [ 'age', 'person_name' ] ) );
+    is( $fields, 'age,person_name', 'Constraint field = "age,name"' );
 
-    $fields = join(',', $constraint1->fields( qw[ age name ] ) );
-    is( $fields, 'age,name', 'Constraint field = "age,name"' );
+#    $fields = join(',', $constraint1->fields( qw[ age person_name ] ) );
+#    is( $fields, 'age,person_name', 'Constraint field = "age,name"' );
 
     $fields = join(',', $constraint1->field_names );
-    is( $fields, 'age,name', 'Constraint field_names = "age,name"' );
+    is( $fields, 'age,person_name', 'Constraint field_names = "age,name"' );
 
     is( $constraint1->match_type, '', 'Constraint match type is empty' );
-    is( $constraint1->match_type('foo'), undef, 
-        'Constraint match type rejects bad arg...' );
-    like( $constraint1->error, qr/invalid match type/i,
-        '...because it is invalid');
+#    is( $constraint1->match_type('foo'), undef, 
+#        'Constraint match type rejects bad arg...' );
+#    like( $constraint1->error, qr/invalid match type/i,
+#        '...because it is invalid');
+    dies_ok(sub { $constraint1->match_type('foo') }, '...because it is invalid');
     is( $constraint1->match_type('FULL'), 'full', 
         'Constraint match type = "full"' );
 
-    my $constraint2 = SQL::Translator::Object::Schema::Constraint->new( name => 'bar' );
+    my $constraint2 = SQL::Translator::Object::Constraint->new( name => 'bar', type => 'baz' );
     $constraint2    = $person_table->add_constraint( $constraint2 );
-    isa_ok( $constraint2, 'SQL::Translator::Object::Schema::Constraint', 'Constraint' );
+    isa_ok( $constraint2, 'SQL::Translator::Object::Constraint', 'Constraint' );
     is( $constraint2->name, 'bar', 'Constraint name is "bar"' );
 
-    my $constraint3 = $person_table->add_constraint(
+    my $constraint3 = $person_table->add_constraint({
         type       => 'check',
         expression => 'foo bar',
-    ) or die $person_table->error;
-    isa_ok( $constraint3, 'SQL::Translator::Object::Schema::Constraint', 'Constraint' );
-    is( $constraint3->type, CHECK_C, 'Constraint type is "CHECK"' );
-    is( $constraint3->expression, 'foo bar', 
-        'Constraint expression is "foo bar"' );
+    }); # or die $person_table->error;
+    isa_ok( $constraint3, 'SQL::Translator::Object::Constraint', 'Constraint' );
+    is( $constraint3->type, 'check', 'Constraint type is "CHECK"' ); ## CHECK_C
+    is( $constraint3->expression, 'foo bar', 'Constraint expression is "foo bar"' );
 
-    my $constraints = $person_table->get_constraints;
-    is( scalar @$constraints, 3, 'Three constraints' );
-    is( $constraints->[0]->name, 'foo', '"foo" constraint' );
-    is( $constraints->[1]->name, 'bar', '"bar" constraint' );
+    @constraints = $person_table->get_constraints;
+    is( scalar @constraints, 3, 'Three constraints' );
+    is( $constraints[0]->name, 'foo', '"foo" constraint' );
+    is( $constraints[1]->name, 'bar', '"bar" constraint' );
 
     #
     # $table-> drop_constraint
     #
     my $dropped_con = $person_table->drop_constraint($constraint1->name);
-    isa_ok($dropped_con, 'SQL::Translator::Object::Schema::Constraint', 'Dropped constraint "foo"' );
+    isa_ok($dropped_con, 'SQL::Translator::Object::Constraint', 'Dropped constraint "foo"' );
     $person_table->add_constraint($constraint1);
     my $dropped_con2 = $person_table->drop_constraint($constraint1);
-    isa_ok($dropped_con2, 'SQL::Translator::Object::Schema::Constraint', 'Dropped constraint "foo" by object' );
+    isa_ok($dropped_con2, 'SQL::Translator::Object::Constraint', 'Dropped constraint "foo" by object' );
     is($dropped_con2->name, $constraint1->name, 'Dropped correct constraint "foo"');
-    my $dropped_con3 = $person_table->drop_constraint($constraint1->name);
-    like( $person_table->error, qr/doesn't exist/, qq[Can't drop non-existant constraint "foo"] );
+#    my $dropped_con3 = $person_table->drop_constraint($constraint1->name);
+#    like( $person_table->error, qr/doesn't exist/, qq[Can't drop non-existant constraint "foo"] );
+    dies_ok(sub { $person_table->drop_constraint($constraint1->name) }, qq[Can't drop non-existant constraint "foo"] );
 
     $person_table->add_constraint($constraint1);
 
     #
     # View
     #
-    my $view = $schema->add_view( name => 'view1' ) or warn $schema->error;
-    isa_ok( $view, 'SQL::Translator::Object::Schema::View', 'View' );
+    my $view = $schema->add_view({ name => 'view1' }) or warn $schema->error;
+    isa_ok( $view, 'SQL::Translator::Object::View', 'View' );
     my $view_sql = 'select * from table';
     is( $view->sql( $view_sql ), $view_sql, 'View SQL is good' );
 
-    my $view2 = SQL::Translator::Object::Schema::View->new(name => 'view2') or
-        warn SQL::Translator::Object::Schema::View->error;
+    my $view2 = SQL::Translator::Object::View->new(name => 'view2') or
+        warn SQL::Translator::Object::View->error;
     my $check_view = $schema->add_view( $view2 );
     is( $check_view->name, 'view2', 'Add view "view2"' );
 
-    my $redundant_view = $schema->add_view(name => 'view2');
-    is( $redundant_view, undef, qq[Didn't create another "view2" view...] );
-    like( $schema->error, qr/can't create view/i, '... because it exists' );
+    dies_ok(sub { my $redundant_view = $schema->add_view({ name => 'view2' }) }, '... because it exists');
+#    my $redundant_view = $schema->add_view({ name => 'view2' });
+#    is( $redundant_view, undef, qq[Didn't create another "view2" view...] );
+#    like( $schema->error, qr/can't create view/i, '... because it exists' );
 
     #
     # $schema-> drop_view
     #
     my $dropped_view = $schema->drop_view($view->name);
-    isa_ok($dropped_view, 'SQL::Translator::Object::Schema::View', 'Dropped view "view1"' );
+    isa_ok($dropped_view, 'SQL::Translator::Object::View', 'Dropped view "view1"' );
     $schema->add_view($view);
     my $dropped_view2 = $schema->drop_view($view);
-    isa_ok($dropped_view2, 'SQL::Translator::Object::Schema::View', 'Dropped view "view1" by object' );
+    isa_ok($dropped_view2, 'SQL::Translator::Object::View', 'Dropped view "view1" by object' );
     is($dropped_view2->name, $view->name, 'Dropped correct view "view1"');
-    my $dropped_view3 = $schema->drop_view($view->name);
-    like( $schema->error, qr/doesn't exist/, qq[Can't drop non-existant view "view1"] );
+#    my $dropped_view3 = $schema->drop_view($view->name);
+#    like( $schema->error, qr/doesn't exist/, qq[Can't drop non-existant view "view1"] );
+    dies_ok(sub { my $dropped_view3 = $schema->drop_view($view->name) }, qq[Can't drop non-existant view "view1"] );
 
     $schema->add_view($view);
 
     #
     # $schema->get_*
     #
-    my $bad_table = $schema->get_table;
-    like( $schema->error, qr/no table/i, 'Error on no arg to get_table' );
-
-    $bad_table = $schema->get_table('baz');
-    like( $schema->error, qr/does not exist/i, 
-        'Error on bad arg to get_table' );
-
-    my $bad_view = $schema->get_view;
-    like( $schema->error, qr/no view/i, 'Error on no arg to get_view' );
+    
+    dies_ok( sub { my $bad_table = $schema->get_table }, 'Error on no arg to get_table' );
+    is($schema->get_table('baz'), undef, 'Nonexistant table returns undef');
 
-    $bad_view = $schema->get_view('bar');
-    like( $schema->error, qr/does not exist/i, 
-        'Error on bad arg to get_view' );
+    dies_ok( sub { my $bad_view = $schema->get_view }, 'Error on no arg to get_view' );
+    is($schema->get_view('baz'), undef, 'Nonexistant view returns undef');
 
     my $good_table = $schema->get_table('foo');
     isa_ok( $good_table, 'SQL::Translator::Object::Table', 'Table "foo"' );
 
     my $good_view = $schema->get_view('view1');
-    isa_ok( $good_view, 'SQL::Translator::Object::Schema::View', 'View "view1"' );
+    isa_ok( $good_view, 'SQL::Translator::Object::View', 'View "view1"' );
     is( $view->sql( $view_sql ), $view_sql, 'View SQL is good' );
 
     #
@@ -427,14 +426,15 @@ require_ok( 'SQL::Translator::Object::Column' );
         name     => 'foo',
         database => 'PostgreSQL',
     );
-    my $t = $s->add_table( name => 'person' ) or warn $s->error;
-    my $f = $t->add_field( name => 'person_id' ) or warn $t->error;
+    my $t = $s->add_table({ name => 'person' }) or warn $s->error;
+    my $f = $t->add_field({ name => 'person_id' }) or warn $t->error;
     $f->data_type('serial');
 
-    my $c          = $t->add_constraint(
+    my $c          = $t->add_constraint({
         type       => PRIMARY_KEY,
-        fields     => 'person_id',
-    ) or warn $t->error;
+#        fields     => 'person_id',
+    }) or warn $t->error;
+    $c->add_column($f);
 
     is( $f->is_primary_key, 1, 'Field is PK' );
     is( $f->is_auto_increment, 1, 'Field is auto inc' );
@@ -445,65 +445,72 @@ require_ok( 'SQL::Translator::Object::Column' );
 #
 {
     my $s = SQL::Translator::Object::Schema->new;
-    my $t = $s->add_table( name => 'person' ) or warn $s->error;
-    my $c = $t->add_constraint or warn $t->error;
+    my $t = $s->add_table({ name => 'person' });
+#    my $c = $t->add_constraint({ });
 
-    is( $c->is_valid, undef, 'Constraint on "person" not valid...');
-    like( $c->error, qr/no type/i, '...because it has no type' );
+    dies_ok( sub { my $c = $t->add_constraint({ }) }, '...because it has no type' );
 
-    is( $c->type( FOREIGN_KEY ), FOREIGN_KEY, 'Constraint type now a FK' );
+#    is( $c->is_valid, undef, 'Constraint on "person" not valid...');
+#    like( $c->error, qr/no type/i, '...because it has no type' );
 
-    is( $c->is_valid, undef, 'Constraint on "person" not valid...');
-    like( $c->error, qr/no fields/i, '...because it has no fields' );
+#    is( $c->type( FOREIGN_KEY ), FOREIGN_KEY, 'Constraint type now a FK' );
 
-    is( join('', $c->fields('foo')), 'foo', 'Fields now = "foo"' );
+#    is( $c->is_valid, undef, 'Constraint on "person" not valid...');
+#    like( $c->error, qr/no fields/i, '...because it has no fields' );
+    dies_ok( sub { my $c = $t->add_constraint({ type => FOREIGN_KEY }) }, '...because it has no fields' );
 
-    is( $c->is_valid, undef, 'Constraint on "person" not valid...');
-    like( $c->error, qr/non-existent field/i, 
-        q[...because field "foo" doesn't exist] );
+#    is( join('', $c->fields('foo')), 'foo', 'Fields now = "foo"' );
+    dies_ok( sub { my $c = $t->add_constraint({ type => FOREIGN_KEY, fields => 'foo' }) }, q[...because field "foo" doesn't exist] );
 
-    my $fk = $t->add_field( name => 'pet_id' );
+#    is( $c->is_valid, undef, 'Constraint on "person" not valid...');
+#    like( $c->error, qr/non-existent field/i, q[...because field "foo" doesn't exist] );
+
+    my $fk = $t->add_field({ name => 'pet_id' });
     is( $fk->name, 'pet_id', 'Added field "pet_id"' );
-    is( join('', $c->fields('pet_id')), 'pet_id', 'Fields now = "pet_id"' );
+#    is( join('', $c->fields('pet_id')), 'pet_id', 'Fields now = "pet_id"' );
+
+    $t->add_field({ name => 'f1' });
+    $t->add_field({ name => 'f2' });
+#    is( join(',', $c->fields('f1,f2')), 'f1,f2', 'Fields now = "f1,f2"' );
+#    is( $c->is_valid, undef, 'Constraint on "person" not valid...');
+#    like( $c->error, qr/only one field/i, 
+#        q[...because too many fields for FK] );
 
-    $t->add_field( name => 'f1' );
-    $t->add_field( name => 'f2' );
-    is( join(',', $c->fields('f1,f2')), 'f1,f2', 'Fields now = "f1,f2"' );
-    is( $c->is_valid, undef, 'Constraint on "person" not valid...');
-    like( $c->error, qr/only one field/i, 
-        q[...because too many fields for FK] );
+#    $c->fields('f1');
 
-    $c->fields('f1');
+#    is( $c->is_valid, undef, 'Constraint on "person" not valid...');
+#    like( $c->error, qr/no reference table/i, 
+#        q[...because there's no reference table] );
 
-    is( $c->is_valid, undef, 'Constraint on "person" not valid...');
-    like( $c->error, qr/no reference table/i, 
-        q[...because there's no reference table] );
+#    is( $c->reference_table('foo'), 'foo', 'Reference table now = "foo"' );
+#    is( $c->is_valid, undef, 'Constraint on "person" not valid...');
+#    like( $c->error, qr/no table named/i, 
+#        q[...because reference table "foo" doesn't exist] );
 
-    is( $c->reference_table('foo'), 'foo', 'Reference table now = "foo"' );
-    is( $c->is_valid, undef, 'Constraint on "person" not valid...');
-    like( $c->error, qr/no table named/i, 
-        q[...because reference table "foo" doesn't exist] );
+    dies_ok( sub { my $c = $t->add_constraint({ type => FOREIGN_KEY, fields => [ 'f1', 'f2' ], reference_table => 'foo'}) }, "...because reference table foo doesn't exist" );
 
-    my $t2 = $s->add_table( name => 'pet' );
+    my $t2 = $s->add_table({ name => 'pet' });
     is( $t2->name, 'pet', 'Added "pet" table' );
 
-    is( $c->reference_table('pet'), 'pet', 'Reference table now = "pet"' );
+    dies_ok( sub { my $c = $t->add_constraint({ type => FOREIGN_KEY, reference_table => 'pet' }) }, '...because there are no reference fields' );
 
-    is( $c->is_valid, undef, 'Constraint on "person" not valid...');
-    like( $c->error, qr/no reference fields/i,
-        q[...because there're no reference fields]);
+#    is( $c->reference_table('pet'), 'pet', 'Reference table now = "pet"' );
 
-    is( join('', $c->reference_fields('pet_id')), 'pet_id', 
-        'Reference fields = "pet_id"' );
+#    is( $c->is_valid, undef, 'Constraint on "person" not valid...');
+    #like( $c->error, qr/no reference fields/i,
+    #    q[...because there're no reference fields]);
 
-    is( $c->is_valid, undef, 'Constraint on "person" not valid...');
-    like( $c->error, qr/non-existent field/i,
-        q[...because there's no "pet_id" field in "pet"]);
+##    is( join('', $c->reference_fields('pet_id')), 'pet_id', 
+##        'Reference fields = "pet_id"' );
 
-    my $pet_id = $t2->add_field( name => 'pet_id' );
+##    is( $c->is_valid, undef, 'Constraint on "person" not valid...');
+    #like( $c->error, qr/non-existent field/i,
+    #    q[...because there's no "pet_id" field in "pet"]);
+
+    my $pet_id = $t2->add_field({ name => 'pet_id' });
     is( $pet_id->name, 'pet_id', 'Added field "pet_id"' );
     
-    is( $c->is_valid, 1, 'Constraint now valid' );
+##    is( $c->is_valid, 1, 'Constraint now valid' );
 }
 
 #
@@ -511,27 +518,29 @@ require_ok( 'SQL::Translator::Object::Column' );
 #
 {
     my $s = SQL::Translator::Object::Schema->new;
-    my $t = $s->add_table( name => 'person' );
+    my $t = $s->add_table({ name => 'person' });
 
     is( $t->primary_key, undef, 'No primary key' );
 
-    is( $t->primary_key('person_id'), undef, 
-            q[Can't make PK on "person_id"...] );
-    like( $t->error, qr/invalid field/i, "...because it doesn't exist" );
+#    is( $t->primary_key('person_id'), undef, 
+#            q[Can't make PK on "person_id"...] );
+#    like( $t->error, qr/invalid field/i, "...because it doesn't exist" );
+    dies_ok( sub { $t->primary_key }, "...because it doesn't exist" );
 
-    $t->add_field( name => 'person_id' );
+    $t->add_field({ name => 'person_id' });
     my $c = $t->primary_key('person_id');
 
-    isa_ok( $c, 'SQL::Translator::Object::Schema::Constraint', 'Constraint' );
+    isa_ok( $c, 'SQL::Translator::Object::Constraint', 'Constraint' );
 
     is( join('', $c->fields), 'person_id', 'Constraint now on "person_id"' );
 
-    $t->add_field( name => 'name' );
+    $t->add_field({ name => 'name' });
     $c = $t->primary_key('name');
     is( join(',', $c->fields), 'person_id,name', 
         'Constraint now on "person_id" and "name"' );
 
-    is( scalar @{ $t->get_constraints }, 1, 'Found 1 constraint' );
+    #is( scalar @{ $t->get_constraints }, 1, 'Found 1 constraint' );
+    is( scalar $t->get_constraints, 1, 'Found 1 constraint' );
 }
 
 #
@@ -539,18 +548,19 @@ require_ok( 'SQL::Translator::Object::Column' );
 #
 {
     my $s  = SQL::Translator::Object::Schema->new;
-    my $t1 = $s->add_table( name => 'person' );
-    my $t2 = $s->add_table( name => 'pet' );
-    $t1->add_field( name => 'id' );
+    my $t1 = $s->add_table({ name => 'person' });
+    my $t2 = $s->add_table({ name => 'pet' });
+    $t1->add_field({ name => 'id' });
     my $c1 = $t1->primary_key( 'id' ) or warn $t1->error;
     is( $c1->type, PRIMARY_KEY, 'Made "person_id" PK on "person"' );
 
-    $t2->add_field( name => 'person_id' );
-    my $c2 = $t2->add_constraint(
+    $t2->add_field({ name => 'person_id' });
+    my $c2 = $t2->add_constraint({
         type            => PRIMARY_KEY,
         fields          => 'person_id',
         reference_table => 'person',
-    );
+        table           => $t1,
+    });
 
     is( join('', $c2->reference_fields), 'id', 'FK found PK "person.id"' );
 }
@@ -559,18 +569,18 @@ require_ok( 'SQL::Translator::Object::Column' );
 # View
 #
 {
-    my $s      = SQL::Translator::Object::Schema->new( name => 'ViewTest' );
+    my $s      = SQL::Translator::Object::Schema->new({ name => 'ViewTest' });
     my $name   = 'foo_view';
     my $sql    = 'select name, age from person';
     my $fields = 'name, age';
-    my $v      = $s->add_view(
+    my $v      = $s->add_view({
         name   => $name,
         sql    => $sql,
         fields => $fields,
         schema => $s,
-    );
+    });
 
-    isa_ok( $v, 'SQL::Translator::Object::Schema::View', 'View' );
+    isa_ok( $v, 'SQL::Translator::Object::View', 'View' );
     isa_ok( $v->schema, 'SQL::Translator::Object::Schema', 'Schema' );
     is( $v->schema->name, 'ViewTest', qq[Schema name is "'ViewTest'"] );
     is( $v->name, $name, qq[Name is "$name"] );
@@ -581,7 +591,7 @@ require_ok( 'SQL::Translator::Object::Column' );
     is( scalar @views, 1, 'Number of views is 1' );
 
     my $v1 = $s->get_view( $name );
-    isa_ok( $v1, 'SQL::Translator::Object::Schema::View', 'View' );
+    isa_ok( $v1, 'SQL::Translator::Object::View', 'View' );
     is( $v1->name, $name, qq[Name is "$name"] );
 }
 
@@ -590,21 +600,21 @@ require_ok( 'SQL::Translator::Object::Column' );
 #
 {
     my $s                   = SQL::Translator::Object::Schema->new(name => 'TrigTest');
-    $s->add_table(name=>'foo') or die "Couldn't create table: ", $s->error;
+    $s->add_table({ name => 'foo' }) or die "Couldn't create table: ", $s->error;
     my $name                = 'foo_trigger';
     my $perform_action_when = 'after';
     my $database_events     = 'insert';
     my $on_table            = 'foo';
     my $action              = 'update modified=timestamp();';
-    my $t                   = $s->add_trigger(
+    my $t                   = $s->add_trigger({
         name                => $name,
         perform_action_when => $perform_action_when,
         database_events     => $database_events,
         on_table            => $on_table,
         action              => $action,
-    ) or die $s->error;
+    }) or die $s->error;
 
-    isa_ok( $t, 'SQL::Translator::Object::Schema::Trigger', 'Trigger' );
+    isa_ok( $t, 'SQL::Translator::Object::Trigger', 'Trigger' );
     isa_ok( $t->schema, 'SQL::Translator::Object::Schema', 'Schema' );
     is( $t->schema->name, 'TrigTest', qq[Schema name is "'TrigTest'"] );
     is( $t->name, $name, qq[Name is "$name"] );
@@ -633,7 +643,7 @@ require_ok( 'SQL::Translator::Object::Column' );
         on_table            => 'foo',
         action              => 'update modified=timestamp();',
     ) or die $s2->error;
-	isa_ok( $t2, 'SQL::Translator::Object::Schema::Trigger', 'Trigger' );
+	isa_ok( $t2, 'SQL::Translator::Object::Trigger', 'Trigger' );
     isa_ok( $t2->schema, 'SQL::Translator::Object::Schema', 'Schema' );
     is( $t2->schema->name, 'TrigTest2', qq[Schema name is "'TrigTest2'"] );
     is( $t2->name, 'foo_trigger', qq[Name is "foo_trigger"] );
@@ -666,10 +676,10 @@ require_ok( 'SQL::Translator::Object::Column' );
     # $schema-> drop_trigger
     #
     my $dropped_trig = $s->drop_trigger($t->name);
-    isa_ok($dropped_trig, 'SQL::Translator::Object::Schema::Trigger', 'Dropped trigger "foo_trigger"' );
+    isa_ok($dropped_trig, 'SQL::Translator::Object::Trigger', 'Dropped trigger "foo_trigger"' );
     $s->add_trigger($t);
     my $dropped_trig2 = $s->drop_trigger($t);
-    isa_ok($dropped_trig2, 'SQL::Translator::Object::Schema::Trigger', 'Dropped trigger "foo_trigger" by object' );
+    isa_ok($dropped_trig2, 'SQL::Translator::Object::Trigger', 'Dropped trigger "foo_trigger" by object' );
     is($dropped_trig2->name, $t->name, 'Dropped correct trigger "foo_trigger"');
     my $dropped_trig3 = $s->drop_trigger($t->name);
     like( $s->error, qr/doesn't exist/, qq[Can't drop non-existant trigger "foo_trigger"] );
@@ -695,7 +705,7 @@ require_ok( 'SQL::Translator::Object::Column' );
         comments   => $comments,
     ) or die $s->error;
 
-    isa_ok( $p, 'SQL::Translator::Object::Schema::Procedure', 'Procedure' );
+    isa_ok( $p, 'SQL::Translator::Object::Procedure', 'Procedure' );
     isa_ok( $p->schema, 'SQL::Translator::Object::Schema', 'Schema' );
     is( $p->schema->name, 'ProcTest', qq[Schema name is "'ProcTest'"] );
     is( $p->name, $name, qq[Name is "$name"] );
@@ -707,17 +717,17 @@ require_ok( 'SQL::Translator::Object::Column' );
     is( scalar @procs, 1, 'Number of procedures is 1' );
 
     my $p1 = $s->get_procedure( $name );
-    isa_ok( $p1, 'SQL::Translator::Object::Schema::Procedure', 'Procedure' );
+    isa_ok( $p1, 'SQL::Translator::Object::Procedure', 'Procedure' );
     is( $p1->name, $name, qq[Name is "$name"] );
 
     #
     # $schema-> drop_procedure
     #
     my $dropped_proc = $s->drop_procedure($p->name);
-    isa_ok($dropped_proc, 'SQL::Translator::Object::Schema::Procedure', 'Dropped procedure "foo_proc"' );
+    isa_ok($dropped_proc, 'SQL::Translator::Object::Procedure', 'Dropped procedure "foo_proc"' );
     $s->add_procedure($p);
     my $dropped_proc2 = $s->drop_procedure($p);
-    isa_ok($dropped_proc2, 'SQL::Translator::Object::Schema::Procedure', 'Dropped procedure "foo_proc" by object' );
+    isa_ok($dropped_proc2, 'SQL::Translator::Object::Procedure', 'Dropped procedure "foo_proc" by object' );
     is($dropped_proc2->name, $p->name, 'Dropped correct procedure "foo_proc"');
     my $dropped_proc3 = $s->drop_procedure($p->name);
     like( $s->error, qr/doesn't exist/, qq[Can't drop non-existant procedure "foo_proc"] );