From: Rob Kinyon <rkinyon@cpan.org>
Date: Tue, 15 Mar 2011 02:25:20 +0000 (-0400)
Subject: Added looper around to make sure that we don't overflow buffers.
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=55fb066a064c95e62c14b1ef57f8e8662cb17323;p=dbsrgits%2FDBIx-Class.git

Added looper around to make sure that we don't overflow buffers.
---

diff --git a/lib/DBIx/Class/Storage/DBI/Replicated.pm b/lib/DBIx/Class/Storage/DBI/Replicated.pm
index c004c39..8dcdece 100644
--- a/lib/DBIx/Class/Storage/DBI/Replicated.pm
+++ b/lib/DBIx/Class/Storage/DBI/Replicated.pm
@@ -360,6 +360,7 @@ has 'write_handler' => (
     _do_query
     _dbh_sth
     _dbh_execute
+    _insert_bulk
   /],
 );
 
diff --git a/lib/DBIx/Class/Storage/DBI/mysql.pm b/lib/DBIx/Class/Storage/DBI/mysql.pm
index 0f4d210..db249f3 100644
--- a/lib/DBIx/Class/Storage/DBI/mysql.pm
+++ b/lib/DBIx/Class/Storage/DBI/mysql.pm
@@ -121,11 +121,21 @@ sub _subq_update_delete {
   return shift->_per_row_update_delete (@_);
 }
 
+my $INSERT_BULK_SIZE = 80;
 sub _insert_bulk {
   my ($self, $source, $cols, $colvalues, $data) = @_;
 
   my $bind_attrs = $self->source_bind_attributes($source);
 
+  # Organize this way to make context sensitivity easier to code up.
+  while ( @$data > $INSERT_BULK_SIZE ) {
+    my @this_data = splice @$data, 0, $INSERT_BULK_SIZE;
+    $self->_execute(
+      'insert_bulk' => [], $source, $bind_attrs, \@this_data, $cols,
+    );
+  }
+
+  # Don't put this in the while-loop above.
   return $self->_execute(
     'insert_bulk' => [], $source, $bind_attrs, $data, $cols,
   );
diff --git a/t/71mysql.t b/t/71mysql.t
index 1f45311..2992f95 100644
--- a/t/71mysql.t
+++ b/t/71mysql.t
@@ -439,4 +439,32 @@ ZEROINSEARCH: {
   is( $schema->resultset('Artist')->find( 100 )->name, 'John' );
 }
 
+# Verify that 600 rows ends up with the return SQL having only 40 entries
+# because they were inserted 80 rows at a time other than the last group
+# of 40 rows. But, all 600 rows are inserted.
+{
+  my $rsrc = $schema->resultset('Artist')->result_source;
+  my ($rv, $sth, @bind) = $schema->storage->insert_bulk(
+    $rsrc,
+    [qw/ artistid name rank charfield /],
+    [
+      (map { [ 1000 + $_, "X $_", $_ + 1000, "Y $_" ] } 1 .. 600),
+    ],
+  );
+
+  is_same_sql_bind(
+    $sth->{Statement},
+    \@bind,
+    q{INSERT INTO artist ( artistid, name, rank, charfield ) VALUES } . join(', ', ('( ?, ?, ?, ? )') x 40 ),
+    [
+      map { [ dummy => $_ ] } (
+        map { 1000 + $_, "X $_", $_ + 1000, "Y $_" } 561 .. 600
+      ),
+    ],
+  );
+
+  is( $schema->resultset('Artist')->find( 1001 )->name, 'X 1' );
+  cmp_ok( $schema->resultset('Artist')->search({ artistid => { '>' => 1000 }})->count, '==', 600 );
+}
+
 done_testing;