mirror of
https://github.com/qgis/QGIS.git
synced 2025-04-15 00:04:00 -04:00
Merge pull request #8831 from SIRS-CLS/sirs_db_manager
Add comment option on db_manager plugin postgis fields
This commit is contained in:
Matthias Kuhn
GitHub
commit
daa05e538f
@ -259,7 +259,7 @@ class SimpleTableModel(QStandardItemModel):
|
||||
class TableFieldsModel(SimpleTableModel):
|
||||
|
||||
def __init__(self, parent, editable=False):
|
||||
SimpleTableModel.__init__(self, ['Name', 'Type', 'Null', 'Default'], editable, parent)
|
||||
SimpleTableModel.__init__(self, ['Name', 'Type', 'Null', 'Default', 'Comment'], editable, parent)
|
||||
|
||||
def headerData(self, section, orientation, role):
|
||||
if orientation == Qt.Vertical and role == Qt.DisplayRole:
|
||||
@ -273,7 +273,7 @@ class TableFieldsModel(SimpleTableModel):
|
||||
return flags
|
||||
|
||||
def append(self, fld):
|
||||
data = [fld.name, fld.type2String(), not fld.notNull, fld.default2String()]
|
||||
data = [fld.name, fld.type2String(), not fld.notNull, fld.default2String(), fld.getComment()]
|
||||
self.appendRow(self.rowFromData(data))
|
||||
row = self.rowCount() - 1
|
||||
self.setData(self.index(row, 0), fld, Qt.UserRole)
|
||||
@ -290,7 +290,6 @@ class TableFieldsModel(SimpleTableModel):
|
||||
val = self.data(self.index(row, 0), Qt.UserRole)
|
||||
fld = val if val is not None else self._getNewObject()
|
||||
fld.name = self.data(self.index(row, 0)) or ""
|
||||
|
||||
typestr = self.data(self.index(row, 1)) or ""
|
||||
regex = QRegExp("([^\\(]+)\\(([^\\)]+)\\)")
|
||||
startpos = regex.indexIn(typestr)
|
||||
@ -303,6 +302,7 @@ class TableFieldsModel(SimpleTableModel):
|
||||
|
||||
fld.notNull = self.data(self.index(row, 2), Qt.CheckStateRole) == Qt.Unchecked
|
||||
fld.primaryKey = self.data(self.index(row, 1), Qt.UserRole)
|
||||
fld.comment = self.data(self.index(row, 4), Qt.UserRole)
|
||||
return fld
|
||||
|
||||
def getFields(self):
|
||||
|
||||
@ -644,7 +644,7 @@ class GPKGDBConnector(DBConnector):
|
||||
return lyr.DeleteField(idx) == 0
|
||||
return False
|
||||
|
||||
def updateTableColumn(self, table, column, new_name, new_data_type=None, new_not_null=None, new_default=None):
|
||||
def updateTableColumn(self, table, column, new_name, new_data_type=None, new_not_null=None, new_default=None, new_comment=None):
|
||||
if self.isGeometryColumn(table, column):
|
||||
return False
|
||||
|
||||
|
||||
@ -475,16 +475,16 @@ class OracleDBConnector(DBConnector):
|
||||
|
||||
def singleGeomTypes(self, geomtypes, srids):
|
||||
"""Intelligent wkbtype grouping (multi with non multi)"""
|
||||
if (QgsWkbTypes.Polygon in geomtypes and
|
||||
QgsWkbTypes.MultiPolygon in geomtypes):
|
||||
if (QgsWkbTypes.Polygon in geomtypes
|
||||
and QgsWkbTypes.MultiPolygon in geomtypes):
|
||||
srids.pop(geomtypes.index(QgsWkbTypes.Polygon))
|
||||
geomtypes.pop(geomtypes.index(QgsWkbTypes.Polygon))
|
||||
if (QgsWkbTypes.Point in geomtypes and
|
||||
QgsWkbTypes.MultiPoint in geomtypes):
|
||||
if (QgsWkbTypes.Point in geomtypes
|
||||
and QgsWkbTypes.MultiPoint in geomtypes):
|
||||
srids.pop(geomtypes.index(QgsWkbTypes.Point))
|
||||
geomtypes.pop(geomtypes.index(QgsWkbTypes.Point))
|
||||
if (QgsWkbTypes.LineString in geomtypes and
|
||||
QgsWkbTypes.MultiLineString in geomtypes):
|
||||
if (QgsWkbTypes.LineString in geomtypes
|
||||
and QgsWkbTypes.MultiLineString in geomtypes):
|
||||
srids.pop(geomtypes.index(QgsWkbTypes.LineString))
|
||||
geomtypes.pop(geomtypes.index(QgsWkbTypes.LineString))
|
||||
if QgsWkbTypes.Unknown in geomtypes and len(geomtypes) > 1:
|
||||
@ -1336,7 +1336,7 @@ class OracleDBConnector(DBConnector):
|
||||
|
||||
def updateTableColumn(self, table, column, new_name=None,
|
||||
data_type=None, not_null=None,
|
||||
default=None):
|
||||
default=None, comment=None):
|
||||
"""Update properties of a column in a table."""
|
||||
|
||||
schema, tablename = self.getSchemaTableName(table)
|
||||
|
||||
@ -1095,13 +1095,31 @@ class TableField(TableSubItemObject):
|
||||
txt += u" DEFAULT %s" % self.default2String()
|
||||
return txt
|
||||
|
||||
def getComment(self):
|
||||
"""Returns the comment for a field"""
|
||||
tab = self.table()
|
||||
# SQL Query checking if a comment exists for the field
|
||||
sql_cpt = "Select count(*) from pg_description pd, pg_class pc, pg_attribute pa where relname = '%s' and attname = '%s' and pa.attrelid = pc.oid and pd.objoid = pc.oid and pd.objsubid = pa.attnum" % (tab.name, self.name)
|
||||
# SQL Query that return the comment of the field
|
||||
sql = "Select pd.description from pg_description pd, pg_class pc, pg_attribute pa where relname = '%s' and attname = '%s' and pa.attrelid = pc.oid and pd.objoid = pc.oid and pd.objsubid = pa.attnum" % (tab.name, self.name)
|
||||
c = tab.database().connector._execute(None, sql_cpt) # Execute Check query
|
||||
res = tab.database().connector._fetchone(c)[0] # Store result
|
||||
if res == 1:
|
||||
# When a comment exists
|
||||
c = tab.database().connector._execute(None, sql) # Execute query
|
||||
res = tab.database().connector._fetchone(c)[0] # Store result
|
||||
tab.database().connector._close_cursor(c) # Close cursor
|
||||
return res # Return comment
|
||||
else:
|
||||
return ''
|
||||
|
||||
def delete(self):
|
||||
return self.table().deleteField(self)
|
||||
|
||||
def rename(self, new_name):
|
||||
return self.update(new_name)
|
||||
|
||||
def update(self, new_name, new_type_str=None, new_not_null=None, new_default_str=None):
|
||||
def update(self, new_name, new_type_str=None, new_not_null=None, new_default_str=None, new_comment=None):
|
||||
self.table().aboutToChange.emit()
|
||||
if self.name == new_name:
|
||||
new_name = None
|
||||
@ -1111,10 +1129,12 @@ class TableField(TableSubItemObject):
|
||||
new_not_null = None
|
||||
if self.default2String() == new_default_str:
|
||||
new_default_str = None
|
||||
|
||||
if self.comment == new_comment:
|
||||
# Update also a new_comment
|
||||
new_comment = None
|
||||
ret = self.table().database().connector.updateTableColumn((self.table().schemaName(), self.table().name),
|
||||
self.name, new_name, new_type_str, new_not_null,
|
||||
new_default_str)
|
||||
self.name, new_name, new_type_str,
|
||||
new_not_null, new_default_str, new_comment)
|
||||
if ret is not False:
|
||||
self.table().refreshFields()
|
||||
return ret
|
||||
|
||||
@ -857,8 +857,8 @@ class PostGisDBConnector(DBConnector):
|
||||
sql = u"ALTER TABLE %s DROP %s" % (self.quoteId(table), self.quoteId(column))
|
||||
self._execute_and_commit(sql)
|
||||
|
||||
def updateTableColumn(self, table, column, new_name=None, data_type=None, not_null=None, default=None):
|
||||
if new_name is None and data_type is None and not_null is None and default is None:
|
||||
def updateTableColumn(self, table, column, new_name=None, data_type=None, not_null=None, default=None, comment=None):
|
||||
if new_name is None and data_type is None and not_null is None and default is None and comment is None:
|
||||
return
|
||||
|
||||
c = self._get_cursor()
|
||||
@ -895,6 +895,12 @@ class PostGisDBConnector(DBConnector):
|
||||
self.quoteString(new_name), schema_where, self.quoteString(tablename), self.quoteString(column))
|
||||
self._execute(c, sql)
|
||||
|
||||
# comment the column
|
||||
if comment is not None:
|
||||
schema, tablename = self.getSchemaTableName(table)
|
||||
sql = u"COMMENT ON COLUMN %s.%s.%s is '%s'" % (schema, tablename, column, comment)
|
||||
self._execute(c, sql)
|
||||
|
||||
self._commit()
|
||||
|
||||
def renameTableColumn(self, table, column, new_name):
|
||||
|
||||
@ -110,8 +110,8 @@ class PGTableInfo(TableInfo):
|
||||
if not self.table.isView:
|
||||
if self.table.rowCount is not None:
|
||||
if abs(self.table.estimatedRowCount - self.table.rowCount) > 1 and \
|
||||
(self.table.estimatedRowCount > 2 * self.table.rowCount or
|
||||
self.table.rowCount > 2 * self.table.estimatedRowCount):
|
||||
(self.table.estimatedRowCount > 2 * self.table.rowCount
|
||||
or self.table.rowCount > 2 * self.table.estimatedRowCount):
|
||||
ret.append(HtmlParagraph(QApplication.translate("DBManagerPlugin",
|
||||
"<warning> There's a significant difference between estimated and real row count. "
|
||||
'Consider running <a href="action:vacuumanalyze/run">VACUUM ANALYZE</a>.')))
|
||||
@ -162,7 +162,7 @@ class PGTableInfo(TableInfo):
|
||||
header = (
|
||||
"#", QApplication.translate("DBManagerPlugin", "Name"), QApplication.translate("DBManagerPlugin", "Type"),
|
||||
QApplication.translate("DBManagerPlugin", "Length"), QApplication.translate("DBManagerPlugin", "Null"),
|
||||
QApplication.translate("DBManagerPlugin", "Default"))
|
||||
QApplication.translate("DBManagerPlugin", "Default"), QApplication.translate("DBManagerPlugin", "Comment"))
|
||||
tbl.append(HtmlTableHeader(header))
|
||||
|
||||
# add table contents
|
||||
@ -174,7 +174,7 @@ class PGTableInfo(TableInfo):
|
||||
attrs = {"class": "underline"} if fld.primaryKey else None
|
||||
name = HtmlTableCol(fld.name, attrs)
|
||||
|
||||
tbl.append((fld.num, name, fld.type2String(), char_max_len, is_null_txt, fld.default2String()))
|
||||
tbl.append((fld.num, name, fld.type2String(), char_max_len, is_null_txt, fld.default2String(), fld.getComment()))
|
||||
|
||||
return HtmlTable(tbl, {"class": "header"})
|
||||
|
||||
|
||||
@ -595,9 +595,7 @@ class SpatiaLiteDBConnector(DBConnector):
|
||||
sql = u"SELECT DiscardGeometryColumn(%s, %s)" % (self.quoteString(tablename), self.quoteString(column))
|
||||
self._execute_and_commit(sql)
|
||||
|
||||
return True
|
||||
|
||||
def updateTableColumn(self, table, column, new_name, new_data_type=None, new_not_null=None, new_default=None):
|
||||
def updateTableColumn(self, table, column, new_name, new_data_type=None, new_not_null=None, new_default=None, new_comment=None):
|
||||
return False # column editing not supported
|
||||
|
||||
def renameTableColumn(self, table, column, new_name):
|
||||
|
||||
@ -349,7 +349,7 @@ class VLayerConnector(DBConnector):
|
||||
def deleteTableColumn(self, table, column):
|
||||
print("**unimplemented** deleteTableColumn")
|
||||
|
||||
def updateTableColumn(self, table, column, new_name, new_data_type=None, new_not_null=None, new_default=None):
|
||||
def updateTableColumn(self, table, column, new_name, new_data_type=None, new_not_null=None, new_default=None, new_comment=None):
|
||||
print("**unimplemented** updateTableColumn")
|
||||
|
||||
def renameTableColumn(self, table, column, new_name):
|
||||
|
||||
@ -56,6 +56,18 @@ class DlgFieldProperties(QDialog, Ui_Dialog):
|
||||
self.chkNull.setChecked(not fld.notNull)
|
||||
if fld.hasDefault:
|
||||
self.editDefault.setText(fld.default)
|
||||
# Check with SQL query if a comment exists for the field
|
||||
sql_cpt = "Select count(*) from pg_description pd, pg_class pc, pg_attribute pa where relname = '%s' and attname = '%s' and pa.attrelid = pc.oid and pd.objoid = pc.oid and pd.objsubid = pa.attnum" % (self.table.name, self.editName.text())
|
||||
# Get the comment for the field with SQL Query
|
||||
sql = "Select pd.description from pg_description pd, pg_class pc, pg_attribute pa where relname = '%s' and attname = '%s' and pa.attrelid = pc.oid and pd.objoid = pc.oid and pd.objsubid = pa.attnum" % (self.table.name, self.editName.text())
|
||||
c = self.db.connector._execute(None, sql_cpt) # Execute check query
|
||||
res = self.db.connector._fetchone(c)[0] # Fetch data
|
||||
# Check if result is 1 then it's ok, else we don't want to get a value
|
||||
if res == 1:
|
||||
c = self.db.connector._execute(None, sql) # Execute query returning the comment value
|
||||
res = self.db.connector._fetchone(c)[0] # Fetch the comment value
|
||||
self.db.connector._close_cursor(c) # Close cursor
|
||||
self.editCom.setText(res) # Set comment value
|
||||
|
||||
def getField(self, newCopy=False):
|
||||
fld = TableField(self.table) if not self.fld or newCopy else self.fld
|
||||
@ -64,6 +76,8 @@ class DlgFieldProperties(QDialog, Ui_Dialog):
|
||||
fld.notNull = not self.chkNull.isChecked()
|
||||
fld.default = self.editDefault.text()
|
||||
fld.hasDefault = fld.default != ""
|
||||
# Get the comment from the LineEdit
|
||||
fld.comment = self.editCom.text()
|
||||
try:
|
||||
modifier = int(self.editLength.text())
|
||||
except ValueError:
|
||||
|
||||
@ -162,7 +162,7 @@ class DlgTableProperties(QDialog, Ui_Dialog):
|
||||
with OverrideCursor(Qt.WaitCursor):
|
||||
self.aboutToChangeTable.emit()
|
||||
try:
|
||||
fld.update(new_fld.name, new_fld.type2String(), new_fld.notNull, new_fld.default2String())
|
||||
fld.update(new_fld.name, new_fld.type2String(), new_fld.notNull, new_fld.default2String(), new_fld.comment)
|
||||
self.refresh()
|
||||
except BaseError as e:
|
||||
DlgDbError.showError(e, self)
|
||||
|
||||
79
python/plugins/db_manager/ui/DlgFieldProperties.ui
Normal file → Executable file
79
python/plugins/db_manager/ui/DlgFieldProperties.ui
Normal file → Executable file
@ -16,37 +16,6 @@
|
||||
<layout class="QVBoxLayout">
|
||||
<item>
|
||||
<layout class="QGridLayout">
|
||||
<item row="0" column="0">
|
||||
<widget class="QLabel" name="label">
|
||||
<property name="text">
|
||||
<string>Name</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="1">
|
||||
<widget class="QLineEdit" name="editName">
|
||||
<property name="text">
|
||||
<string notr="true"/>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="0">
|
||||
<widget class="QLabel" name="label_2">
|
||||
<property name="text">
|
||||
<string>Type</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="1">
|
||||
<widget class="QComboBox" name="cboType">
|
||||
<property name="editable">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="insertPolicy">
|
||||
<enum>QComboBox::NoInsert</enum>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="0">
|
||||
<widget class="QLabel" name="label_3">
|
||||
<property name="text">
|
||||
@ -71,6 +40,37 @@
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="0">
|
||||
<widget class="QLabel" name="label">
|
||||
<property name="text">
|
||||
<string>Name</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="1">
|
||||
<widget class="QComboBox" name="cboType">
|
||||
<property name="editable">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="insertPolicy">
|
||||
<enum>QComboBox::NoInsert</enum>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="0">
|
||||
<widget class="QLabel" name="label_2">
|
||||
<property name="text">
|
||||
<string>Type</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="1">
|
||||
<widget class="QLineEdit" name="editName">
|
||||
<property name="text">
|
||||
<string notr="true"/>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="4" column="1">
|
||||
<widget class="QLineEdit" name="editDefault">
|
||||
<property name="toolTip">
|
||||
@ -95,6 +95,23 @@
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="6" column="1">
|
||||
<widget class="QLineEdit" name="editCom">
|
||||
<property name="toolTip">
|
||||
<string><html><head/><body><p>Properly quoted PostgreSQL expression (e.g. <code>4</code>, <code>'text'</code> or <code>nextval('foo_id_seq')</code><br/></p></body></html></string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string notr="true"/>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="6" column="0">
|
||||
<widget class="QLabel" name="label_6">
|
||||
<property name="text">
|
||||
<string>Comment</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
|
||||
@ -432,16 +432,17 @@
|
||||
<connection>
|
||||
<sender>chkCom</sender>
|
||||
<signal>toggled(bool)</signal>
|
||||
<receiver>editComment</receiver>
|
||||
<receiver>editCom</receiver>
|
||||
<slot>setEnabled(bool)</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
<x>64</x>
|
||||
<y>549</y>
|
||||
<x>105</x>
|
||||
<y>557</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel">
|
||||
<x>215</x>
|
||||
<y>552</y>
|
||||
<x>211</x>
|
||||
<y>553</y>
|
||||
|
||||
</hint>
|
||||
</hints>
|
||||
</connection>
|
||||
|
||||
@ -6,8 +6,8 @@
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>547</width>
|
||||
<height>435</height>
|
||||
<width>885</width>
|
||||
<height>470</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user