From bd513eb84fe7d0f14eb7bfd8d1cd2f79eae36a7d Mon Sep 17 00:00:00 2001
From: Greg Sabino Mullane <greg@users.mediawiki.org>
Date: Fri, 18 Jul 2008 03:59:49 +0000
Subject: [PATCH] Check for GROUP BY #. Scan extensions directory as well,
 refactor that section.

---
 maintenance/postgres/compare_schemas.pl | 96 ++++++++++++-------------
 1 file changed, 45 insertions(+), 51 deletions(-)

diff --git a/maintenance/postgres/compare_schemas.pl b/maintenance/postgres/compare_schemas.pl
index 801bc0cbc9..84415d79d3 100644
--- a/maintenance/postgres/compare_schemas.pl
+++ b/maintenance/postgres/compare_schemas.pl
@@ -7,8 +7,9 @@
 use strict;
 use warnings;
 use Data::Dumper;
+use Cwd;
 
-check_includes_dir();
+check_valid_sql();
 
 my @old = ('../tables.sql');
 my $new = 'tables.sql';
@@ -457,72 +458,65 @@ for (sort keys %new) {
 } ## end each file to be parsed
 
 
-sub check_includes_dir {
+sub check_valid_sql {
 
-	## Check for some common errors in the files in the includes directory
+	## Check for a few common problems in most php files
+
+	my $olddir = getcwd();
+	chdir("../..");
+	for my $basedir (qw/includes extensions/) {
+		scan_dir($basedir);
+	}
+	chdir $olddir;
+
+	return;
+
+} ## end of check_valid_sql
+
+
+sub scan_dir {
+
+	my $dir = shift;
 
-	print "Checking files in includes directory...\n";
-	my $dir = '../../includes';
 	opendir my $dh, $dir or die qq{Could not opendir $dir: $!\n};
+	print "Scanning $dir...\n";
 	for my $file (grep { -f "$dir/$_" and /\.php$/ } readdir $dh) {
-		$file = "$dir/$file";
-		open my $fh, '<', $file or die qq{Could not open "$file": $!\n};
-		while (<$fh>) {
-			if (/FORCE INDEX/ and $file !~ /Database.php/) {
-				warn "Found FORCE INDEX string at line $. of $file\n";
-			}
-			if (/REPLACE INTO/ and $file !~ /Database/) {
-				warn "Found REPLACE INTO string at line $. of $file\n";
-			}
-			if (/\bIF\s*\(/ and $file !~ /Database.php/) {
-				warn "Found IF string at line $. of $file\n";
-			}
-			if (/\bCONCAT\b/ and $file !~ /Database.php/) {
-				warn "Found CONCAT string at line $. of $file\n";
-			}
-		}
-		close $fh or die qq{Could not close "$file": $!\n};
+		find_problems("$dir/$file");
 	}
 	rewinddir $dh;
 	for my $subdir (grep { -d "$dir/$_" and ! /\./ } readdir $dh) {
-		print "Entering directory $subdir\n";
-		opendir my $dh, "$dir/$subdir" or die qq{Could not opendir "$dir/$subdir": $!\n};
-		scan_dir("$dir/$subdir" => $dh);
-		closedir $dh;
+		scan_dir("$dir/$subdir");
 	}
-	closedir $dh or die qq{Closedir failed?!\n};
-
+	closedir $dh or die qq{Closedir failed: $!\n};
 	return;
 
-} ## end of check_includes_dir
-
-sub scan_dir {
+} ## end of scan_dir
 
-	my ($dir, $dh) = @_;
+sub find_problems {
 
-	for my $file (grep { -f "$dir/$_" and /\.php$/ } readdir $dh) {
-		$file = "$dir/$file";
-		open my $fh, '<', $file or die qq{Could not open "$file": $!\n};
-		while (<$fh>) {
-			if (/FORCE INDEX/ and $file !~ /Database\w*\.php/) {
-				warn "Found FORCE INDEX string at line $. of $file\n";
-			}
-			if (/REPLACE INTO/ and $file !~ /Database\w*\.php/) {
-				warn "Found REPLACE INTO string at line $. of $file\n";
-			}
-			if (/\bIF\s*\(/ and $file !~ /DatabaseMySQL\.php/) {
-				warn "Found IF string at line $. of $file\n";
-			}
-			if (/\bCONCAT\b/ and $file !~ /Database\w*\.php/) {
-				warn "Found CONCAT string at line $. of $file\n";
-			}
+	my $file = shift;
+	open my $fh, '<', $file or die qq{Could not open "$file": $!\n};
+	while (<$fh>) {
+		if (/FORCE INDEX/ and $file !~ /Database\w*\.php/) {
+			warn "Found FORCE INDEX string at line $. of $file\n";
+		}
+		if (/REPLACE INTO/ and $file !~ /Database\w*\.php/) {
+			warn "Found REPLACE INTO string at line $. of $file\n";
+		}
+		if (/\bIF\s*\(/ and $file !~ /DatabaseMySQL\.php/) {
+			warn "Found IF string at line $. of $file\n";
+		}
+		if (/\bCONCAT\b/ and $file !~ /Database\w*\.php/) {
+			warn "Found CONCAT string at line $. of $file\n";
+		}
+		if (/\bGROUP\s+BY\s*\d\b/i and $file !~ /Database\w*\.php/) {
+			warn "Found GROUP BY # at line $. of $file\n";
 		}
-		close $fh or die qq{Could not close "$file": $!\n};
 	}
-
+	close $fh or die qq{Could not close "$file": $!\n};
 	return;
 
-} ## end of scan_dir
+} ## end of find_problems
 
 
 __DATA__
-- 
2.20.1