move backcompat into Compat.pm and apply the role to Object.pm

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

diff --git a/lib/SQL/Translator/Object/View.pm b/lib/SQL/Translator/Object/View.pm
index 414abd6..e800cbb 100644 (file)
--- a/lib/SQL/Translator/Object/View.pm
+++ b/lib/SQL/Translator/Object/View.pm
@@ -1,44 +1,33 @@
-package SQL::Translator::Object::View;
-use namespace::autoclean;
-use Moose;
-use MooseX::Types::Moose qw(HashRef Str);
-use MooseX::AttributeHelpers;
-use SQL::Translator::Types qw(Column);
-extends 'SQL::Translator::Object';
+use MooseX::Declare;
+class SQL::Translator::Object::View extends SQL::Translator::Object {
+    use MooseX::Types::Moose qw(HashRef Str);
+    use SQL::Translator::Types qw(Column);
+    
+    has 'name' => (
+        is => 'rw',
+        isa => Str,
+        required => 1
+    );
+    
+    has 'columns' => (
+        traits => ['Hash'],
+        is => 'rw',
+        isa => HashRef[Column],
+        handles => {
+            exists_column => 'exists',
+            column_ids    => 'keys',
+            get_columns   => 'values',
+            get_column    => 'get',
+            add_column    => 'set',
+        },
+        default => sub { my %hash = (); tie %hash, 'Tie::IxHash'; return \%hash },
+    );
+    
+    has 'sql' => (
+        is => 'rw',
+        isa => Str,
+        required => 1
+    );
 
-has 'name' => (
-    is => 'rw',
-    isa => Str,
-    required => 1
-);
-
-has 'columns' => (
-    metaclass => 'Collection::Hash',
-    is => 'rw',
-    isa => HashRef[Column],
-    provides => {
-        exists => 'exists_column',
-        keys   => 'column_ids',
-        get    => 'get_column',
-    },
-    curries => {
-        set => {
-            add_column => sub {
-                my ($self, $body, $column) = @_;
-                $self->$body($column->name, $column);
-            }
-        }
-    },
-    default => sub { {} },
-    required => 0
-);
-
-has 'sql' => (
-    is => 'rw',
-    isa => Str,
-    required => 1
-);
-
-__PACKAGE__->meta->make_immutable;
-
-1;
+    around add_column(Column $column) { $self->$orig($column->name, $column) }
+}