[Rt-commit] r3736 - in DBIx-SearchBuilder/trunk: . SearchBuilder

[alexmv at bestpractical.com]

Author: alexmv
Date: Tue Aug 30 12:59:25 2005
New Revision: 3736

Modified:
   DBIx-SearchBuilder/trunk/   (props changed)
   DBIx-SearchBuilder/trunk/META.yml
   DBIx-SearchBuilder/trunk/SearchBuilder.pm
   DBIx-SearchBuilder/trunk/SearchBuilder/Handle.pm
Log:
 r5872 at zoq-fot-pik:  chmrr | 2005-08-15 17:43:59 -0400
  * Working statement logging (to memory, not file)
  * Version bump (to development version)


Modified: DBIx-SearchBuilder/trunk/META.yml
==============================================================================
--- DBIx-SearchBuilder/trunk/META.yml	(original)
+++ DBIx-SearchBuilder/trunk/META.yml	Tue Aug 30 12:59:25 2005
@@ -1,5 +1,5 @@
 name: DBIx-SearchBuilder
-version: 1.30_03
+version: 1.31_1
 license: perl
 distribution_type: module
 build_requires:

Modified: DBIx-SearchBuilder/trunk/SearchBuilder.pm
==============================================================================
--- DBIx-SearchBuilder/trunk/SearchBuilder.pm	(original)
+++ DBIx-SearchBuilder/trunk/SearchBuilder.pm	Tue Aug 30 12:59:25 2005
@@ -4,7 +4,7 @@
 use strict;
 use vars qw($VERSION);
 
-$VERSION = "1.31";
+$VERSION = "1.31_1";
 
 =head1 NAME
 

Modified: DBIx-SearchBuilder/trunk/SearchBuilder/Handle.pm
==============================================================================
--- DBIx-SearchBuilder/trunk/SearchBuilder/Handle.pm	(original)
+++ DBIx-SearchBuilder/trunk/SearchBuilder/Handle.pm	Tue Aug 30 12:59:25 2005
@@ -1,7 +1,7 @@
 # $Header: /home/jesse/DBIx-SearchBuilder/history/SearchBuilder/Handle.pm,v 1.21 2002/01/28 06:11:37 jesse Exp $
 package DBIx::SearchBuilder::Handle;
 use strict;
-use Carp;
+use Carp qw(croak cluck);
 use DBI;
 use Class::ReturnValue;
 use Encode;
@@ -236,11 +236,10 @@
 sub LogSQLStatements {
     my $self = shift;
     if (@_) {
-
         require Time::HiRes;
-    $self->{'_DoLogSQL'} = shift;
-    return ($self->{'_DoLogSQL'});
+        $self->{'_DoLogSQL'} = shift;
     }
+    return ($self->{'_DoLogSQL'});
 }
 
 =head2 _LogSQLStatement STATEMENT DURATION
@@ -253,7 +252,8 @@
     my $self = shift;
     my $statement = shift;
     my $duration = shift;
-    push @{$self->{'StatementLog'}} , ([Time::Hires::time(), $statement, $duration]);
+    my @bind = @_;
+    push @{$self->{'StatementLog'}} , ([Time::HiRes::time(), $statement, [@bind], $duration]);
 
 }
 
@@ -493,8 +493,7 @@
         eval { $executed = $sth->execute(@bind_values) };
     }
     if ( $self->LogSQLStatements ) {
-        $self->_LogSQLStatement( $QueryString, tv_interval($basetime) );
-
+        $self->_LogSQLStatement( $QueryString, Time::HiRes::time() - $basetime, @bind_values );
     }
 
     if ( $@ or !$executed ) {
@@ -504,7 +503,7 @@
 
         }
         else {
-            warn "$self couldn't execute the query '$QueryString'";
+            cluck "$self couldn't execute the query '$QueryString'";
 
             my $ret = Class::ReturnValue->new();
             $ret->as_error(
@@ -853,7 +852,6 @@
         if ( !$alias || $args{'ALIAS1'} ) {
             return ( $self->_NormalJoin(%args) );
         }
-
         $args{'SearchBuilder'}->{'aliases'} = \@new_aliases;
     }
 
@@ -909,7 +907,6 @@
 
     if ( $args{'TYPE'} =~ /LEFT/i ) {
         my $alias = $sb->_GetAlias( $args{'TABLE2'} );
-
         $sb->{'left_joins'}{"$alias"}{'alias_string'} =
           " LEFT JOIN $args{'TABLE2'} $alias ";