kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2026-10-06 11:14:14 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix parts lists saved before June 2022 losing rows and tables on open

Browse Source 
A nomenclature table saved by an older version filters on the element
type names the project database used then: element_type = 'Simple',
'Terminale', 'Master'. Commit 2e70d2e59 (June 2022) changed the database
to "simple", "terminal", "master", and SQLite compares text
case-sensitively, so such a table silently lost every row of that type
on open. Its continuation tables were then empty, and
removeUselessNextTable() deleted them: opening and saving the example
industrial.qet removed seven of its ten parts-list tables (folios 44-50),
and the remaining three listed 76 of 258 parts.

ProjectDBModel::fromXml() now rewrites old names in element_type = '...'
comparisons to the current ones (LegacyElementTypes::upgradeQuery()),
which also lets the query editor tick the right boxes again. A query
saved by a current version is unchanged, and so is any other text that
happens to contain "Simple".

Checked in the GUI on industrial.qet, open then save: master keeps
tables on 3 of folios 41-50, this keeps all 10, with 258 rows (the last
table 24 of 26) and the query saved as 'simple'. tst_legacyelementtypes
fails when a name maps wrongly.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01G2d2Zi8BfrYRPX88zhaoFG
This commit is contained in:
ispyisail
2026-09-27 21:46:30 +13:00
parent 44cabbcfe4
commit 166ee34f52
5 changed files with 141 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/qttest/CMakeLists.txt
+7
View File
@@ -104,6 +104,13 @@ add_test(NAME tst_textgrid COMMAND tst_textgrid)
target_include_directories(tst_textgrid PRIVATE ${QET_DIR}/sources)
target_link_libraries(tst_textgrid PRIVATE Qt::Test)
# legacyelementtypes.h is header-only: the rewrite of element type names in
# nomenclature queries saved before June 2022.
add_executable(tst_legacyelementtypes tst_legacyelementtypes.cpp)
add_test(NAME tst_legacyelementtypes COMMAND tst_legacyelementtypes)
target_include_directories(tst_legacyelementtypes PRIVATE ${QET_DIR}/sources)
target_link_libraries(tst_legacyelementtypes PRIVATE Qt::Test)
add_executable(
tst_qetpalette
tst_qetpalette.cpp
tests/qttest/tst_legacyelementtypes.cpp
+60
View File
@@ -0,0 +1,60 @@
/*
Copyright 2006-2026 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
QElectroTech is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
*/
#include "dataBase/legacyelementtypes.h"
#include <QTest>
class TestLegacyElementTypes : public QObject
{
Q_OBJECT
private slots:
void upgradesOldNames_data()
{
QTest::addColumn<QString>("saved");
QTest::addColumn<QString>("expected");
// The WHERE clause industrial.qet's parts list was saved with.
QTest::newRow("simple, with sub types")
<< "WHERE ( element_type = 'Simple' OR element_sub_type = 'coil') ORDER BY label"
<< "WHERE ( element_type = 'simple' OR element_sub_type = 'coil') ORDER BY label";
QTest::newRow("terminal and master, lengths change")
<< "element_type = 'Terminale' OR element_type = 'Master' OR element_type = 'Simple'"
<< "element_type = 'terminal' OR element_type = 'master' OR element_type = 'simple'";
QTest::newRow("reports and thumbnail")
<< "element_type='NextReport' OR element_type = 'PreviousReport' OR element_type = 'Thumbnail'"
<< "element_type='next_report' OR element_type = 'previous_report' OR element_type = 'thumbnail'";
QTest::newRow("current names unchanged")
<< "element_type = 'simple' OR element_type = 'terminal'"
<< "element_type = 'simple' OR element_type = 'terminal'";
QTest::newRow("the word elsewhere unchanged")
<< "WHERE label = 'Simple' OR designation = 'Master'"
<< "WHERE label = 'Simple' OR designation = 'Master'";
QTest::newRow("empty") << "" << "";
}
void upgradesOldNames()
{
QFETCH(QString, saved);
QFETCH(QString, expected);
QCOMPARE(LegacyElementTypes::upgradeQuery(saved), expected);
}
};
QTEST_APPLESS_MAIN(TestLegacyElementTypes)
#include "tst_legacyelementtypes.moc"