[Bast-commits] r3562 - in trunk/DBIx-Class: . lib/DBIx/Class/Storage/DBI t

[blblack at dev.catalyst.perl.org]

Author: blblack
Date: 2007-07-02 16:15:42 +0100 (Mon, 02 Jul 2007)
New Revision: 3562

Modified:
   trunk/DBIx-Class/Changes
   trunk/DBIx-Class/lib/DBIx/Class/Storage/DBI/NoBindVars.pm
   trunk/DBIx-Class/t/74mssql.t
Log:
Patch for ? in NoBindVars data from Tom Hukins

Modified: trunk/DBIx-Class/Changes
===================================================================
--- trunk/DBIx-Class/Changes	2007-07-02 01:46:31 UTC (rev 3561)
+++ trunk/DBIx-Class/Changes	2007-07-02 15:15:42 UTC (rev 3562)
@@ -1,5 +1,6 @@
 Revision history for DBIx::Class
 
+        - Patch to fix ? in data for NoBindVars (from Tom Hukins)
         - Restored mk_classaccessor method for compatibility
 
 0.08002 2007-06-20 06:10:00

Modified: trunk/DBIx-Class/lib/DBIx/Class/Storage/DBI/NoBindVars.pm
===================================================================
--- trunk/DBIx-Class/lib/DBIx/Class/Storage/DBI/NoBindVars.pm	2007-07-02 01:46:31 UTC (rev 3561)
+++ trunk/DBIx-Class/lib/DBIx/Class/Storage/DBI/NoBindVars.pm	2007-07-02 15:15:42 UTC (rev 3562)
@@ -42,17 +42,21 @@
 
   # stringify args, quote via $dbh, and manually insert
 
+  my @sql_part = split /\?/, $sql;
+  my $new_sql;
+
   foreach my $bound (@$bind) {
     shift @$bound;
     foreach my $data (@$bound) {
         if(ref $data) {
             $data = ''.$data;
         }
-        $sql =~ s/\?/$self->_dbh->quote($data)/e;
+        $new_sql .= shift(@sql_part) . $self->_dbh->quote($data);
     }
   }
+  $new_sql .= join '', @sql_part;
 
-  return ($sql);
+  return ($new_sql);
 }
 
 =head1 AUTHORS

Modified: trunk/DBIx-Class/t/74mssql.t
===================================================================
--- trunk/DBIx-Class/t/74mssql.t	2007-07-02 01:46:31 UTC (rev 3561)
+++ trunk/DBIx-Class/t/74mssql.t	2007-07-02 15:15:42 UTC (rev 3562)
@@ -12,7 +12,7 @@
 plan skip_all => 'Set $ENV{DBICTEST_MSSQL_DSN}, _USER and _PASS to run this test'
   unless ($dsn);
 
-plan tests => 4;
+plan tests => 5;
 
 my $storage_type = '::DBI::MSSQL';
 $storage_type = '::DBI::Sybase::MSSQL' if $dsn =~ /^dbi:Sybase:/;
@@ -28,6 +28,7 @@
     DROP TABLE artist");
 
 $dbh->do("CREATE TABLE artist (artistid INT IDENTITY PRIMARY KEY, name VARCHAR(255));");
+$dbh->do("CREATE TABLE cd (cdid INT IDENTITY PRIMARY KEY, artist INT,  title VARCHAR(100), year VARCHAR(100));");
 
 # Just to test compat shim, Auto is in Core
 $schema->class('Artist')->load_components('PK::Auto::MSSQL');
@@ -48,6 +49,14 @@
     }
 );
 
+# Test ? in data don't get treated as placeholders
+my $cd = $schema->resultset('CD')->create( {
+    artist      => 1,
+    title       => 'Does this break things?',
+    year        => 2007,
+} );
+ok($cd->id, 'Not treating ? in data as placeholders');
+
 is( $it->count, 3, "LIMIT count ok" );
 ok( $it->next->name, "iterator->next ok" );
 $it->next;
@@ -58,4 +67,6 @@
 END {
     $dbh->do("IF OBJECT_ID('artist', 'U') IS NOT NULL DROP TABLE artist")
         if $dbh;
+    $dbh->do("IF OBJECT_ID('cd', 'U') IS NOT NULL DROP TABLE cd")
+        if $dbh;
 }