From: Luke Saunders <luke.saunders@gmail.com>
Date: Wed, 9 Jul 2008 00:11:38 +0000 (-0500)
Subject: Merge 'trunk' into 'replication_dedux'
X-Git-Tag: v0.08240~402^2~10
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=2007d8d6f18bde3672a0624324363750524f4f7c;hp=7e38d85069fbeeff050dc736b756b60c01f85fc6;p=dbsrgits%2FDBIx-Class.git

Merge 'trunk' into 'replication_dedux'

r14821@dev (orig r4560):  lukes | 2008-07-08 19:11:38 -0500
fixed versioned stuff to strip BEGIN from sql files
---

diff --git a/lib/DBIx/Class/Schema/Versioned.pm b/lib/DBIx/Class/Schema/Versioned.pm
index 0799202..1b864cc 100644
--- a/lib/DBIx/Class/Schema/Versioned.pm
+++ b/lib/DBIx/Class/Schema/Versioned.pm
@@ -324,7 +324,7 @@ sub _read_sql_file {
   @data = split(/;/, join('', @data));
   close($fh);
   @data = grep { $_ && $_ !~ /^-- / } @data;
-  @data = grep { $_ !~ /^(BEGIN TRANSACTION|COMMIT)/m } @data;
+  @data = grep { $_ !~ /^(BEGIN|BEGIN TRANSACTION|COMMIT)/m } @data;
   return \@data;
 }