Try to repack all tables with pkey, not only the ones with ckey

dvarrazzo · dvarrazzo · commit 3d0b02c654e8 · 2013-04-17T18:56:50.000+01:00
This is consistent with --no-order not been required anymore.
diff --git a/bin/expected/repack.out b/bin/expected/repack.out
@@ -114,15 +114,20 @@ SELECT * FROM tbl_with_dropped_toast;
 --
 -- do repack
 --
+\! pg_repack --dbname=contrib_regression --table=tbl_cluster
+INFO: repacking table "tbl_cluster"
 \! pg_repack --dbname=contrib_regression --table=tbl_badindex
 INFO: repacking table "tbl_badindex"
 WARNING: skipping invalid index: CREATE UNIQUE INDEX idx_badindex_n ON tbl_badindex USING btree (n)
 \! pg_repack --dbname=contrib_regression
 INFO: repacking table "tbl_cluster"
+INFO: repacking table "tbl_only_pkey"
+INFO: repacking table "tbl_gistkey"
 INFO: repacking table "tbl_with_dropped_column"
 INFO: repacking table "tbl_with_dropped_toast"
-\! pg_repack --dbname=contrib_regression --table=tbl_cluster
-INFO: repacking table "tbl_cluster"
+INFO: repacking table "tbl_badindex"
+WARNING: skipping invalid index: CREATE UNIQUE INDEX idx_badindex_n ON tbl_badindex USING btree (n)
+INFO: repacking table "tbl_idxopts"
 --
 -- after
 --
diff --git a/bin/pg_repack.c b/bin/pg_repack.c
@@ -521,8 +521,6 @@ repack_one_database(const char *orderby, char *errbuf, size_t errsize)
 	else
 	{
 		appendStringInfoString(&sql, "pkid IS NOT NULL");
-		if (!orderby)
-			appendStringInfoString(&sql, " AND ckid IS NOT NULL");
 	}
 
 	/* double check the parameters array is sane */
diff --git a/bin/sql/repack.sql b/bin/sql/repack.sql
@@ -120,9 +120,9 @@ SELECT * FROM tbl_with_dropped_toast;
 -- do repack
 --
 
+\! pg_repack --dbname=contrib_regression --table=tbl_cluster
 \! pg_repack --dbname=contrib_regression --table=tbl_badindex
 \! pg_repack --dbname=contrib_regression
-\! pg_repack --dbname=contrib_regression --table=tbl_cluster
 
 --
 -- after

Original file line number	Diff line number	Diff line change
`@@ -521,8 +521,6 @@ repack_one_database(const char orderby, char errbuf, size_t errsize)`
`521`	`521`	`else`
`522`	`522`	`{`
`523`	`523`	`appendStringInfoString(&sql, "pkid IS NOT NULL");`
`524`		`- if (!orderby)`
`525`		`- appendStringInfoString(&sql, " AND ckid IS NOT NULL");`
`526`	`524`	`}`
`527`	`525`
`528`	`526`	`/* double check the parameters array is sane */`