From ae3a09e1d2eaa63bccf2fdffe69510ac843e47cd Mon Sep 17 00:00:00 2001
From: Greg Sabino Mullane <greg@users.mediawiki.org>
Date: Fri, 18 Jul 2008 03:29:40 +0000
Subject: [PATCH] No more TYPE, look for (and default to) ENGINE.

---
 maintenance/postgres/compare_schemas.pl | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/maintenance/postgres/compare_schemas.pl b/maintenance/postgres/compare_schemas.pl
index 4033c0589e..a4fbe6eab3 100644
--- a/maintenance/postgres/compare_schemas.pl
+++ b/maintenance/postgres/compare_schemas.pl
@@ -101,7 +101,7 @@ sub parse_sql {
 			$info{$table}{name}=$table;
 		}
 		elsif (m{^\) /\*\$wgDBTableOptions\*/}) {
-			$info{$table}{engine} = 'TYPE';
+			$info{$table}{engine} = 'ENGINE';
 			$info{$table}{type} = 'variable';
 		}
 		elsif (/^\) ($engine)=($tabletype);$/) {
@@ -181,9 +181,7 @@ for my $oldfile (@old) {
 ## MySQL sanity checks
 for my $table (sort keys %{$old{$oldfile}}) {
 	my $t = $old{$oldfile}{$table};
-	if (($oldfile =~ /5/ and $t->{engine} ne 'ENGINE')
-		or
-		($oldfile !~ /5/ and $t->{engine} ne 'TYPE')) {
+	if ($t->{engine} eq 'TYPE') {
 		die "Invalid engine for $oldfile: $t->{engine}\n" unless $t->{name} eq 'profiling';
 	}
 	my $charset = $t->{charset} || '';
-- 
2.20.1