Fixed "Add records" procedure (sql qwery now is correct). Added button on "Add record" form for colling relations table.

master
Sergey Kalinin 2017-03-24 15:34:19 +03:00
parent 0ed5789c35
commit 2234722708
2 changed files with 163 additions and 146 deletions

96
dm.py
View File

@ -67,7 +67,7 @@ def firstInit():
def dbConnect():
global c, db_type, db_hostname, db_user, db_password, db_name
global c, db_type, db_hostname, db_user, db_password, db_name, conn
if db_type == "mysql":
import pymysql
conn = pymysql.connect(
@ -76,6 +76,7 @@ def dbConnect():
passwd=db_password,
host=db_hostname,
charset='utf8')
conn.commit()
elif db_type == "sqlite":
import sqlite3
conn = sqlite3.connect(db_name)
@ -84,7 +85,6 @@ def dbConnect():
exit()
#print(conn)
c = conn.cursor()
return c
def createTables(tbl_list):
@ -121,19 +121,21 @@ def createTables(tbl_list):
qwery_create = qwery_create + tbl_list[i]["fieldList"][x]["fName"] + " " + \
tbl_list[i]["fieldList"][x]["fType"] + auto_increment
if tbl_list[i]["fieldList"][x]["index"] == "PRIMARY KEY":
index = "PRIMARY KEY(" + tbl_list[i]["fieldList"][x]["fName"] + ")"
index = ", PRIMARY KEY (" + tbl_list[i]["fieldList"][x]["fName"] + ")"
field_names_list.append(
[tbl_list[i]["fieldList"][x]["fName"], tbl_list[i]["fieldList"][x]["fDescription"]])
# struct_fields_list.append(tbl_list[i]["fieldList"][x]["fName"])
struct_fields_list.append(
[tbl_list[i]["fieldList"][x]["fName"], fieldTypeConvert(tbl_list[i]["fieldList"][x]["fType"]), ])
[tbl_list[i]["fieldList"][x]["fName"], fieldTypeConvert(tbl_list[i]["fieldList"][x]["fType"]), auto_increment.strip(', ')])
if tbl_list[i]["fieldList"][x]["relation"]:
relation_list = [tbl_list[i]["fieldList"][x]["fName"]]
relation_list.append(tbl_list[i]["fieldList"][x]["relation"])
one_Table_relation.append(relation_list)
x = x + 1
qwery_create = qwery_create + index + ");"
qwery_create = qwery_create.strip(', ') + index + ');'
#qwery_create = qwery_create + index + ');'
#print(qwery_create)
elif db_type == 'sqlite':
while x < len(tbl_list[i]["fieldList"]):
if tbl_list[i]["fieldList"][x]["autoIncrement"] == "yes":
@ -150,7 +152,7 @@ def createTables(tbl_list):
field_names_list.append([tbl_list[i]["fieldList"][x]["fName"], tbl_list[i]["fieldList"][x]["fDescription"]])
# struct_fields_list.append(tbl_list[i]["fieldList"][x]["fName"])
struct_fields_list.append(
[tbl_list[i]["fieldList"][x]["fName"], fieldTypeConvert(tbl_list[i]["fieldList"][x]["fType"]), ])
[tbl_list[i]["fieldList"][x]["fName"], fieldTypeConvert(tbl_list[i]["fieldList"][x]["fType"]), auto_increment.strip(', ')])
if tbl_list[i]["fieldList"][x]["relation"]:
relation_list = [tbl_list[i]["fieldList"][x]["fName"]]
relation_list.append(tbl_list[i]["fieldList"][x]["relation"])
@ -165,7 +167,7 @@ def createTables(tbl_list):
i = i + 1
tbl_descr_list.append(one_Table_descr)
tbl_struct_list.append(one_Table_struct)
print(qwery_create)
#print(qwery_create)
c.execute(qwery_create)
return tbl_names_list
@ -212,7 +214,7 @@ def selectData(tbl):
subqwery = "(SELECT (" + field_replace + ") FROM " + subqwery +" WHERE "+ table1 + "." + field1 +"="+ tbl +"."+ field +") AS " + field
qwery = qwery.replace(field, subqwery)
qwery = qwery.rstrip(',') + " FROM " + tbl + " LIMIT 10000"
print(qwery)
#print(qwery)
c.execute(qwery)
return c.fetchall()
@ -273,13 +275,41 @@ def getFieldType(tbl, field):
#print(item[1])
#return item[1]
def getRelationsForField(tblSearch, fieldName):
global tbl_struct_list, c, db_type
#print("Ищем связи для:" +tblSearch +','+ fieldName)
#print(tbl_struct_list)
#searchField = tblSearch + '.' + fieldName
dataList = []
for item in tbl_struct_list:
#print(item)
tblName = item[0]
for field in item[1]:
field = field[0]
for rel in item[2]:
if tblName == tblSearch:
# выдергиваем из списка название и поле нужной нам таблицы
if rel[0] == fieldName:
#print('table - ' + tblName)
##print('field - ' + fieldName)
#print('relation - ' + str(rel))
l = rel[1][0].split('.')
relTable = l[0]
relField = l[1]
replaceFields = rel[1][1]
# print('reltable - ' + relTable)
#print('relfield - ' + relField)
#print('relrelation - ' + replaceFields)
return [relTable, relField, replaceFields]
return "q"
# добавление записи в БД на вход принимает список вида:
# [table [['field_1', 'значение'], ['field_2', 'значение'],....., ['field_n', 'значение']]]
def insertDataIntoBD(dataList):
global c
global c, conn
dbConnect()
tableName = dataList[0]
#print(dataList)
#datetime.strptime("21/11/06 16:30", "%d/%m/%y %H:%M")
qwery = 'INSERT INTO ' + tableName + ' ('
@ -288,26 +318,30 @@ def insertDataIntoBD(dataList):
for item in dataList[1]:
fType = getFieldType(tableName, item[0])
#print(fType)
qweryField = qweryField + item[0] + ','
if fType == 'integer':
qweryData = qweryData + '' + item[1] + ','
elif fType == 'datetime':
#преобразуем дату всяко разно
dt = datetime.strptime(item[1], "%d.%m.%Y %H:%M")
item[1] = str(dt)
qweryData = qweryData + '\'' + item[1] + '\','
elif fType == 'date':
d = item[1].split('.')
myDate = d[2] + '-' + d[1] + '-' + d[1]
item[1] = str(myDate)
qweryData = qweryData + '\'' + item[1] + '\','
else:
qweryData = qweryData + '\'' + item[1] + '\','
# проверяем если значение поля пустое то в запрос оно не включается
if item[1] != '':
qweryField = qweryField + item[0] + ','
if fType == 'integer':
qweryData = qweryData + '' + item[1] + ','
elif fType == 'datetime':
# преобразуем дату всяко разно
dt = datetime.strptime(item[1], "%d.%m.%Y %H:%M")
item[1] = str(dt)
qweryData = qweryData + '\'' + item[1] + '\','
elif fType == 'date':
d = item[1].split('.')
myDate = d[2] + '-' + d[1] + '-' + d[1]
item[1] = str(myDate)
qweryData = qweryData + '\'' + item[1] + '\','
else:
qweryData = qweryData + '\'' + item[1] + '\','
qwery = qwery + qweryField.rstrip(',') + ')' + ' VALUES (' + qweryData.rstrip(',') + ');'
#print(qwery)
print(qwery)
c.execute(qwery)
conn.commit()
#c.close()
return
@ -342,16 +376,16 @@ def selectDataFromDB(tblName, fieldName, fieldValue):
fieldReplace = fieldReplace.replace(",", ",' ',")
subqwery = "(SELECT CONCAT(" + fieldReplace + ") FROM " + subqwery + " WHERE " + table1 + "." + field1 + "=" + tblName + "." + field + ") AS " + field
elif db_type == "sqlite":
print(db_type)
print(fieldReplace)
#print(db_type)
#print(fieldReplace)
fieldReplace = fieldReplace.replace(",", " || ' ' ||")
print(fieldReplace)
#print(fieldReplace)
subqwery = "(SELECT (" + fieldReplace + ") FROM " + subqwery +" WHERE "+ table1 + "." + field1 +"="+ tblName +"."+ field +") AS " + field
print("---" + subqwery)
#print("---" + subqwery)
qwery = qwery.replace(field, subqwery)
#qwery = qwery.rstrip(',') + " FROM " + tblName + " LIMIT 10000"
qwery = qwery.rstrip(',') + " FROM " + tblName + " WHERE " + fieldName + '=' + fieldValue
print(qwery)
#print(qwery)
c.execute(qwery)
return c.fetchall()

