fix up is_nullable and is_unique being wrong at times

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

diff --git a/lib/SQL/Translator/Types.pm b/lib/SQL/Translator/Types.pm
index 6c95017..3a6f846 100644 (file)
--- a/lib/SQL/Translator/Types.pm
+++ b/lib/SQL/Translator/Types.pm
@@ -2,7 +2,9 @@ use MooseX::Declare;
 class SQL::Translator::Types {
     use MooseX::Types::Moose qw(ArrayRef CodeRef HashRef Int Maybe Str Undef);
     use MooseX::Types -declare, [qw(Column Constraint ForeignKey Index PrimaryKey Procedure Schema Sequence Table Trigger View
-                                    Bit DBIHandle ColumnSize Parser Producer Translator)];
+                                    Bit DBIHandle MatchType Parser Producer Translator DBICSchema)];
+
+    class_type DBICSchema, { class => 'DBIx::Class::Schema' };
     
     class_type Column, { class => 'SQL::Translator::Object::Column' };
     class_type Constraint, { class => 'SQL::Translator::Object::Constraint' };
@@ -21,18 +23,26 @@ class SQL::Translator::Types {
     class_type Translator, { class => 'SQL::Translator' };
 
     coerce Column, from HashRef, via { SQL::Translator::Object::Column->new($_) };
+    coerce Constraint, from HashRef, via { SQL::Translator::Object::Constraint->new($_) };
+    coerce ForeignKey, from HashRef, via { SQL::Translator::Object::ForeignKey->new($_) };
     coerce Index, from HashRef, via { SQL::Translator::Object::Index->new($_) };
+    coerce PrimaryKey, from HashRef, via { SQL::Translator::Object::PrimaryKey->new($_) };
+    coerce Procedure, from HashRef, via { SQL::Translator::Object::Procedure->new($_) };
+    coerce Schema, from HashRef, via { SQL::Translator::Object::Schema->new($_) };
+    coerce Sequence, from HashRef, via { SQL::Translator::Object::Sequence->new($_) };
+    coerce Table, from HashRef, via { SQL::Translator::Object::Table->new($_) };
+    coerce Trigger, from HashRef, via { SQL::Translator::Object::Trigger->new($_) };
+    coerce View, from HashRef, via { SQL::Translator::Object::View->new($_) };
+
+    coerce ArrayRef, from Str, via { [ $_ ] };
+
+    subtype MatchType, as Str, where { /^(full|partial|simple)$/ || $_ eq '' };
+    coerce MatchType, from Str, via { lc $_ };
 
     subtype Bit, as Int, where { $_ == 1 || $_ == 0 };
     coerce Bit,
         from Undef, via { 0 },
-        from Str,  via { $_ eq '1' ? 1 : 0 };
-
-    subtype ColumnSize, as ArrayRef[Int];
-    coerce ColumnSize,
-        from Int, via { [ $_ ] },
-        from Str, via { [ split /,/ ] },
-        from Undef, via { [ 0 ] };
+        from Str, via { length() ? 1 : 0 };
 
     subtype DBIHandle, as 'DBI::db';