move from curries to provides => { set => 'add_...' } and around add_... { }

[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 9d2389a..97458d7 100644 (file)
--- a/lib/SQL/Translator/Object/Schema.pm
+++ b/lib/SQL/Translator/Object/Schema.pm
@@ -21,14 +21,7 @@ class SQL::Translator::Object::Schema {
             keys   => 'table_ids',
             values => 'get_tables',
             get    => 'get_table',
-        },
-        curries => {
-            set => {
-                add_table => sub {
-                    my ($self, $body, $table) = @_;
-                    $self->$body($table->name, $table);
-                }
-            }
+            set    => 'add_table',
         },
         default => sub { my %hash = (); tie %hash, 'Tie::IxHash'; return \%hash },
     );
@@ -42,14 +35,7 @@ class SQL::Translator::Object::Schema {
             keys   => 'view_ids',
             values => 'get_views',
             get    => 'get_view',
-        },
-        curries => {
-            set => { 
-                add_view => sub {
-                    my ($self, $body, $view) = @_;
-                    $self->$body($view->name, $view);
-                }
-            }
+            set    => 'add_view',
         },
         default => sub { my %hash = (); tie %hash, 'Tie::IxHash'; return \%hash },
     );
@@ -63,14 +49,7 @@ class SQL::Translator::Object::Schema {
             keys   => 'procedure_ids',
             values => 'get_procedures',
             get    => 'get_procedure',
-        },
-        curries => {
-            set => {
-                add_procedure => sub {
-                    my ($self, $body, $procedure) = @_;
-                    $self->$body($procedure->name, $procedure);
-                }
-            }
+            set    => 'add_procedure',
         },
         default => sub { my %hash = (); tie %hash, 'Tie::IxHash'; return \%hash },
     );
@@ -84,18 +63,16 @@ class SQL::Translator::Object::Schema {
             keys   => 'trigger_ids',
             values => 'get_triggers',
             get    => 'get_trigger',
-        },
-        curries => {
-            set => {
-                add_trigger => sub {
-                    my ($self, $body, $trigger) = @_;
-                    $self->$body($trigger->name, $trigger);
-                }
-            }
+            set    => 'add_trigger',
         },
         default => sub { my %hash = (); tie %hash, 'Tie::IxHash'; return \%hash },
     );
 
+    around add_table(Table $table) { $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) }
+
     method is_valid { 1 }
 
     method order { }