diff -r e9e7eca7efee -r bf71ee032bb4 src/eric7/SqlBrowser/SqlBrowserWidget.py
--- a/src/eric7/SqlBrowser/SqlBrowserWidget.py Wed Jul 13 11:16:20 2022 +0200
+++ b/src/eric7/SqlBrowser/SqlBrowserWidget.py Wed Jul 13 14:55:47 2022 +0200
@@ -11,7 +11,11 @@
from PyQt6.QtGui import QStandardItemModel
from PyQt6.QtWidgets import QWidget, QDialog, QAbstractItemView
from PyQt6.QtSql import (
- QSqlDatabase, QSqlError, QSqlTableModel, QSqlQueryModel, QSqlQuery
+ QSqlDatabase,
+ QSqlError,
+ QSqlTableModel,
+ QSqlQueryModel,
+ QSqlQuery,
)
from EricWidgets import EricMessageBox
@@ -22,25 +26,26 @@
class SqlBrowserWidget(QWidget, Ui_SqlBrowserWidget):
"""
Class implementing the SQL Browser widget.
-
+
@signal statusMessage(str) emitted to show a status message
"""
+
statusMessage = pyqtSignal(str)
-
+
cCount = 0
-
+
def __init__(self, parent=None):
"""
Constructor
-
+
@param parent reference to the parent widget (QWidget)
"""
super().__init__(parent)
self.setupUi(self)
-
+
self.table.addAction(self.insertRowAction)
self.table.addAction(self.deleteRowAction)
-
+
if len(QSqlDatabase.drivers()) == 0:
EricMessageBox.information(
self,
@@ -48,16 +53,16 @@
self.tr(
"""This tool requires at least one Qt database driver. """
"""Please check the Qt documentation how to build the """
- """Qt SQL plugins."""))
-
- self.connections.tableActivated.connect(
- self.on_connections_tableActivated)
- self.connections.schemaRequested.connect(
- self.on_connections_schemaRequested)
+ """Qt SQL plugins."""
+ ),
+ )
+
+ self.connections.tableActivated.connect(self.on_connections_tableActivated)
+ self.connections.schemaRequested.connect(self.on_connections_schemaRequested)
self.connections.cleared.connect(self.on_connections_cleared)
-
+
self.statusMessage.emit(self.tr("Ready"))
-
+
@pyqtSlot()
def on_clearButton_clicked(self):
"""
@@ -65,7 +70,7 @@
"""
self.sqlEdit.clear()
self.sqlEdit.setFocus()
-
+
@pyqtSlot()
def on_executeButton_clicked(self):
"""
@@ -73,39 +78,39 @@
"""
self.executeQuery()
self.sqlEdit.setFocus()
-
+
@pyqtSlot()
def on_insertRowAction_triggered(self):
"""
Private slot handling the action to insert a new row.
"""
self.__insertRow()
-
+
@pyqtSlot()
def on_deleteRowAction_triggered(self):
"""
Private slot handling the action to delete a row.
"""
self.__deleteRow()
-
+
@pyqtSlot(str)
def on_connections_tableActivated(self, table):
"""
Private slot to show the contents of a table.
-
+
@param table name of the table for which to show the contents (string)
"""
self.showTable(table)
-
+
@pyqtSlot(str)
def on_connections_schemaRequested(self, table):
"""
Private slot to show the schema of a table.
-
+
@param table name of the table for which to show the schema (string)
"""
self.showSchema(table)
-
+
@pyqtSlot()
def on_connections_cleared(self):
"""
@@ -113,15 +118,14 @@
"""
model = QStandardItemModel(self.table)
self.table.setModel(model)
- self.table.setEditTriggers(
- QAbstractItemView.EditTrigger.NoEditTriggers)
-
+ self.table.setEditTriggers(QAbstractItemView.EditTrigger.NoEditTriggers)
+
self.updateActions()
-
+
def addConnection(self, driver, dbName, user, password, host, port):
"""
Public method to add a database connection.
-
+
@param driver name of the Qt database driver (string)
@param dbName name of the database (string)
@param user user name (string)
@@ -131,45 +135,45 @@
@return SQL error object (QSqlError)
"""
err = QSqlError()
-
+
self.__class__.cCount += 1
db = QSqlDatabase.addDatabase(
- driver.upper(), "Browser{0:d}".format(self.__class__.cCount))
+ driver.upper(), "Browser{0:d}".format(self.__class__.cCount)
+ )
db.setDatabaseName(dbName)
db.setHostName(host)
db.setPort(port)
if not db.open(user, password):
err = db.lastError()
db = QSqlDatabase()
- QSqlDatabase.removeDatabase(
- "Browser{0:d}".format(self.__class__.cCount))
-
+ QSqlDatabase.removeDatabase("Browser{0:d}".format(self.__class__.cCount))
+
self.connections.refresh()
-
+
return err
-
+
def addConnectionByDialog(self):
"""
Public slot to add a database connection via an input dialog.
"""
from .SqlConnectionDialog import SqlConnectionDialog
+
dlg = SqlConnectionDialog(self)
if dlg.exec() == QDialog.DialogCode.Accepted:
driver, dbName, user, password, host, port = dlg.getData()
- err = self.addConnection(
- driver, dbName, user, password, host, port)
-
+ err = self.addConnection(driver, dbName, user, password, host, port)
+
if err.type() != QSqlError.ErrorType.NoError:
EricMessageBox.warning(
self,
self.tr("Unable to open database"),
- self.tr(
- """An error occurred while opening the connection."""))
-
+ self.tr("""An error occurred while opening the connection."""),
+ )
+
def showTable(self, table):
"""
Public slot to show the contents of a table.
-
+
@param table name of the table to be shown (string)
"""
model = QSqlTableModel(self.table, self.connections.currentDatabase())
@@ -180,28 +184,28 @@
self.statusMessage.emit(model.lastError().text())
self.table.setModel(model)
self.table.setEditTriggers(
- QAbstractItemView.EditTrigger.DoubleClicked |
- QAbstractItemView.EditTrigger.EditKeyPressed)
-
+ QAbstractItemView.EditTrigger.DoubleClicked
+ | QAbstractItemView.EditTrigger.EditKeyPressed
+ )
+
self.table.resizeColumnsToContents()
-
- self.table.selectionModel().currentRowChanged.connect(
- self.updateActions)
-
+
+ self.table.selectionModel().currentRowChanged.connect(self.updateActions)
+
self.updateActions()
-
+
def showSchema(self, table):
"""
Public slot to show the schema of a table.
-
+
@param table name of the table to be shown (string)
"""
rec = self.connections.currentDatabase().record(table)
model = QStandardItemModel(self.table)
-
+
model.insertRows(0, rec.count())
model.insertColumns(0, 7)
-
+
model.setHeaderData(0, Qt.Orientation.Horizontal, "Fieldname")
model.setHeaderData(1, Qt.Orientation.Horizontal, "Type")
model.setHeaderData(2, Qt.Orientation.Horizontal, "Length")
@@ -209,17 +213,17 @@
model.setHeaderData(4, Qt.Orientation.Horizontal, "Required")
model.setHeaderData(5, Qt.Orientation.Horizontal, "Auto Value")
model.setHeaderData(6, Qt.Orientation.Horizontal, "Default Value")
-
+
for i in range(rec.count()):
fld = rec.field(i)
model.setData(model.index(i, 0), fld.name())
if fld.typeID() == -1:
- model.setData(model.index(i, 1),
- QVariant.typeToName(fld.type()))
+ model.setData(model.index(i, 1), QVariant.typeToName(fld.type()))
else:
model.setData(
- model.index(i, 1), "{0} ({1})".format(
- QVariant.typeToName(fld.type()), fld.typeID()))
+ model.index(i, 1),
+ "{0} ({1})".format(QVariant.typeToName(fld.type()), fld.typeID()),
+ )
if fld.length() < 0:
model.setData(model.index(i, 2), "?")
else:
@@ -234,25 +238,24 @@
model.setData(model.index(i, 4), bool(fld.requiredStatus()))
model.setData(model.index(i, 5), fld.isAutoValue())
model.setData(model.index(i, 6), fld.defaultValue())
-
+
self.table.setModel(model)
- self.table.setEditTriggers(
- QAbstractItemView.EditTrigger.NoEditTriggers)
-
+ self.table.setEditTriggers(QAbstractItemView.EditTrigger.NoEditTriggers)
+
self.table.resizeColumnsToContents()
-
+
self.updateActions()
-
+
def updateActions(self):
"""
Public slot to update the actions.
"""
enableIns = isinstance(self.table.model(), QSqlTableModel)
enableDel = enableIns & self.table.currentIndex().isValid()
-
+
self.insertRowAction.setEnabled(enableIns)
self.deleteRowAction.setEnabled(enableDel)
-
+
def __insertRow(self):
"""
Private slot to insert a row into the database table.
@@ -260,14 +263,14 @@
model = self.table.model()
if not isinstance(model, QSqlTableModel):
return
-
+
insertIndex = self.table.currentIndex()
row = 0 if insertIndex.row() == -1 else insertIndex.row()
model.insertRow(row)
insertIndex = model.index(row, 0)
self.table.setCurrentIndex(insertIndex)
self.table.edit(insertIndex)
-
+
def __deleteRow(self):
"""
Private slot to delete a row from the database table.
@@ -275,38 +278,41 @@
model = self.table.model()
if not isinstance(model, QSqlTableModel):
return
-
+
model.setEditStrategy(QSqlTableModel.EditStrategy.OnManualSubmit)
-
+
currentSelection = self.table.selectionModel().selectedIndexes()
for selectedIndex in currentSelection:
if selectedIndex.column() != 0:
continue
model.removeRow(selectedIndex.row())
-
+
model.submitAll()
model.setEditStrategy(QSqlTableModel.EditStrategy.OnRowChange)
-
+
self.updateActions()
-
+
def executeQuery(self):
"""
Public slot to execute the entered query.
"""
model = QSqlQueryModel(self.table)
- model.setQuery(QSqlQuery(
- self.sqlEdit.toPlainText(), self.connections.currentDatabase()))
+ model.setQuery(
+ QSqlQuery(self.sqlEdit.toPlainText(), self.connections.currentDatabase())
+ )
self.table.setModel(model)
-
+
if model.lastError().type() != QSqlError.ErrorType.NoError:
self.statusMessage.emit(model.lastError().text())
elif model.query().isSelect():
self.statusMessage.emit(self.tr("Query OK."))
else:
self.statusMessage.emit(
- self.tr("Query OK, number of affected rows: {0}")
- .format(model.query().numRowsAffected()))
-
+ self.tr("Query OK, number of affected rows: {0}").format(
+ model.query().numRowsAffected()
+ )
+ )
+
self.table.resizeColumnsToContents()
-
+
self.updateActions()
