Fix line ending processing by Build.

perlDreamer · perlDreamer · commit a418cbd89089 · 2012-02-24T21:26:28.000-08:00
diff --git a/lib/WGDev/Command/Build.pm b/lib/WGDev/Command/Build.pm
@@ -129,9 +129,9 @@ sub write_db_structure {
         if ( !$statement && $line =~ /\A(CREATE[ ]TABLE)/msx ) {
             $statement = $1;
         }
-        if ( $statement && $line =~ /;\z/msx ) {
+        if ( $statement && $line =~ /;\n?\z/msx ) {
             if ( $statement eq 'CREATE TABLE' ) {
-                $line =~ s/;\z/ CHARSET=utf8;/msx;
+                $line =~ s/;(\n?)\z/ CHARSET=utf8;$1/msx;
             }
             undef $statement;
         }

Original file line number	Diff line number	Diff line change
`@@ -129,9 +129,9 @@ sub write_db_structure {`
`129`	`129`	`if ( !$statement && $line =~ /\A(CREATE[ ]TABLE)/msx ) {`
`130`	`130`	`$statement = $1;`
`131`	`131`	`}`
`132`		`- if ( $statement && $line =~ /;\z/msx ) {`
	`132`	`+ if ( $statement && $line =~ /;\n?\z/msx ) {`
`133`	`133`	`if ( $statement eq 'CREATE TABLE' ) {`
`134`		`- $line =~ s/;\z/ CHARSET=utf8;/msx;`
	`134`	`+ $line =~ s/;(\n?)\z/ CHARSET=utf8;$1/msx;`
`135`	`135`	`}`
`136`	`136`	`undef $statement;`
`137`	`137`	`}`