Index: CHANGELOG.txt
===================================================================
RCS file: /projects/pgadmin3/CHANGELOG.txt,v
retrieving revision 1.171.2.6
retrieving revision 1.171.2.7
diff -LCHANGELOG.txt -LCHANGELOG.txt -u -w -r1.171.2.6 -r1.171.2.7
--- CHANGELOG.txt
+++ CHANGELOG.txt
@@ -17,6 +17,7 @@
+ - 2005-03-25 DP 1.2.1 Correctly identify primary key columns in properties pane.
- 2005-03-18 DP 1.2.1 Set column stats and comments correctly when creating tables.
- 2005-03-18 DP 1.2.1 Include the hostname in the connect string for Kerberos support, per Magnus Hagander
- 2005-03-04 DP 1.2.1 Fix aggregate SQL generation per James Prichard
Index: pgColumn.cpp
===================================================================
RCS file: /projects/pgadmin3/src/schema/pgColumn.cpp,v
retrieving revision 1.38.2.1
retrieving revision 1.38.2.2
diff -Lsrc/schema/pgColumn.cpp -Lsrc/schema/pgColumn.cpp -u -w -r1.38.2.1 -r1.38.2.2
--- src/schema/pgColumn.cpp
+++ src/schema/pgColumn.cpp
@@ -162,7 +162,8 @@
// fk, pk lesen
pgSet *set = ExecuteSet(
wxT("SELECT indkey FROM pg_index\n")
- wxT(" WHERE indrelid=") + GetTableOidStr());
+ wxT(" WHERE indrelid=") + GetTableOidStr() +
+ wxT(" AND indisprimary"));
if (set)
{
wxString indkey, str;