New fix, still some need to be done

Author: Ailurupoda

python/plugins/db_manager/db_plugins/connector.py

@@ -232,9 +232,4 @@ def getSqlDictionary(self):
             return []
 
     def getQueryBuilderDictionary(self):
-        return {}
-
-    def setField(self, fld, tablename=None, db=None):
-        if fld is None:
-            return
-        return fld.name, fld.dataType, str(fld.modifier), fld.notNull, fld.default, None
+        return {}

python/plugins/db_manager/db_plugins/gpkg/connector.py

@@ -620,6 +620,14 @@ def runVacuum(self):
         """ run vacuum on the db """
         self._execute_and_commit("VACUUM")
 
+    def commentTable(self, schema, tablename, comment):
+        """Comment the table"""
+        return ''
+
+    def getComment(self, tab, field, db):
+        """Returns the comment for a field"""
+        return ''
+
     def addTableColumn(self, table, field_def):
         """ add a column to table """
 

python/plugins/db_manager/db_plugins/gpkg/plugin.py

@@ -177,8 +177,8 @@ def toSqlLayer(self, sql, geomCol, uniqueCol, layerName="QueryLayer", layerType=
         vl.setSubsetString(sql)
         return vl
 
-    def searchClass(self):
-        return "GPKGDatabase"
+    def supportsComment(self):
+        return False
 
 
 class GPKGTable(Table):

python/plugins/db_manager/db_plugins/oracle/connector.py

@@ -475,16 +475,16 @@ def updateCache(self, tableList, schema=None):
 
     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:
@@ -1306,6 +1306,14 @@ def renameSchema(self, schema, new_schema):
         """Rename a schema in the database."""
         # Unsupported in Oracle
         pass
+        
+    def commentTable(self, schema, tablename, comment):
+        """Comment the table"""
+        return ''
+
+    def getComment(self, tab, field, db):
+        """Returns the comment for a field"""
+        return ''
 
     def addTableColumn(self, table, field_def):
         """Add a column to a table."""

python/plugins/db_manager/db_plugins/oracle/plugin.py

@@ -91,7 +91,8 @@ def connect(self, parent=None):
         uri = QgsDataSourceUri()
 
         settingsList = ["host", "port", "database", "username", "password"]
-        host, port, database, username, password = [settings.value(x, "", type=str) for x in settingsList]
+        host, port, database, username, password = [
+            settings.value(x, "", type=str) for x in settingsList]
 
         # get all of the connexion options
 
@@ -202,7 +203,8 @@ def toSqlLayer(self, sql, geomCol, uniqueCol,
         uri = self.uri()
         con = self.database().connector
 
-        uri.setDataSource(u"", u"({}\n)".format(sql), geomCol, filter, uniqueCol.strip(u'"'))
+        uri.setDataSource(u"", u"({}\n)".format(
+            sql), geomCol, filter, uniqueCol.strip(u'"'))
         if avoidSelectById:
             uri.disableSelectAtId(True)
         provider = self.dbplugin().providerName()
@@ -261,8 +263,8 @@ def registerDatabaseActions(self, mainWindow):
         mainWindow.registerAction(action, QApplication.translate(
             "DBManagerPlugin", "&Table"), self.emptyTableActionSlot)
 
-    def searchClass(self):
-        return "ORDatabase"
+    def supportsComment(self):
+        return False
 
 
 class ORSchema(Schema):
@@ -525,7 +527,7 @@ def __init__(self, row, table):
     def type2String(self):
         if (u"TIMESTAMP" in self.dataType or
             self.dataType in [u"DATE", u"SDO_GEOMETRY",
-                              u"BINARY_FLOAT", u"BINARY_DOUBLE"]):
+                                u"BINARY_FLOAT", u"BINARY_DOUBLE"]):
             return u"{}".format(self.dataType)
         if self.charMaxLen in [None, -1]:
             return u"{}".format(self.dataType)

python/plugins/db_manager/db_plugins/plugin.py

@@ -1096,6 +1096,7 @@ def definition(self):
         return txt
 
     def getComment(self):
+        """Returns the comment for a field"""
         return ''
 
     def delete(self):

python/plugins/db_manager/db_plugins/postgis/connector.py

@@ -193,6 +193,7 @@ def getInfo(self):
         self._close_cursor(c)
         return res
 
