more correct describe for combined primary keys

H.Merijn Brand - Tux · H.Merijn Brand - Tux · commit 70715050cf9b · 2017-09-06T19:32:56.000+02:00
diff --git a/examples/describe.pl b/examples/describe.pl
@@ -98,14 +98,13 @@ sub usage {
 		$c->{TYPE}, $dd->{TYPE}[$c->{TYPE}], $cl;
 	    }
 	else {
-	    $c->{PKEY} and @key = ();
 	    printf "  %-23s %-20s%s\t%s%s\n", $cn,
 		$dd->{TYPE}[$c->{TYPE}], $cl,
-		$c->{NULLABLE} ? "" : " NOT NULL",
-		$c->{PKEY}     ? " PRIMARY KEY" : "";
+		$c->{NULLABLE}         ? "" : " NOT NULL",
+		@key < 2 && $c->{PKEY} ? " PRIMARY KEY" : "";
 	    $L and printf "%12s %s\n", "-->", $L;
 	    }
 	}
-    @key && !$opt_c and print "  PRIMARY KEY (",
+    @key >= 2 && !$opt_c and print "  PRIMARY KEY (",
 	join (", " => map { $dd->{COLUMN}[$_]{NAME} } @key), ")\n";
     }

Original file line number	Diff line number	Diff line change
`@@ -98,14 +98,13 @@ sub usage {`
`98`	`98`	`$c->{TYPE}, $dd->{TYPE}[$c->{TYPE}], $cl;`
`99`	`99`	`}`
`100`	`100`	`else {`
`101`		`- $c->{PKEY} and @key = ();`
`102`	`101`	`printf " %-23s %-20s%s\t%s%s\n", $cn,`
`103`	`102`	`$dd->{TYPE}[$c->{TYPE}], $cl,`
`104`		`- $c->{NULLABLE} ? "" : " NOT NULL",`
`105`		`- $c->{PKEY} ? " PRIMARY KEY" : "";`
	`103`	`+ $c->{NULLABLE} ? "" : " NOT NULL",`
	`104`	`+ @key < 2 && $c->{PKEY} ? " PRIMARY KEY" : "";`
`106`	`105`	`$L and printf "%12s %s\n", "-->", $L;`
`107`	`106`	`}`
`108`	`107`	`}`
`109`		`- @key && !$opt_c and print " PRIMARY KEY (",`
	`108`	`+ @key >= 2 && !$opt_c and print " PRIMARY KEY (",`
`110`	`109`	`join (", " => map { $dd->{COLUMN}[$_]{NAME} } @key), ")\n";`
`111`	`110`	`}`