| Index: trunk/phase3/maintenance/postgres/compare_schemas.pl |
| — | — | @@ -72,6 +72,7 @@ |
| 73 | 73 | my ($infunction,$inview,$inrule) = (0,0,0); |
| 74 | 74 | while (<$newfh>) { |
| 75 | 75 | next if /^\s*\-\-/ or /^\s*$/; |
| | 76 | + s/\s*\-\- [\w ']+$//; |
| 76 | 77 | next if /^BEGIN;/ or /^SET / or /^COMMIT;/; |
| 77 | 78 | next if /^CREATE SEQUENCE/; |
| 78 | 79 | next if /^CREATE(?: UNIQUE)? INDEX/; |
| — | — | @@ -79,7 +80,6 @@ |
| 80 | 81 | next if /^CREATE TRIGGER/ or /^ FOR EACH ROW/; |
| 81 | 82 | next if /^INSERT INTO/ or /^ VALUES \(/; |
| 82 | 83 | next if /^ALTER TABLE/; |
| 83 | | - s/\s*\-\- [\w ]+$//; |
| 84 | 84 | chomp; |
| 85 | 85 | |
| 86 | 86 | if (/^\$mw\$;?$/) { |
| — | — | @@ -118,9 +118,11 @@ |
| 119 | 119 | ## Read in known exceptions |
| 120 | 120 | my %ok; |
| 121 | 121 | while (<DATA>) { |
| 122 | | - next unless /^(\w+)\s*:\s*(\S+)/; |
| | 122 | + next unless /^(\w+)\s*:\s*([^#]+)/; |
| 123 | 123 | my ($name,$val) = ($1,$2); |
| 124 | | - $ok{$name}{$val}=1; |
| | 124 | + for (split(/\s+/ => $val)) { |
| | 125 | + $ok{$name}{$_}=1; |
| | 126 | + } |
| 125 | 127 | } |
| 126 | 128 | |
| 127 | 129 | ## Old but not new |
| — | — | @@ -157,5 +159,7 @@ |
| 158 | 160 | ## Known exceptions |
| 159 | 161 | OLD: searchindex ## We use tsearch2 directly on the page table instead |
| 160 | 162 | OLD: archive ## This is a view due to the char(14) timestamp hack |
| | 163 | +OLD: user text ## Reserved words, so we use something else |
| | 164 | +NEW: mwuser pagecontent ## This is what we use |
| 161 | 165 | NEW: archive2 ## The real archive table |
| 162 | 166 | NEW: mediawiki_version ## Just us, for now |