X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F13schema.t;h=3d9df323d0f6115fb21523e9f79a84421cb647df;hb=c0ec0e22d3f0e3852c00daac5ef5763010b410c3;hp=bbb002e9f191c4ed2adb04a7c237c847b1166847;hpb=57fd48f1198ca38902a801a323f62522f9b5d6c5;p=dbsrgits%2FSQL-Translator.git

diff --git a/t/13schema.t b/t/13schema.t
index bbb002e..3d9df32 100644
--- a/t/13schema.t
+++ b/t/13schema.t
@@ -4,16 +4,19 @@
 $| = 1;
 
 use strict;
-use Test::More tests => 199;
+use warnings;
+use Test::More;
+use Test::Exception;
 use SQL::Translator::Schema::Constants;
 
+require_ok( 'SQL::Translator' );
 require_ok( 'SQL::Translator::Schema' );
 
 {
     #
     # Schema
     #
-    my $schema = SQL::Translator::Schema->new( 
+    my $schema = SQL::Translator::Schema->new(
         name => 'foo',
         database => 'MySQL',
     );
@@ -23,7 +26,7 @@ require_ok( 'SQL::Translator::Schema' );
     is( $schema->name('bar'), 'bar', 'Schema name changed to "bar"' );
 
     is( $schema->database, 'MySQL', 'Schema database is "MySQL"' );
-    is( $schema->database('PostgreSQL'), 'PostgreSQL', 
+    is( $schema->database('PostgreSQL'), 'PostgreSQL',
         'Schema database changed to "PostgreSQL"' );
 
     is( $schema->is_valid, undef, 'Schema not valid...' );
@@ -35,7 +38,7 @@ require_ok( 'SQL::Translator::Schema' );
     my $foo_table = $schema->add_table(name => 'foo') or warn $schema->error;
     isa_ok( $foo_table, 'SQL::Translator::Schema::Table', 'Table "foo"' );
 
-    my $bar_table = SQL::Translator::Schema::Table->new( name => 'bar' ) or 
+    my $bar_table = SQL::Translator::Schema::Table->new( name => 'bar' ) or
         warn SQL::Translator::Schema::Table->error;
     $bar_table = $schema->add_table( $bar_table );
     isa_ok( $bar_table, 'SQL::Translator::Schema::Table', 'Table "bar"' );
@@ -44,27 +47,39 @@ require_ok( 'SQL::Translator::Schema' );
     $schema = $bar_table->schema( $schema );
     isa_ok( $schema, 'SQL::Translator::Schema', 'Schema' );
 
-    is( $bar_table->name('foo'), undef, 
+    is( $bar_table->name('foo'), undef,
         q[Can't change name of table "bar" to "foo"...]);
-    like( $bar_table->error, qr/can't use table name/i, 
+    like( $bar_table->error, qr/can't use table name/i,
         q[...because "foo" exists] );
 
     my $redundant_table = $schema->add_table(name => 'foo');
     is( $redundant_table, undef, qq[Can't create another "foo" table...] );
-    like( $schema->error, qr/can't use table name/i, 
+    like( $schema->error, qr/can't use table name/i,
         '... because "foo" exists' );
 
     $redundant_table = $schema->add_table(name => '');
-    is( $redundant_table, undef, qq[Can't add an anonymouse table...] );
+    is( $redundant_table, undef, qq[Can't add an anonymous table...] );
     like( $schema->error, qr/No table name/i,
-        '... because if has no name ' );
+        '... because it has no name ' );
 
     $redundant_table = SQL::Translator::Schema::Table->new(name => '');
-    is( $redundant_table, undef, qq[Can't create an anonymouse table] );
+    is( $redundant_table, undef, qq[Can't create an anonymous table] );
     like( SQL::Translator::Schema::Table->error, qr/No table name/i,
-        '... because if has no name ' );
+        '... because it has no name ' );
 
     #
+    # $schema-> drop_table
+    #
+    my $dropped_table = $schema->drop_table($foo_table->name, cascade => 1);
+    isa_ok($dropped_table, 'SQL::Translator::Schema::Table', 'Dropped table "foo"' );
+    $schema->add_table($foo_table);
+    my $dropped_table2 = $schema->drop_table($foo_table, cascade => 1);
+    isa_ok($dropped_table2, 'SQL::Translator::Schema::Table', 'Dropped table "foo" by object' );
+    my $dropped_table3 = $schema->drop_table($foo_table->name, cascade => 1);
+    like( $schema->error, qr/doesn't exist/, qq[Can't drop non-existant table "foo"] );
+
+    $schema->add_table($foo_table);
+    #
     # Table default new
     #
     is( $foo_table->name, 'foo', 'Table name is "foo"' );
@@ -80,21 +95,21 @@ require_ok( 'SQL::Translator::Schema' );
     #
     # New table with args
     #
-    my $person_table = $schema->add_table( 
-        name     => 'person', 
+    my $person_table = $schema->add_table(
+        name     => 'person',
         comments => 'foo',
     );
     is( $person_table->name, 'person', 'Table name is "person"' );
     is( $person_table->is_valid, undef, 'Table is not yet valid' );
     is( $person_table->comments, 'foo', 'Comments = "foo"' );
-    is( join(',', $person_table->comments('bar')), 'foo,bar', 
+    is( join(',', $person_table->comments('bar')), 'foo,bar',
         'Table comments = "foo,bar"' );
     is( $person_table->comments, "foo\nbar", 'Table comments = "foo,bar"' );
 
     #
     # Field default new
     #
-    my $f1 = $person_table->add_field(name => 'foo') or 
+    my $f1 = $person_table->add_field(name => 'foo') or
         warn $person_table->error;
     isa_ok( $f1, 'SQL::Translator::Schema::Field', 'Field' );
     is( $f1->name, 'foo', 'Field name is "foo"' );
@@ -121,7 +136,7 @@ require_ok( 'SQL::Translator::Schema' );
     is( $f2->is_nullable('0'), 0, 'Field cannot be NULL' );
     is( $f2->default_value(''), '', 'Field default is empty string' );
     is( $f2->comments, 'foo', 'Field comment = "foo"' );
-    is( join(',', $f2->comments('bar')), 'foo,bar', 
+    is( join(',', $f2->comments('bar')), 'foo,bar',
         'Field comment = "foo,bar"' );
     is( $f2->comments, "foo\nbar", 'Field comment = "foo,bar"' );
 
@@ -133,7 +148,7 @@ require_ok( 'SQL::Translator::Schema' );
 
     my $redundant_field = $person_table->add_field(name => 'f2');
     is( $redundant_field, undef, qq[Didn't create another "f2" field...] );
-    like( $person_table->error, qr/can't use field/i, 
+    like( $person_table->error, qr/can't use field/i,
         '... because it exists' );
 
     $redundant_field = $person_table->add_field(name => '');
@@ -151,6 +166,23 @@ require_ok( 'SQL::Translator::Schema' );
 
     is( $fields[0]->name, 'foo', 'First field is "foo"' );
     is( $fields[1]->name, 'f2', 'Second field is "f2"' );
+    is( join(",",$person_table->field_names), 'foo,f2',
+        'field_names is "foo,f2"' );
+
+    my $ci_field = $person_table->get_field('FOO', 'case_insensitive');
+    is( $ci_field->name, 'foo', 'Got field case-insensitively' );
+    #
+    # $table-> drop_field
+    #
+    my $dropped_field = $person_table->drop_field($f2->name, cascade => 1);
+    isa_ok($dropped_field, 'SQL::Translator::Schema::Field', 'Dropped field "f2"' );
+    $person_table->add_field($f2);
+    my $dropped_field2 = $person_table->drop_field($f2, cascade => 1);
+    isa_ok($dropped_field2, 'SQL::Translator::Schema::Field', 'Dropped field "f2" by object' );
+    my $dropped_field3 = $person_table->drop_field($f2->name, cascade => 1);
+    like( $person_table->error, qr/doesn't exist/, qq[Can't drop non-existant field "f2"] );
+
+    $person_table->add_field($f2);
 
     #
     # Field methods
@@ -189,7 +221,7 @@ require_ok( 'SQL::Translator::Schema' );
     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" ) 
+    my $index1 = $person_table->add_index( name => "foo" )
         or warn $person_table->error;
     isa_ok( $index1, 'SQL::Translator::Schema::Index', 'Index' );
     is( $index1->name, 'foo', 'Index name is "foo"' );
@@ -197,20 +229,20 @@ require_ok( 'SQL::Translator::Schema' );
     is( $index1->is_valid, undef, 'Index name is not valid...' );
     like( $index1->error, qr/no fields/i, '...because it has no fields' );
 
-    is( join(':', $index1->fields('foo,bar')), 'foo:bar', 
+    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, 
+    like( $index1->error, qr/does not exist in table/i,
         '...because it used fields not in the table' );
 
-    is( join(':', $index1->fields(qw[foo age])), 'foo:age', 
+    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::Schema::Index->new( name => "bar" ) 
+    my $index2 = SQL::Translator::Schema::Index->new( name => "bar" )
         or warn SQL::Translator::Schema::Index->error;
     $index2    = $person_table->add_index( $index2 );
     isa_ok( $index2, 'SQL::Translator::Schema::Index', 'Index' );
@@ -222,44 +254,65 @@ require_ok( 'SQL::Translator::Schema' );
     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::Schema::Index', 'Dropped index "foo"' );
+    $person_table->add_index($index1);
+    my $dropped_index2 = $person_table->drop_index($index1);
+    isa_ok($dropped_index2, 'SQL::Translator::Schema::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"] );
+
+    $person_table->add_index($index1);
+
+    #
     # Constraint
     #
     my @constraints = $person_table->get_constraints;
     is( scalar @constraints, 0, 'No constraints' );
-    like( $person_table->error, qr/no constraints/i, 
+    like( $person_table->error, qr/no constraints/i,
         'Error for no constraints' );
-    my $constraint1 = $person_table->add_constraint( name => 'foo' ) 
+    my $constraint1 = $person_table->add_constraint( name => 'foo' )
         or warn $person_table->error;
     isa_ok( $constraint1, 'SQL::Translator::Schema::Constraint', 'Constraint' );
     is( $constraint1->name, 'foo', 'Constraint name is "foo"' );
 
-    $fields = join(',', $constraint1->fields('id') );
-    is( $fields, 'id', 'Constraint field = "id"' );
+    $fields = join(',', $constraint1->fields('age') );
+    is( $fields, 'age', 'Constraint field = "age"' );
+
+    $fields = $constraint1->fields;
+    ok( ref $fields[0] && $fields[0]->isa("SQL::Translator::Schema::Field"),
+        'Constraint fields returns a SQL::Translator::Schema::Field' );
+
+    $fields = join(',', $constraint1->fields('age,age') );
+    is( $fields, 'age', 'Constraint field = "age"' );
 
-    $fields = join(',', $constraint1->fields('id,id') );
-    is( $fields, 'id', 'Constraint field = "id"' );
+    $fields = join(',', $constraint1->fields('age', 'name') );
+    is( $fields, 'age,name', 'Constraint field = "age,name"' );
 
-    $fields = join(',', $constraint1->fields('id', 'name') );
-    is( $fields, 'id,name', 'Constraint field = "id,name"' );
+    $fields = join(',', $constraint1->fields( 'age,name,age' ) );
+    is( $fields, 'age,name', 'Constraint field = "age,name"' );
 
-    $fields = join(',', $constraint1->fields( 'id,name,id' ) );
-    is( $fields, 'id,name', 'Constraint field = "id,name"' );
+    $fields = join(',', $constraint1->fields( 'age, name' ) );
+    is( $fields, 'age,name', 'Constraint field = "age,name"' );
 
-    $fields = join(',', $constraint1->fields( 'id, name' ) );
-    is( $fields, 'id,name', 'Constraint field = "id,name"' );
+    $fields = join(',', $constraint1->fields( [ 'age', 'name' ] ) );
+    is( $fields, 'age,name', 'Constraint field = "age,name"' );
 
-    $fields = join(',', $constraint1->fields( [ 'id', 'name' ] ) );
-    is( $fields, 'id,name', 'Constraint field = "id,name"' );
+    $fields = join(',', $constraint1->fields( qw[ age name ] ) );
+    is( $fields, 'age,name', 'Constraint field = "age,name"' );
 
-    $fields = join(',', $constraint1->fields( qw[ id name ] ) );
-    is( $fields, 'id,name', 'Constraint field = "id,name"' );
+    $fields = join(',', $constraint1->field_names );
+    is( $fields, 'age,name', 'Constraint field_names = "age,name"' );
 
     is( $constraint1->match_type, '', 'Constraint match type is empty' );
-    is( $constraint1->match_type('foo'), undef, 
+    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('FULL'), 'full', 
+    is( $constraint1->match_type('FULL'), 'full',
         'Constraint match type = "full"' );
 
     my $constraint2 = SQL::Translator::Schema::Constraint->new( name => 'bar' );
@@ -273,7 +326,7 @@ require_ok( 'SQL::Translator::Schema' );
     ) or die $person_table->error;
     isa_ok( $constraint3, 'SQL::Translator::Schema::Constraint', 'Constraint' );
     is( $constraint3->type, CHECK_C, 'Constraint type is "CHECK"' );
-    is( $constraint3->expression, 'foo bar', 
+    is( $constraint3->expression, 'foo bar',
         'Constraint expression is "foo bar"' );
 
     my $constraints = $person_table->get_constraints;
@@ -282,6 +335,20 @@ require_ok( 'SQL::Translator::Schema' );
     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::Schema::Constraint', 'Dropped constraint "foo"' );
+    $person_table->add_constraint($constraint1);
+    my $dropped_con2 = $person_table->drop_constraint($constraint1);
+    isa_ok($dropped_con2, 'SQL::Translator::Schema::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"] );
+
+    $person_table->add_constraint($constraint1);
+
+    #
     # View
     #
     my $view = $schema->add_view( name => 'view1' ) or warn $schema->error;
@@ -299,20 +366,34 @@ require_ok( 'SQL::Translator::Schema' );
     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::Schema::View', 'Dropped view "view1"' );
+    $schema->add_view($view);
+    my $dropped_view2 = $schema->drop_view($view);
+    isa_ok($dropped_view2, 'SQL::Translator::Schema::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"] );
+
+    $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, 
+    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' );
 
     $bad_view = $schema->get_view('bar');
-    like( $schema->error, qr/does not exist/i, 
+    like( $schema->error, qr/does not exist/i,
         'Error on bad arg to get_view' );
 
     my $good_table = $schema->get_table('foo');
@@ -330,17 +411,18 @@ require_ok( 'SQL::Translator::Schema' );
 
     my @views = $schema->get_views;
     is( scalar @views, 2, 'Found 1 view' );
+
 }
 
 #
 # Test ability to introspect some values
 #
-{ 
-    my $s        =  SQL::Translator::Schema->new( 
+{
+    my $s        =  SQL::Translator::Schema->new(
         name     => 'foo',
         database => 'PostgreSQL',
     );
-    my $t = $s->add_table( name => 'person' ) or warn $s->erro;
+    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');
 
@@ -372,7 +454,7 @@ require_ok( 'SQL::Translator::Schema' );
     is( join('', $c->fields('foo')), 'foo', 'Fields now = "foo"' );
 
     is( $c->is_valid, undef, 'Constraint on "person" not valid...');
-    like( $c->error, qr/non-existent field/i, 
+    like( $c->error, qr/non-existent field/i,
         q[...because field "foo" doesn't exist] );
 
     my $fk = $t->add_field( name => 'pet_id' );
@@ -383,18 +465,18 @@ require_ok( 'SQL::Translator::Schema' );
     $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, 
+    like( $c->error, qr/only one field/i,
         q[...because too many fields for FK] );
 
     $c->fields('f1');
 
     is( $c->is_valid, undef, 'Constraint on "person" not valid...');
-    like( $c->error, qr/no reference table/i, 
+    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, 
+    like( $c->error, qr/no table named/i,
         q[...because reference table "foo" doesn't exist] );
 
     my $t2 = $s->add_table( name => 'pet' );
@@ -406,7 +488,7 @@ require_ok( 'SQL::Translator::Schema' );
     like( $c->error, qr/no reference fields/i,
         q[...because there're no reference fields]);
 
-    is( join('', $c->reference_fields('pet_id')), 'pet_id', 
+    is( join('', $c->reference_fields('pet_id')), 'pet_id',
         'Reference fields = "pet_id"' );
 
     is( $c->is_valid, undef, 'Constraint on "person" not valid...');
@@ -415,7 +497,7 @@ require_ok( 'SQL::Translator::Schema' );
 
     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' );
 }
 
@@ -428,7 +510,7 @@ require_ok( 'SQL::Translator::Schema' );
 
     is( $t->primary_key, undef, 'No primary key' );
 
-    is( $t->primary_key('person_id'), undef, 
+    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" );
 
@@ -441,7 +523,7 @@ require_ok( 'SQL::Translator::Schema' );
 
     $t->add_field( name => 'name' );
     $c = $t->primary_key('name');
-    is( join(',', $c->fields), 'person_id,name', 
+    is( join(',', $c->fields), 'person_id,name',
         'Constraint now on "person_id" and "name"' );
 
     is( scalar @{ $t->get_constraints }, 1, 'Found 1 constraint' );
@@ -503,15 +585,16 @@ require_ok( 'SQL::Translator::Schema' );
 #
 {
     my $s                   = SQL::Translator::Schema->new(name => 'TrigTest');
+    $s->add_table(name=>'foo') or die "Couldn't create table: ", $s->error;
     my $name                = 'foo_trigger';
     my $perform_action_when = 'after';
-    my $database_event      = 'insert';
+    my $database_events     = 'insert';
     my $on_table            = 'foo';
     my $action              = 'update modified=timestamp();';
     my $t                   = $s->add_trigger(
         name                => $name,
         perform_action_when => $perform_action_when,
-        database_event      => $database_event,
+        database_events     => $database_events,
         on_table            => $on_table,
         action              => $action,
     ) or die $s->error;
@@ -520,11 +603,11 @@ require_ok( 'SQL::Translator::Schema' );
     isa_ok( $t->schema, 'SQL::Translator::Schema', 'Schema' );
     is( $t->schema->name, 'TrigTest', qq[Schema name is "'TrigTest'"] );
     is( $t->name, $name, qq[Name is "$name"] );
-    is( $t->perform_action_when, $perform_action_when, 
+    is( $t->perform_action_when, $perform_action_when,
         qq[Perform action when is "$perform_action_when"] );
-    is( $t->database_event, $database_event, 
-        qq[Database event is "$database_event"] );
-    is( $t->on_table, $on_table, qq[Table is "$on_table"] );
+    is( join(',', $t->database_events), $database_events,
+        qq[Database event is "$database_events"] );
+    isa_ok( $t->table, 'SQL::Translator::Schema::Table', qq[table is a Table"] );
     is( $t->action, $action, qq[Action is "$action"] );
 
     my @triggs = $s->get_triggers;
@@ -533,6 +616,60 @@ require_ok( 'SQL::Translator::Schema' );
     my $t1 = $s->get_trigger( $name );
     isa_ok( $t1, 'SQL::Translator::Schema::Trigger', 'Trigger' );
     is( $t1->name, $name, qq[Name is "$name"] );
+
+
+
+    my $s2                   = SQL::Translator::Schema->new(name => 'TrigTest2');
+    $s2->add_table(name=>'foo') or die "Couldn't create table: ", $s2->error;
+    my $t2                   = $s2->add_trigger(
+        name                => 'foo_trigger',
+        perform_action_when => 'after',
+        database_events     => [qw/insert update/],
+        on_table            => 'foo',
+        action              => 'update modified=timestamp();',
+    ) or die $s2->error;
+    isa_ok( $t2, 'SQL::Translator::Schema::Trigger', 'Trigger' );
+    isa_ok( $t2->schema, 'SQL::Translator::Schema', 'Schema' );
+    is( $t2->schema->name, 'TrigTest2', qq[Schema name is "'TrigTest2'"] );
+    is( $t2->name, 'foo_trigger', qq[Name is "foo_trigger"] );
+    is_deeply(
+        [$t2->database_events],
+        [qw/insert update/],
+        "Database events are [qw/insert update/] "
+    );
+    isa_ok($t2->database_events,'ARRAY','Database events');
+
+    #
+    # Trigger equal tests
+    #
+    isnt(
+        $t1->equals($t2),
+        1,
+        'Compare two Triggers with database_event and database_events'
+    );
+
+    $t1->database_events($database_events);
+    $t2->database_events($database_events);
+    is($t1->equals($t2),1,'Compare two Triggers with database_event');
+
+    $t2->database_events('');
+    $t1->database_events([qw/update insert/]);
+    $t2->database_events([qw/insert update/]);
+    is($t1->equals($t2),1,'Compare two Triggers with database_events');
+
+    #
+    # $schema-> drop_trigger
+    #
+    my $dropped_trig = $s->drop_trigger($t->name);
+    isa_ok($dropped_trig, 'SQL::Translator::Schema::Trigger', 'Dropped trigger "foo_trigger"' );
+    $s->add_trigger($t);
+    my $dropped_trig2 = $s->drop_trigger($t);
+    isa_ok($dropped_trig2, 'SQL::Translator::Schema::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"] );
+
+    $s->add_trigger($t);
 }
 
 #
@@ -567,4 +704,123 @@ require_ok( 'SQL::Translator::Schema' );
     my $p1 = $s->get_procedure( $name );
     isa_ok( $p1, 'SQL::Translator::Schema::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::Schema::Procedure', 'Dropped procedure "foo_proc"' );
+    $s->add_procedure($p);
+    my $dropped_proc2 = $s->drop_procedure($p);
+    isa_ok($dropped_proc2, 'SQL::Translator::Schema::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"] );
+
+    $s->add_procedure($p);
+}
+
+#
+# Test field order
+#
+{
+    my $s  = SQL::Translator::Schema->new;
+    my $t  = $s->add_table( name => 'person'          );
+    my $f3 = $t->add_field( name => 'age', order => 3 );
+    my $f1 = $t->add_field( name => 'person_id', order => 1 );
+    my $f2 = $t->add_field( name => 'name', order => 2 );
+    my $f4 = $t->add_field( name => 'gender' );
+    my $f5 = $t->add_field( name => 'alias' );
+
+    is( $f1->order, 1, 'Field order is passed, order is 1' );
+    is( $f2->order, 2, 'Field order is passed, order is 2' );
+    is( $f3->order, 3, 'Field order is passed, order is 3' );
+    is( $f4->order, 4, 'Field order is not passed, order is 4' );
+    is( $f5->order, 5, 'Field order is not passed, order is 5' );
+
+    my $t2  = $s->add_table( name => 'place'                );
+    $f2 = $t2->add_field( name => 'name', order => 2 );
+
+    throws_ok { my $f22 = $t2->add_field( name => 'name2', order => 2 ) }
+        qr/\QRequested order '2' for column 'name2' conflicts with already existing column 'name'/;
+
+    throws_ok { $f1 = $t2->add_field( name => 'location' ) }
+        qr/field order incomplete/;
+}
+
+#
+# Test link tables
+#
+
+{
+    my $s = SQL::Translator::Schema->new;
+    my $t1 = $s->add_table( name => 'person' );
+    $t1->add_field( name => 'id' );
+    $t1->primary_key( 'id' );
+    $t1->add_field( name => 'name' );
+
+    ok( $t1->is_data, 'Person table has data' );
+    ok( !$t1->is_trivial_link, 'Person table is not trivial' );
+
+    my $t2 = $s->add_table( name => 'pet' );
+    $t2->add_field( name => 'id' );
+    $t2->primary_key( 'id' );
+    $t2->add_field( name => 'name' );
+
+    ok( $t2->is_data, 'Pet table has data' );
+    ok( !$t1->is_trivial_link, 'Pet table is trivial' );
+
+    my $t3 = $s->add_table( name => 'person_pet' );
+    $t3->add_field( name => 'id' );
+    my $f1 = $t3->add_field( name => 'person_id' );
+    my $f2 = $t3->add_field( name => 'pet_id' );
+    $t3->primary_key( 'id' );
+
+    $t3->add_constraint(
+        type => FOREIGN_KEY,
+        fields => 'person_id',
+        reference_table => $t1,
+    );
+
+    $t3->add_constraint(
+        type => FOREIGN_KEY,
+        fields => 'pet_id',
+        reference_table => $t2,
+    );
+
+    ok( $f1->is_foreign_key, "person_id is foreign key" );
+    ok( $f2->is_foreign_key, "pet_id is foreign key" );
+
+    ok( !$t3->is_data, 'Link table has no data' );
+    ok( $t3->is_trivial_link, 'Link table is trivial' );
+    is( $t3->can_link($t1, $t2)->[0], 'one2one', 'Link table can link' );
+
+    my $t4 = $s->add_table( name => 'fans' );
+    my $f3 = $t4->add_field( name => 'fan_id' );
+    my $f4 = $t4->add_field( name => 'idol_id' );
+    $t4->primary_key( 'fan_id', 'idol_id' );
+
+    $t4->add_constraint(
+        type => FOREIGN_KEY,
+        name => 'fan_fan_fk',
+        fields => 'fan_id',
+        reference_table => $t1,
+    );
+
+    $t4->add_constraint(
+        type => FOREIGN_KEY,
+        name => 'fan_idol_fk',
+        fields => 'idol_id',
+        reference_table => $t1,
+    );
+
+    ok( $f3->is_foreign_key, "fan_id is foreign key" );
+    ok( $f4->is_foreign_key, "idol_id is foreign key" );
+
+    ok( !$t4->is_data, 'Self-link table has no data' );
+    ok( !$t4->is_trivial_link, 'Self-link table is not trivial' );
+    is( $t4->can_link($t1, $t1)->[0], 'many2many', 'Self-link table can link' );
+    ok( !$t4->can_link($t1, $t2)->[0], 'Self-link table can\'t link other' );
 }
+
+done_testing;