[Everydevel-opers] SF.net SVN: everydevel: [939] trunk/ebase

[<pau...@us...>]

Revision: 939
          http://svn.sourceforge.net/everydevel/?rev=939&view=rev
Author:   paul_the_nomad
Date:     2007-03-16 17:26:50 -0700 (Fri, 16 Mar 2007)

Log Message:
-----------
FIX: using DBI::fetchrow_array, instead of DBI::fetch. fetch is returning an
array rather than a list.

Modified Paths:
--------------
    trunk/ebase/lib/Everything/DB/Test/sqlite.pm
    trunk/ebase/lib/Everything/DB/sqlite.pm
    trunk/ebase/lib/Everything/DB.pm
    trunk/ebase/lib/Everything/Test/DB.pm

Property Changed:
----------------
    trunk/ebase/


Property changes on: trunk/ebase
___________________________________________________________________
Name: svk:merge
   - 16c2b9cb-492b-4d64-9535-64d4e875048d:/wip/ebase:945
a6810612-c0f9-0310-9d3e-a9e4af8c5745:/ebase/offline:17930
   + 16c2b9cb-492b-4d64-9535-64d4e875048d:/wip/ebase:946
a6810612-c0f9-0310-9d3e-a9e4af8c5745:/ebase/offline:17930

Modified: trunk/ebase/lib/Everything/DB/Test/sqlite.pm
===================================================================
--- trunk/ebase/lib/Everything/DB/Test/sqlite.pm	2007-03-17 00:26:21 UTC (rev 938)
+++ trunk/ebase/lib/Everything/DB/Test/sqlite.pm	2007-03-17 00:26:50 UTC (rev 939)
@@ -119,7 +119,7 @@
     my $self = shift;
 
     can_ok( $self->{class}, 'tableExists' );
-    $self->{instance}->{dbh}->set_true( 'fetch')->clear;
+    $self->{instance}->{dbh}->set_true( 'fetchrow_array')->clear;
 
     my $result = $self->{instance}->tableExists('target');
     my ( $method, $args ) = $self->{instance}->{dbh}->next_call();
@@ -133,9 +133,9 @@
 
     ok( $result, '... returns true if it exists.' );
 
-    is( $self->{instance}->{dbh}->call_pos(-1), 'fetch', '... calls fetch.' );
+    is( $self->{instance}->{dbh}->call_pos(-1), 'fetchrow_array', '... calls fetches a list.' );
 
-    $self->{instance}->{dbh}->set_false('fetch');
+    $self->{instance}->{dbh}->set_false('fetchrow_array');
     ok(
         !$self->{instance}->tableExists('target'),
         '... returning false if table name is not found'
@@ -162,7 +162,7 @@
     $self->{instance}->{dbh}->clear();
 
     ## set fetch so that tableExists returns the appropriate value
-    $self->{instance}->{dbh}->set_true('fetch');
+    $self->{instance}->{dbh}->set_true('fetchrow_array');
 
     my $result = $self->{instance}->createNodeTable('proserpina');
     my ( $method, $args ) = $self->{instance}->{dbh}->next_call();
@@ -177,7 +177,7 @@
     $self->{instance}->{dbh}->clear();
 
     # for the benefit of tableExists
-    $self->{instance}->{dbh}->set_false('fetch');
+    $self->{instance}->{dbh}->set_false('fetchrow_array');
     $result = $self->{instance}->createNodeTable('euphrosyne');
     ( $method, $args ) = $self->{instance}->{dbh}->next_call;
     is( $method, 'prepare', '... calls tableExists' );
@@ -196,14 +196,14 @@
     can_ok( $self->{class}, 'createGroupTable' );
     $self->{instance}->{dbh}->clear();
 
-    $self->{instance}->{dbh}->set_true('fetch');
+    $self->{instance}->{dbh}->set_true('fetchrow_array');
 
     my $result = $self->{instance}->createGroupTable('proserpina');
     my ( $method, $args ) = $self->{instance}->{dbh}->next_call();
     is( $method, 'prepare', 'Attempt to amend an existing table' );
     is( $result, -1,        '... returning -1 if so' );
 
-    $self->{instance}->{dbh}->set_false('fetch');
+    $self->{instance}->{dbh}->set_false('fetchrow_array');
     $self->{instance}->{dbh}->clear();
     $result = $self->{instance}->createGroupTable('elbat');
     ( $method, $args ) = $self->{instance}->{dbh}->next_call(4);
@@ -399,7 +399,7 @@
 
 sub test_drop_node_table : Test(+0) {
     my ($self) = @_;
-    $self->{instance}->{dbh}->set_series( 'fetch', 0, 1 );
+    $self->{instance}->{dbh}->set_series( 'fetchrow_array', 0, 1 );
     $self->SUPER;
 
 }

Modified: trunk/ebase/lib/Everything/DB/sqlite.pm
===================================================================
--- trunk/ebase/lib/Everything/DB/sqlite.pm	2007-03-17 00:26:21 UTC (rev 938)
+++ trunk/ebase/lib/Everything/DB/sqlite.pm	2007-03-17 00:26:50 UTC (rev 939)
@@ -127,7 +127,8 @@
 
 	$sth->execute( $tableName );
 
-	my ($result) = $sth->fetch();
+	my ($result) = $sth->fetchrow_array();
+
 	return $result;
 }
 

Modified: trunk/ebase/lib/Everything/DB.pm
===================================================================
--- trunk/ebase/lib/Everything/DB.pm	2007-03-17 00:26:21 UTC (rev 938)
+++ trunk/ebase/lib/Everything/DB.pm	2007-03-17 00:26:50 UTC (rev 939)
@@ -1117,6 +1117,7 @@
     my ($self, $fh) = @_;
     my $sql = '';
     foreach (<$fh>) {
+	next if /^#/;
 	next if /^\//;
 	next if /^\s*--/;
 	next if /^\s*$/;

Modified: trunk/ebase/lib/Everything/Test/DB.pm
===================================================================
--- trunk/ebase/lib/Everything/Test/DB.pm	2007-03-17 00:26:21 UTC (rev 938)
+++ trunk/ebase/lib/Everything/Test/DB.pm	2007-03-17 00:26:50 UTC (rev 939)
@@ -93,11 +93,7 @@
     $self->{instance}->{dbh}->set_always( 'prepare', $self->{instance}->{dbh});
     $self->{instance}->{dbh}->set_always( 'execute', $self->{instance}->{dbh});
     $self->{instance}->{dbh}->mock( 'fetchrow', sub { qw/a list/ } );
-    {
-        my @a = @lists;
-        $self->{instance}->{dbh}->mock( 'fetchrow_array',
-            sub { return unless my $b = shift @a; return @$b } );
-    }
+
     $self->{instance}->{dbh}->set_true('finish',  'do');
 
 }
@@ -263,6 +259,12 @@
     $self->{instance}->{dbh}->clear;
 
     $self->add_expected_sql('SELECT title FROM node WHERE type_nodetype=1 ') unless $self->isset_expected_sql; 
+    {
+        my @a = @lists;
+        $self->{instance}->{dbh}->mock( 'fetchrow_array',
+            sub { return unless my $b = shift @a; return @$b } );
+    }
+
     my @result = $self->{instance}->fetch_all_nodetype_names;
     my ($method, $args) =  $self->{instance}->{dbh}->next_call;
     is(


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.