213
gui.py
View File

@ -49,7 +49,7 @@ class MyTable(QTableWidget):
showRelationsRecords(self.currentIndex().column(), item.text())
def on_click(self):
print(self.cursor().pos().x())
#print(self.cursor().pos().x())
#self.contextMenuEvent(self.cursor())
for currentQTableWidgetItem in self.selectedItems():
print(currentQTableWidgetItem.row(), currentQTableWidgetItem.column(), currentQTableWidgetItem.text())
@ -58,6 +58,7 @@ class MyTable(QTableWidget):
class EditForm(QMainWindow):
lblList = []
editList = []
def __init__(self, tblName, tblDescr):
super().__init__()
self.tblName = tblName
@ -83,14 +84,20 @@ class EditForm(QMainWindow):
integerValidator = QRegExpValidator(integerRegex, self)
# список соответствия полей и QEdit
self.widgetsList = []
self.btnRelationsList = []
# добавляем динамически поля на форму в зависимости от типов данных
for item in dm.getFields(tblName):
#print(item)
fName = item[0]
fType = item[1]
fAutoIncr = item[2]
fDescr = dm.getFieldDescription(tblName, fName)
hboxEdit = QHBoxLayout()
lbl = QLabel(fDescr)
#listRelationTableAndField = []
btnRelations = ''
tableRelation = ''
# создаем поле ввода соответсвующее типу данных
if fType == 'datetime':
edit = QDateTimeEdit()
@ -112,6 +119,9 @@ class EditForm(QMainWindow):
edit.setTime(now)
elif fType == 'integer':
edit = QLineEdit()
# отключаем поле если оно автоинкрементное
if fAutoIncr == 'AUTOINCREMENT' or fAutoIncr == 'AUTO_INCREMENT':
edit.setDisabled(True)
# проверка на ввод цифр
edit.setValidator(integerValidator)
else:
@ -121,6 +131,23 @@ class EditForm(QMainWindow):
hboxEdit.addWidget(lbl)
hboxEdit.addWidget(edit)
# добавляем к полю кнопку для вызова связанных
print(fName)
listRelationTableAndField = dm.getRelationsForField(tblName, fName)
print(listRelationTableAndField)
if listRelationTableAndField != 'q':
tableRelation = listRelationTableAndField[0]
fieldRelation = listRelationTableAndField[1]
replaceField = listRelationTableAndField[2]
print(tableRelation + '-' + fieldRelation +'-'+replaceField)
btnRelations = QPushButton('...')
btnRelations.setFixedWidth(30)
# добавляем название виджета в список соответсвия кнопок и таблиц БД
# пиздец извращения =(
self.btnRelationsList.append([btnRelations, tableRelation, fieldRelation, replaceField])
btnRelations.clicked.connect(lambda: self.openRelationTable())
hboxEdit.addWidget(btnRelations)
l.addLayout(hboxEdit)
#print(self.widgetsList)
hboxBtn.addWidget(btnOk)
@ -138,85 +165,45 @@ class EditForm(QMainWindow):
listFieldData = []
for item in self.widgetsList:
#print(item[0] + ' ' + item[1].text())
listFieldData.append([item[0], item[1].text()])
if item[1].isEnabled:
listFieldData.append([item[0], item[1].text()])
listData.append(listFieldData)
#print(listData)
dm.insertDataIntoBD(listData)
self.close()
# выбираем данные для связанной таблицы
def openRelationTable(self):
sender = self.sender()
# ищем в списке соответсвующую кнопоку и связанные с ней данные
for item in self.btnRelationsList:
if sender == item[0]:
btn = item[0]
tbl = item[1]
# выбираем данные из БД
data = dm.selectData(tbl)
print(data)
def clickTablesList(tbl_name, tblDataWidget, data='NULL'):
global tblList, tabRelationsData
# удаляем все открытые табы
i=0
if tabRelationsData.count():
tabRelationsData.clear()
#print(tabRelationsData.count())
while i <= tabRelationsData.count():
#print(i)
class EditForm_(QMainWindow):
def __init__(self, tblName, tblDescr):
super().__init__()
self.setWindowTitle("Добавление записи")
scroll_widget = QWidget()
self.general_layout = QVBoxLayout()
scroll_area = QScrollArea()
l = QVBoxLayout()
headBox = QHBoxLayout()
lblHeader = QLabel("<B>Таблица: " + tblDescr)
l.addLayout(headBox)
#palet = QPalette(lblHeader.palette())
#lblHeader.setPalette(palet)
headBox.addWidget(lblHeader)
hboxBtn = QHBoxLayout()
btnOk = QPushButton('Записать')
btnOk.clicked.connect(lambda: self.save())
btnCancel = QPushButton('Закрыть')
btnCancel.clicked.connect(lambda: self.close())
# ПРОВЕРКА ВВОДА, добавить в цикл генерации формы в зависимости от типа поля
# grid_layout.addWidget(QLabel("Введите IP-адрес", self), 0, 0)
#
# ipRange = "(?:[0-1]?[0-9]?[0-9]|2[0-4][0-9]|25[0-5])" # Часть регулярного выржение
# # Само регулярное выражение
# ipRegex = QRegExp("^" + ipRange + "\\." + ipRange + "\\." + ipRange + "\\." + ipRange + "$")
# ipValidator = QRegExpValidator(ipRegex, self) # Валидатор для QLineEdit
#
# lineEdit = QLineEdit()
# lineEdit.setValidator(ipValidator) # Устанавливаем валидатор
i=0
for item in dm.getTableStructure(tblName):
#print(item)
hboxEdit = QHBoxLayout()
lbl = QLabel(item)
edit = QLineEdit()
hboxEdit.addWidget(lbl)
hboxEdit.addWidget(edit)
l.addLayout(hboxEdit)
tabRelationsData.removeTab(i)
i = i+1
hboxBtn.addWidget(btnOk)
hboxBtn.addWidget(btnCancel)
l.addLayout(hboxBtn)
self.general_layout.addLayout(l)
scroll_widget.setLayout(self.general_layout)
scroll_area.setWidget(scroll_widget)
self.setCentralWidget(scroll_area)
def save(self):
print(self.children())
addDataIntoTable(dm.getTablesNameOfDescription(listTables.model().data(listTables.currentIndex())), tblDataWidget)
def addDataIntoTable(tbl_name, tblDataWidget, data='NULL'):
global tblList
# выбираем название таблицы по описанию
# for i in tblList:
# if i[1] == tbl_descr:
# tbl_name = i[0]
# else:
# tbl_name = tbl_descr
#print(tbl_name)
global tblList, tabRelationsData
if data == 'NULL':
data = dm.selectData(tbl_name)
#print(data)
fieldNames = dm.getTableStructure(tbl_name)
#print(fieldNames)
# проверка на наличие записей в таблице
if data:
# количество строк
@ -232,12 +219,9 @@ def addDataIntoTable(tbl_name, tblDataWidget, data='NULL'):
for item in fieldNames:
fName = item[0]
fDescr = item[1]
#fieldNames = item + ','
# установка заголовков столбцов таблицы
#item = '<b>' + item + '</b>'
tblDataWidget.setHorizontalHeaderItem(n, QTableWidgetItem(fDescr))
n = n + 1
n = 0
for key in data:
m = 0
@ -333,44 +317,6 @@ def addNewRecord():
#editForm.setParent(tblRelationsData)
#editForm = Example()
def main():
global tblList, listTables, tabRelationsData
app = QApplication(sys.argv)
mainWin = QMainWindow()
workArea = QWidget()
mainWin.setCentralWidget(workArea)
hbox = QHBoxLayout()
listTables = QListWidget()
listTables.setFrameShape(QFrame.StyledPanel)
listTables.setFixedWidth(200)
#tblData = QTableWidget()
tblData = MyTable()
tblData.setFrameShape(QFrame.StyledPanel)
tabRelationsData = QTabWidget()
#tabRelationsData.setFrameShape(QFrame.StyledPanel)
splitter1 = QSplitter(Qt.Horizontal)
splitter1.addWidget(listTables)
splitter2 = QSplitter(Qt.Vertical)
splitter2.addWidget(tblData)
splitter2.addWidget(tabRelationsData)
splitter1.addWidget(splitter2)
hbox.addWidget(splitter1)
workArea.setLayout(hbox)
showMenuToolbar(mainWin)
listTables.itemClicked.connect(lambda: addDataIntoTable(dm.getTablesNameOfDescription(listTables.model().data(listTables.currentIndex())), tblData))
# выводим список таблиц в левом поле
tblList = dm.initDBstructure()
for i in tblList:
listTables.addItem(i[1])
mainWin.setGeometry(300, 300, 800, 600)
mainWin.setWindowTitle('Data manipulator')
mainWin.show()
return app.exec_()
def showRelationsRecords(fieldIndex, fieldValue):
global tabRelationsData, listTables
tblDescr = listTables.model().data(listTables.currentIndex())
@ -385,25 +331,62 @@ def showRelationsRecords(fieldIndex, fieldValue):
fieldNamesList = dm.getTableStructure(tblName)
fieldName = fieldNamesList[fieldIndex][0]
print(fieldNamesList)
print(fieldName)
print("showRelations")
print(tblName)
print(fieldValue)
# print(fieldNamesList)
# print(fieldName)
# print("showRelations")
# print(tblName)
# print(fieldValue)
data = dm.selectRelationsDataFromDB(tblName, fieldName, fieldValue)
#print(data)
for item in data:
tbl = item[0]
qweryResult = item[1]
if qweryResult:
print('report' + str(qweryResult) + 'report')
#print('report' + str(qweryResult) + 'report')
tblRelationsData = MyTable()
tblRelationsData.setParent(tabRelationsData)
tabRelationsData.addTab(tblRelationsData, dm.getTablesDescriptionOfName(tbl))
addDataIntoTable(tbl, tblRelationsData, qweryResult)
#
#
def main():
global tblList, listTables, tabRelationsData
app = QApplication(sys.argv)
mainWin = QMainWindow()
workArea = QWidget()
mainWin.setCentralWidget(workArea)
hbox = QHBoxLayout()
listTables = QListWidget()
listTables.setFrameShape(QFrame.StyledPanel)
listTables.setFixedWidth(200)
#tblData = QTableWidget()
tblData = MyTable()
tblData.setFrameShape(QFrame.StyledPanel)
tabRelationsData = QTabWidget()
#tabRelationsData.setFrameShape(QFrame.StyledPanel)
splitter1 = QSplitter(Qt.Horizontal)
splitter1.addWidget(listTables)
splitter2 = QSplitter(Qt.Vertical)
splitter2.addWidget(tblData)
splitter2.addWidget(tabRelationsData)
splitter1.addWidget(splitter2)
hbox.addWidget(splitter1)
workArea.setLayout(hbox)
showMenuToolbar(mainWin)
listTables.itemClicked.connect(lambda: clickTablesList(dm.getTablesNameOfDescription(listTables.model().data(listTables.currentIndex())), tblData))
# выводим список таблиц в левом поле
tblList = dm.initDBstructure()
for i in tblList:
listTables.addItem(i[1])
mainWin.setGeometry(300, 300, 800, 600)
mainWin.setWindowTitle('Data manipulator')
mainWin.show()
return app.exec_()
if __name__ == '__main__':
main()