From: Greg Sabino Mullane <greg@endpoint.com>
Date: Thu, 22 Apr 2010 16:54:46 +0000 (-0400)
Subject: Kill tabs
X-Git-Tag: 2.15.1~33
X-Git-Url: http://git.postgresql.org/gitweb/static/gitweb.js?a=commitdiff_plain;h=4058c7458a9bb76058692c2510b2391ffc0b3264;p=check_postgres.git

Kill tabs
---

diff --git a/check_postgres.pl b/check_postgres.pl
index 942a2a9cb..1f5412034 100755
--- a/check_postgres.pl
+++ b/check_postgres.pl
@@ -5757,74 +5757,74 @@ JOIN pg_namespace n ON (n.oid = pronamespace)
         }
         ## Check for a difference in schema/table/column/definition
         elsif ($cdef1 ne $cdef2) {
-			## Constraints are written very differently according to the Postgres version
-			## We'll try to do some normalizing here
-			my %flatten;
-			for my $string ($cdef1, $cdef2) {
-			  FOO: while ($string =~ m{(\w+):?:?(\w[\w ]+)? = ANY \(ARRAY\[(.+?)\]:?:?(\w[\w ]+)?\[?\]?\)}g) {
-					my ($col,$type1,$array,$type2) = ($1,$2,$3,$4);
-					if (! defined $type1 or $type1 eq $type2) {
-						my @item;
-						for my $item (split /\s*,\s*/ => $array) {
-							last FOO if $item !~ m{('?.+?'?)::(\w[\w ]+)};
-							push @item => $1;
-							$type2 ||= $2;
-						}
-						my $t1 = defined $type1 ? ('::'.$type1) : '';
-						my $t2 = defined $type2 ? ('::'.$type2) : '';
-						$flatten{$array} = join ' OR ' => map { "$col$t1 = $_$t2" } @item;
-					}
-				}
-				$string =~ s{(OR \()?(\w+:?:?(?:\w[\w ]+)? = ANY \(ARRAY\[(.+?)\]:?:?(?:\w[\w ]+)?\[?\]?\)(\))?)}
-							{
-								my ($p1,$all,$array,$p2) = ($1,$2,$3,$4);
-								if (exists $flatten{$array}) {
-									if ($p1 and $p2) {
-										"OR $flatten{$array}";
-									}
-									elsif ($p2) {
-										"$flatten{$array})";
-									}
-									else {
-										$flatten{$array};
-									}
-								}
-								else {
-									$all;
-								}
-							}ge;
-
-				## Normalize any casting like int4('foobar'::text)
-				my %dtype = (
-							 'int2' => 'smallint',
-							 'int4' => 'integer',
-							 'int8' => 'bigint',
-							 'text' => 'text',
-							 );
-				my $dtype = join '|' => keys %dtype;
-				$string =~ s{($dtype)\((\w+)::($dtype)\)}{$2::$3::$dtype{$1}}g;
-
-			}
-			if ($cdef1 ne $cdef2) {
-				## It may be because 8.2 and earlier over-quoted things
-				## Just in case, we'll compare sans double quotes
-				(my $cdef11 = $cdef1) =~ s/"//g;
-				(my $cdef22 = $cdef2) =~ s/"//g;
-				if ($cdef11 eq $cdef22) {
-					$VERBOSE >= 1 and warn "Constraint $cname1 on $tname1 matched when quotes were removed\n";
-				}
-				else {
-					push @{$fail{colconstraints}{defdiff}} =>
-						[
-						 $name,
-						 $tname1, $cname1, $cdef1,
-						 $tname2, $cname2, $cdef2,
-						 ];
-					$failcount++;
-				}
-			}
-		}
-	}
+            ## Constraints are written very differently according to the Postgres version
+            ## We'll try to do some normalizing here
+            my %flatten;
+            for my $string ($cdef1, $cdef2) {
+              FOO: while ($string =~ m{(\w+):?:?(\w[\w ]+)? = ANY \(ARRAY\[(.+?)\]:?:?(\w[\w ]+)?\[?\]?\)}g) {
+                    my ($col,$type1,$array,$type2) = ($1,$2,$3,$4);
+                    if (! defined $type1 or $type1 eq $type2) {
+                        my @item;
+                        for my $item (split /\s*,\s*/ => $array) {
+                            last FOO if $item !~ m{('?.+?'?)::(\w[\w ]+)};
+                            push @item => $1;
+                            $type2 ||= $2;
+                        }
+                        my $t1 = defined $type1 ? ('::'.$type1) : '';
+                        my $t2 = defined $type2 ? ('::'.$type2) : '';
+                        $flatten{$array} = join ' OR ' => map { "$col$t1 = $_$t2" } @item;
+                    }
+                }
+                $string =~ s{(OR \()?(\w+:?:?(?:\w[\w ]+)? = ANY \(ARRAY\[(.+?)\]:?:?(?:\w[\w ]+)?\[?\]?\)(\))?)}
+                            {
+                                my ($p1,$all,$array,$p2) = ($1,$2,$3,$4);
+                                if (exists $flatten{$array}) {
+                                    if ($p1 and $p2) {
+                                        "OR $flatten{$array}";
+                                    }
+                                    elsif ($p2) {
+                                        "$flatten{$array})";
+                                    }
+                                    else {
+                                        $flatten{$array};
+                                    }
+                                }
+                                else {
+                                    $all;
+                                }
+                            }ge;
+
+                ## Normalize any casting like int4('foobar'::text)
+                my %dtype = (
+                             'int2' => 'smallint',
+                             'int4' => 'integer',
+                             'int8' => 'bigint',
+                             'text' => 'text',
+                             );
+                my $dtype = join '|' => keys %dtype;
+                $string =~ s{($dtype)\((\w+)::($dtype)\)}{$2::$3::$dtype{$1}}g;
+
+            }
+            if ($cdef1 ne $cdef2) {
+                ## It may be because 8.2 and earlier over-quoted things
+                ## Just in case, we'll compare sans double quotes
+                (my $cdef11 = $cdef1) =~ s/"//g;
+                (my $cdef22 = $cdef2) =~ s/"//g;
+                if ($cdef11 eq $cdef22) {
+                    $VERBOSE >= 1 and warn "Constraint $cname1 on $tname1 matched when quotes were removed\n";
+                }
+                else {
+                    push @{$fail{colconstraints}{defdiff}} =>
+                        [
+                         $name,
+                         $tname1, $cname1, $cdef1,
+                         $tname2, $cname2, $cdef2,
+                         ];
+                    $failcount++;
+                }
+            }
+        }
+    }
 
     ## Compare languages
     for my $name (sort keys %{$thing{1}{language}}) {