Replace lazy_build with lazt + builder

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

diff --git a/lib/SQL/Abstract.pm b/lib/SQL/Abstract.pm
index f077979..1963975 100644 (file)
--- a/lib/SQL/Abstract.pm
+++ b/lib/SQL/Abstract.pm
@@ -10,16 +10,10 @@ class SQL::Abstract {
   use MooseX::Types -declare => [qw/NameSeparator/];
   use MooseX::Types::Moose qw/ArrayRef Str Int HashRef CodeRef/;
   use MooseX::AttributeHelpers;
+  use SQL::Abstract::Types qw/NameSeparator AST ArrayAST/;
 
   clean;
 
-  subtype NameSeparator,
-    as ArrayRef[Str];
-    #where { @$_ == 1 ||| @$_ == 2 },
-    #message { "Name separator must be one or two elements" };
-
-  coerce NameSeparator, from Str, via { [ $_ ] };
-
   our $VERSION = '2.000000';
 
   our $AST_VERSION = '1';
@@ -42,7 +36,8 @@ class SQL::Abstract {
 
   has where_dispatch_table => (
     is => 'ro',
-    lazy_build => 1,
+    lazy => 1,
+    builder => '_build_where_dispatch_table',
     isa => HashRef[CodeRef],
     metaclass => 'Collection::ImmutableHash',
     provides => {
@@ -52,7 +47,8 @@ class SQL::Abstract {
 
   has binop_map => (
     is => 'ro',
-    lazy_build => 1,
+    lazy => 1,
+    builder => '_build_binops',
     isa => HashRef,
     metaclass => 'Collection::ImmutableHash',
     provides => {
@@ -62,7 +58,8 @@ class SQL::Abstract {
     }
   );
 
-  sub _build_binop_map { return {%BINOP_MAP} };
+  # List of default binary operators (for in where clauses)
+  sub _build_binops { return {%BINOP_MAP} };
 
   method _build_where_dispatch_table {
     my $binop = $self->can('_binop') or croak "InternalError: $self can't do _binop!";
@@ -116,7 +113,7 @@ class SQL::Abstract {
   }
 
   # Main entry point
-  method generate(ClassName $class: ArrayRef $ast) {
+  method generate(ClassName $class: AST $ast) {
     croak "SQL::Abstract AST version not specified"
       unless ($ast->[0] eq '-ast_version');
 
@@ -132,12 +129,16 @@ class SQL::Abstract {
     $self->_clear_binds();
   }
 
-  method dispatch (ArrayRef $ast) {
-
-    local $_ = $ast->[0];
-    s/^-/_/ or croak "Unknown type tag '$_'";
+  method dispatch (AST $ast) {
+    # I want multi methods!
+    my $tag;
+    if (is_ArrayAST($ast)) {
+      ($tag = $ast->[0]) =~ s/^-/_/;
+    } else {
+      $tag = "_" . $ast->{-type};
+    }
     
-    my $meth = $self->can($_) || croak "Unknown tag '$_'";
+    my $meth = $self->can($tag) || croak "Unknown tag '$tag'";
     return $meth->($self, $ast);
   }