From c8fb6d7ef330eedfbe698b0905ae2ed3586f4ae5 Mon Sep 17 00:00:00 2001 From: Greg Sabino Mullane Date: Tue, 19 May 2009 20:54:52 +0000 Subject: [PATCH] Handle multi-col primary keys, cleanup new tables. --- maintenance/postgres/compare_schemas.pl | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/maintenance/postgres/compare_schemas.pl b/maintenance/postgres/compare_schemas.pl index 850244ba34..0a025bdcb4 100644 --- a/maintenance/postgres/compare_schemas.pl +++ b/maintenance/postgres/compare_schemas.pl @@ -129,6 +129,8 @@ sub parse_sql { } elsif (m{^CREATE (?:UNIQUE )?(?:FULLTEXT )?INDEX /\*i\*/(\w+) ON /\*_\*/(\w+) \((.+?)\);}) { } + elsif (m{^\s*PRIMARY KEY \([\w,]+\)}) { + } else { die "Cannot parse line $. of $oldfile:\n$_\n"; } @@ -258,6 +260,9 @@ while (<$newfh>) { } $lastcomma = $3 ? 1 : 0; } + elsif (m{^\s*PRIMARY KEY \([\w,]+\)}) { + $lastcomma = 0; + } else { die "Cannot parse line $. of $new:\n$_\n"; } @@ -324,6 +329,7 @@ keyname varbinary(255) TEXT # No tablename prefix (objectcache) ll_lang varbinary(20) TEXT # Language code log_params blob TEXT # LF separated list of args log_type varbinary(10) TEXT +ls_field varbinary(32) TEXT oi_minor_mime varbinary(32) TEXT oi_sha1 varbinary(32) TEXT old_flags tinyblob TEXT @@ -343,6 +349,8 @@ rc_params blob TEXT rlc_to_blob blob TEXT ts_tags blob TEXT ug_group varbinary(16) TEXT +up_property varbinary(32) TEXT +up_value blob TEXT user_email_token binary(32) TEXT user_ip varbinary(40) TEXT user_newpassword tinyblob TEXT -- 2.20.1