kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-17 20:50:34 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Element nomenclature sql query minor fix

Browse Source 
Filter "is empty" don't work for any case :
We must to filter for NULL and empty string then replace the sql
sentence "value IS NULL" by "(value IS NULL OR value = '')"
This commit is contained in:
joshua
2021-04-11 14:03:02 +02:00
parent 794af49a3a
commit c1169f0e04
1 changed files with 37 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
sources/dataBase/ui/elementquerywidget.cpp
View File

@@ -157,31 +157,33 @@ void ElementQueryWidget::setQuery(const QString &query)
//Element type filter //Element type filter
if (where.contains("element_sub_type") || where.contains("element_type")) if (where.contains("element_sub_type") || where.contains("element_type"))
{ {
QRegularExpression rx("^(\\( .+?\\))");
auto rxm = rx.match(where);
if (rxm.hasMatch())
{
auto str_type = rxm.captured(1);
where.remove(str_type);
int c=0; int c=0;
ui->m_simple_cb->setChecked (where.contains("Simple") ? true : false); ui->m_simple_cb->setChecked (str_type.contains("Simple") ? true : false);
if (ui->m_simple_cb->isChecked()) { if (ui->m_simple_cb->isChecked()) {
++c; ++c;
where.remove("element_type = 'Simple' ");
} }
ui->m_terminal_cb->setChecked (where.contains("Terminale") ? true : false); ui->m_terminal_cb->setChecked (str_type.contains("Terminale") ? true : false);
if (ui->m_terminal_cb->isChecked()) { if (ui->m_terminal_cb->isChecked()) {
++c; ++c;
where.remove("element_type = 'Terminale'");
} }
ui->m_coil_cb->setChecked (where.contains("coil") ? true : false); ui->m_coil_cb->setChecked (str_type.contains("coil") ? true : false);
if (ui->m_coil_cb->isChecked()) { if (ui->m_coil_cb->isChecked()) {
++c; ++c;
where.remove("element_sub_type = 'coil' ");
} }
ui->m_button_cb->setChecked (where.contains("commutator") ? true : false); ui->m_button_cb->setChecked (str_type.contains("commutator") ? true : false);
if (ui->m_button_cb->isChecked()) { if (ui->m_button_cb->isChecked()) {
++c; ++c;
where.remove("element_sub_type = 'commutator' ");
} }
ui->m_protection_cb->setChecked(where.contains("protection") ? true : false); ui->m_protection_cb->setChecked(str_type.contains("protection") ? true : false);
if (ui->m_protection_cb) { if (ui->m_protection_cb) {
++c; ++c;
where.remove("element_sub_type = 'protection'");
} }
if (c == 5) { if (c == 5) {
@@ -189,8 +191,7 @@ void ElementQueryWidget::setQuery(const QString &query)
} else if (c > 0) { } else if (c > 0) {
ui->m_all_cb->setCheckState(Qt::PartiallyChecked); ui->m_all_cb->setCheckState(Qt::PartiallyChecked);
} }
}
where.remove("OR");
} }
else // There is not "element_sub_type" or "element_type" that mean every element are selected else // There is not "element_sub_type" or "element_type" that mean every element are selected
{ {
@@ -210,16 +211,16 @@ void ElementQueryWidget::setQuery(const QString &query)
beginning_rx.append(QString("^(").append(strl.join("|"))); beginning_rx.append(QString("^(").append(strl.join("|")));
beginning_rx.append(")"); beginning_rx.append(")");
QString join_str = strl.join("|");
QRegularExpression rx_is_not_null(beginning_rx + " != ''$"); QRegularExpression rx_is_not_null(beginning_rx + " != ''$");
QRegularExpression rx_is_null (beginning_rx + " IS NULL$"); QRegularExpression rx_is_null(QStringLiteral("^\\((%1) IS NULL OR (%1) = ''\\)").arg(join_str));
QRegularExpression rx_like (beginning_rx + QString(" LIKE'%(.+)%'$")); QRegularExpression rx_like (beginning_rx + QString(" LIKE'%(.+)%'$"));
QRegularExpression rx_not_like (beginning_rx + QString(" NOT LIKE'%(.+)%'$")); QRegularExpression rx_not_like (beginning_rx + QString(" NOT LIKE'%(.+)%'$"));
QRegularExpression rx_equal (beginning_rx + QString("='(.+)'$")); QRegularExpression rx_equal (beginning_rx + QString("='(.+)'$"));
QRegularExpression rx_not_equal (beginning_rx + QString("!='(.+)'$")); QRegularExpression rx_not_equal (beginning_rx + QString("!='(.+)'$"));
QStringList split_where; QStringList split_where;
//Remove the white space at begin and end of each string //Remove the white space at begin and end of each string
for (auto str : where.split("AND ")) for (auto str : where.split("AND "))
{ {
@@ -313,7 +314,7 @@ QString ElementQueryWidget::queryStr() const
filter_ += QStringLiteral(" AND ") += key += " != ''"; filter_ += QStringLiteral(" AND ") += key += " != ''";
break; break;
case 2: //empty case 2: //empty
filter_ += QStringLiteral(" AND ") += key += " IS NULL"; filter_ += QStringLiteral(" AND (%1 IS NULL OR %1 = '')").arg(key);
break; break;
case 3: // contain case 3: // contain
filter_ += QStringLiteral(" AND ") += key += QStringLiteral(" LIKE'%") += f.second += "%'"; filter_ += QStringLiteral(" AND ") += key += QStringLiteral(" LIKE'%") += f.second += "%'";