From: Aran Dunkley <nad@users.mediawiki.org>
Date: Fri, 9 May 2008 22:33:00 +0000 (+0000)
Subject: tidy up generated tables.sql
X-Git-Tag: 1.31.0-rc.0~47764
X-Git-Url: http://git.cyclocoop.org/%24href?a=commitdiff_plain;h=7f77eadd5862575dd0960a63683b4e99c1144bc6;p=lhc%2Fweb%2Fwiklou.git

tidy up generated tables.sql
---

diff --git a/includes/DatabaseSqlite.php b/includes/DatabaseSqlite.php
index 4c50e9fc83..83f0e9e747 100644
--- a/includes/DatabaseSqlite.php
+++ b/includes/DatabaseSqlite.php
@@ -354,6 +354,10 @@ class DatabaseSqlite extends Database {
 			$sql = str_replace(' unsigned','',$sql);
 			$sql = str_replace(' int ',' INTEGER ',$sql);
 			$sql = str_replace('NOT NULL','',$sql);
+
+			# Tidy up and write file
+			$sql = preg_replace('/^\s*^/m','',$sql); # Remove empty lines
+			$sql = preg_replace('/;$/m',";\n",$sql); # Separate each statement with an empty line
 			file_put_contents($sqlite_tmpl,$sql);
 		}