@@ -68,6 +68,10 @@ void QgsPgTableModel::addTableEntry( const QgsPostgresLayerProperty& layerProper
68
68
{
69
69
tip = tr ( " Enter a SRID" );
70
70
}
71
+ else if ( layerProperty.pkCols .size () > 0 )
72
+ {
73
+ tip = tr ( " Select a primary key" );
74
+ }
71
75
72
76
QStandardItem *schemaNameItem = new QStandardItem ( layerProperty.schemaName );
73
77
QStandardItem *typeItem = new QStandardItem ( iconForWkbType ( wkbType ), wkbType == QGis::WKBUnknown ? tr ( " Select..." ) : QgsPostgresConn::displayStringForWkbType ( wkbType ) );
@@ -88,20 +92,17 @@ void QgsPgTableModel::addTableEntry( const QgsPostgresLayerProperty& layerProper
88
92
sridItem->setFlags ( sridItem->flags () | Qt::ItemIsEditable );
89
93
}
90
94
91
- QString pkCol = " " ;
95
+ QStandardItem *pkItem = new QStandardItem ( " " ) ;
92
96
if ( layerProperty.pkCols .size () > 0 )
93
97
{
94
- pkCol = layerProperty.pkCols [0 ];
95
- }
96
-
97
- QStandardItem *pkItem = new QStandardItem ( pkCol );
98
- if ( layerProperty.pkCols .size () > 1 )
98
+ pkItem->setText ( tr ( " Select..." ) );
99
99
pkItem->setFlags ( pkItem->flags () | Qt::ItemIsEditable );
100
+ }
100
101
else
101
102
pkItem->setFlags ( pkItem->flags () & ~Qt::ItemIsEditable );
102
103
103
104
pkItem->setData ( layerProperty.pkCols , Qt::UserRole + 1 );
104
- pkItem->setData ( pkCol , Qt::UserRole + 2 );
105
+ pkItem->setData ( " " , Qt::UserRole + 2 );
105
106
106
107
QStandardItem *selItem = new QStandardItem ( " " );
107
108
selItem->setFlags ( selItem->flags () | Qt::ItemIsUserCheckable );
0 commit comments