+
     def getSpatialInfo(self):
         """ returns tuple about PostGIS support:
                 - lib version
@@ -511,25 +512,6 @@ def getTableFields(self, table):
         self._close_cursor(c)
         return res
 
-    def setField(self, fld, tablename, db):
-        if fld is None:
-            return
-        print (tablename)
-        # 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" % (tablename, fld.name)
-        # 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" % (tablename, fld.name)
-        c = db.connector._execute(None, sql_cpt) # Execute check query
-        res = 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 = db.connector._execute(None, sql) # Execute query returning the comment value
-            res2 = db.connector._fetchone(c)[0] # Fetch the comment value
-            db.connector._close_cursor(c) # Close cursor
-        else :
-            res2 = None
-        return fld.name, fld.dataType, str(fld.modifier), fld.notNull, fld.default, res2
-
     def getTableIndexes(self, table):
         """ get info about table's indexes. ignore primary key constraint index, they get listed in constraints """
         schema, tablename = self.getSchemaTableName(table)
@@ -761,6 +743,27 @@ def renameTable(self, table, new_table):
 
         self._commit()
 
+    def commentTable(self, schema, tablename, comment):
+        self.db.connector._execute(None, 'COMMENT ON TABLE "{0}"."{1}" IS E\'{2}\''.format(schema, tablename, comment))
+
+    def getComment(self, tab, field, db):
+        """Returns the comment for a field"""
+        # 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, field)
+        # 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, field)
+        c = db.connector._execute(None, sql_cpt) # Execute Check query
+        res = db.connector._fetchone(c)[0] # Store result
+        print(tab, field, sql_cpt, sql)
+        if res == 1:
+            # When a comment exists
+            c = db.connector._execute(None, sql) # Execute query
+            res = db.connector._fetchone(c)[0] # Store result
+            db.connector._close_cursor(c) # Close cursor
+            return res # Return comment
+        else:
+            return ''
+
     def moveTableToSchema(self, table, new_schema):
         schema, tablename = self.getSchemaTableName(table)
         if new_schema == schema:

python/plugins/db_manager/db_plugins/postgis/plugin.py

@@ -181,8 +181,8 @@ def runRefreshMaterializedViewSlot(self, item, action, parent):
     def hasLowercaseFieldNamesOption(self):
         return True
 
-    def searchClass(self):
-        return "PGDatabase"
+    def supportsComment(self):
+        return True
 
 
 class PGSchema(Schema):
@@ -399,7 +399,7 @@ def __init__(self, row, table):
             if con.type == TableConstraint.TypePrimaryKey and self.num in con.columns:
                 self.primaryKey = True
                 break
-            
+                
     def getComment(self):
         """Returns the comment for a field"""
         tab = self.table()
@@ -419,6 +419,7 @@ def getComment(self):
             return ''
 
 
+
 class PGTableConstraint(TableConstraint):
 
     def __init__(self, row, table):

python/plugins/db_manager/db_plugins/spatialite/connector.py

@@ -465,6 +465,8 @@ def deleteTable(self, table):
         self._execute(c, sql)
         self._commit()
 
+        return True
+
     def emptyTable(self, table):
         """ delete all rows from table """
         if self.isRasterTable(table):
@@ -494,6 +496,7 @@ def renameTable(self, table, new_table):
             self._execute(c, sql)
 
         self._commit()
+        return True
 
     def moveTable(self, table, new_table, new_schema=None):
         return self.renameTable(table, new_table)
@@ -568,10 +571,28 @@ def runVacuum(self):
         c.execute('VACUUM')
         self.connection.isolation_level = '' # reset to default isolation
 
+    def commentTable(self, schema, tablename, comment):
+        """Comment the table"""
+        return ''
+
+    def getComment(self, tab, field, db):
+        """Returns the comment for a field"""
+        return ''
+
     def addTableColumn(self, table, field_def):
         """ add a column to table """
         sql = u"ALTER TABLE %s ADD %s" % (self.quoteId(table), field_def)
         self._execute_and_commit(sql)
+        self._execute(None, sql)
+
+        sql = u"SELECT InvalidateLayerStatistics(%s)" % (self.quoteId(table))
+        self._execute(None, sql)
+
+        sql = u"SELECT UpdateLayerStatistics(%s)" % (self.quoteId(table))
+        self._execute(None, sql)
+
+        self._commit()
+        return True
 
     def deleteTableColumn(self, table, column):
         """ delete column from a table """

python/plugins/db_manager/db_plugins/spatialite/plugin.py

@@ -175,8 +175,8 @@ def explicitSpatialIndex(self):
     def spatialIndexClause(self, src_table, src_column, dest_table, dest_column):
         return u""" "%s".ROWID IN (\nSELECT ROWID FROM SpatialIndex WHERE f_table_name='%s' AND search_frame="%s"."%s") """ % (src_table, src_table, dest_table, dest_column)
 
-    def searchClass(self):
-        return "SLDatabase"
+    def supportsComment(self):
+        return False
 
 
 class SLTable(Table):