fix issue with order being wrong

[dbsrgits/SQL-Translator-2.0-ish.git] / lib / SQL / Translator / Object / Schema.pm

diff --git a/lib/SQL/Translator/Object/Schema.pm b/lib/SQL/Translator/Object/Schema.pm
index 8fee3c7..80f268d 100644 (file)
--- a/lib/SQL/Translator/Object/Schema.pm
+++ b/lib/SQL/Translator/Object/Schema.pm
@@ -41,6 +41,7 @@ class SQL::Translator::Object::Schema extends SQL::Translator::Object {
             get_views   => 'values',
             get_view    => 'get',
             add_view    => 'set',
+            remove_view => 'delete',
         },
         default => sub { my %hash = (); tie %hash, 'Tie::IxHash'; return \%hash },
     );
@@ -55,6 +56,7 @@ class SQL::Translator::Object::Schema extends SQL::Translator::Object {
             get_procedures   => 'values',
             get_procedure    => 'get',
             add_procedure    => 'set',
+            remove_procedure => 'delete',
         },
         default => sub { my %hash = (); tie %hash, 'Tie::IxHash'; return \%hash },
     );
@@ -69,31 +71,56 @@ class SQL::Translator::Object::Schema extends SQL::Translator::Object {
             get_triggers   => 'values',
             get_trigger    => 'get',
             add_trigger    => 'set',
+            remove_trigger => 'delete',
         },
         default => sub { my %hash = (); tie %hash, 'Tie::IxHash'; return \%hash },
     );
 
-    around add_table(Table $table) {
+    around add_table(Table $table does coerce) {
         die "Can't use table name " . $table->name if $self->exists_table($table->name) || $table->name eq '';
         $table->schema($self);
         $self->$orig($table->name, $table);
     }
 
-    around add_view(View $view) { $self->$orig($view->name, $view) }
-    around add_procedure(Procedure $procedure) { $self->$orig($procedure->name, $procedure) }
-    around add_trigger(Trigger $trigger) { $self->$orig($trigger->name, $trigger) }
+    around add_view(View $view does coerce) {
+        die "Can't use view name " . $view->name if $self->exists_view($view->name) || $view->name eq '';
+        $view->schema($self);
+        $self->$orig($view->name, $view)
+    }
+
+    around add_procedure(Procedure $procedure does coerce) {
+        $procedure->schema($self);
+        $self->$orig($procedure->name, $procedure) 
+    }
+
+    around add_trigger(Trigger $trigger does coerce) {
+        $trigger->schema($self);
+        $self->$orig($trigger->name, $trigger);;
+    }
 
     method is_valid { return $self->get_tables ? 1 : undef }
 
-    multi method drop_table(Table $table, Int :$cascade = 0) {
-        die "Can't drop non-existant table " . $table->name unless $self->exists_table($table->name);
-        $self->remove_table($table->name);
-        
+    around remove_table(Table|Str $table, Int :$cascade = 0) {
+        my $name = is_Table($table) ? $table->name : $table;
+        die "Can't drop non-existant table " . $name unless $self->exists_table($name);
+        $self->$orig($name);
+    }
+
+    around remove_view(View|Str $view) {
+        my $name = is_View($view) ? $view->name : $view;
+        die "Can't drop non-existant view " . $name unless $self->exists_view($name);
+        $self->$orig($name);
+    }
+
+    around remove_trigger(Trigger|Str $trigger) {
+        my $name = is_Trigger($trigger) ? $trigger->name : $trigger;
+####        die "Can't drop non-existant trigger " . $name unless $self->exists_trigger($name);
+        $self->$orig($name);
     }
 
-    multi method drop_table(Str $table, Int :$cascade = 0) {
-        die "Can't drop non-existant table " . $table unless $self->exists_table($table);
-        $self->remove_table($table);
+    around remove_procedure(Procedure|Str $procedure) {
+        my $name = is_Procedure($procedure) ? $procedure->name : $procedure;
+        $self->$orig($name);
     }
 
     method order { }