Changeset 360 for lang/perl/DBIx-Printf

Timestamp:

10/04/07 13:52:31 (6 years ago)

Author:

kazuho

Message:

add %like(fmt) placeholder
update Changes

Location:

lang/perl/DBIx-Printf/trunk

Files:

• Changes (modified) (1 diff)
• lib/DBIx/Printf.pm (modified) (4 diffs)
• t/00base.t (modified) (2 diffs)

lang/perl/DBIx-Printf/trunk/Changes

@@ -1 +1 @@
 Revision history for Perl extension DBIx::Printf.
+
+0.05  Thu Oct 04 13:55:00 2007
+        - added %t (passthru) placeholder
+        - added %like(fmt) placeholder
 
 0.04  Sat Sep 29 05:40:00 2007

lang/perl/DBIx-Printf/trunk/lib/DBIx/Printf.pm

@@ -7 +7 @@
 
 sub DBI::db::printf {
-    my ($self, $base, @params) = @_;
+    my ($dbh, $fmt, @params) = @_;
     
-    $base =~ s/\%(d|f|s|t|\%)/
-        DBIx::Printf::_printf_quote($self, $1, \@params)
-                /eg;
+    my $sql = DBIx::Printf::_printf($dbh, $fmt, \@params);
     die "too many parameters\n" if @params;
-    $base;
+    $sql;
 }
 
@@ -20 +18 @@
 our $VERSION = 0.05;
 
+sub _printf {
+    my ($dbh, $fmt, $params, $in_like) = @_;
+    
+    $fmt =~ s/\%(?:([dfst\%])|like\((.*?)\))/
+        _printf_quote({
+            dbh      => $dbh,
+            params   => $params,
+            type     => $1 || 'like',
+            like_fmt => $2,
+            in_like  => $in_like,
+        })
+            /eg;
+    $fmt;
+}
+
 sub _printf_quote {
-    my ($dbh, $type, $params) = @_;
+    my $in = shift;
     my $out;
     
-    return '%' if $type eq '%';
+    if ($in->{type} eq '%') {
+        return '%';
+    } elsif ($in->{type} eq 'like') {
+        return "'"
+            . _printf($in->{dbh}, $in->{like_fmt}, $in->{params}, 1)
+                . "'";
+    }
     
-    return _printf_quote_simple($dbh, $type, $params);
+    return _printf_quote_simple(
+        $in->{dbh}, $in->{type}, $in->{params}, $in->{in_like}
+    );
 }
 
 sub _printf_quote_simple {
     no warnings;
-    my ($dbh, $type, $params) = @_;
+    my ($dbh, $type, $params, $in_like) = @_;
     
     die "too few parameters\n" unless @$params;
@@ -40 +61 @@
     } elsif ($type eq 'f') {
         $param = $param + 0;
+    } elsif ($type eq 'l') {
+        $param = s/[\%_]/\\$1/g;
+        $param = $dbh->quote($param); # be paranoiac, use DBI::db::quote
+        $param =~ s/^'(.*)'$/$1/s
+            or die "unexpected quote char used: $param\n";
     } elsif ($type eq 's') {
+        if ($in_like) {
+            $param =~ s/[%_]/\\$&/g;
+        }
         $param = $dbh->quote($param);
+        if ($in_like) {
+            $param =~ s/^'(.*)'$/$1/s
+                or die "unexpected quote char: $param\n";
+        }
     } elsif ($type eq 't') {
         # pass thru
     } else {
-        die "unknown type: $type\n";
+        die "unexpected type: $type\n";
     }
     
@@ -79 +112 @@
 Builds a SQL statement from given statement with placeholders and values.  Following placeholders are supported.
 
-  %d - integer
-  %f - floating point
-  %s - string
-  %t - do not quote, pass thru
+  %d         - integer
+  %f         - floating point
+  %s         - string
+  %t         - do not quote, pass thru
+  %like(fmt) - formats and quotes a string for like expression
+
+=head3 %like example
+
+Below is an example of using the %%like placeholder.  Since metacharacters of supplied parameters are escaped, the example would always by a prefix search.
+
+  $dbh->printf('select * from t where name like %like(%s%%)', $name);
+
 
 =head1 AUTHOR

lang/perl/DBIx-Printf/trunk/t/00base.t

@@ -2 +2 @@
 use warnings;
 
-use Test::More tests => 17;
+use Test::More tests => 20;
 
 BEGIN { use_ok('DBIx::Printf'); }
@@ -28 +28 @@
 is($dbh->printf('select %d,%d,%d', 1, 2, 3), 'select 1,2,3', 'multiple args');
 
+is($dbh->printf('select 1 like %like()'), "select 1 like ''", 'empty %like');
+is($dbh->printf('select 1 like %like(%s%%)', 'a'), "select 1 like 'a%'", '%like');
+is($dbh->printf('select 1 like %like(%s%%)', "%a_b'"), "select 1 like '\\%a\\_b''%'", '%like escape check');
+
 undef $@;
 eval {