From d9aa870e5d509cc7309ab82dd102a937ab58613a Mon Sep 17 00:00:00 2001 From: Unit 193 Date: Thu, 9 Feb 2017 04:36:04 -0500 Subject: Imported Upstream version 3.1.1+dfsg1 --- SQLiteStudio3/SQLiteStudio3.pro | 8 - SQLiteStudio3/Tests/ParserTest/tst_parsertest.cpp | 10 + .../SelectResolverTest/tst_selectresolvertest.cpp | 35 +- SQLiteStudio3/Tests/Tests.pro | 69 +- SQLiteStudio3/Tests/UtilsTest/UtilsTest.pro | 21 + SQLiteStudio3/Tests/UtilsTest/tst_utilssqltest.cpp | 75 + SQLiteStudio3/coreSQLiteStudio/ChangeLog.txt | 74 +- SQLiteStudio3/coreSQLiteStudio/Info.plist | 22 + SQLiteStudio3/coreSQLiteStudio/TODO.txt | 5 +- SQLiteStudio3/coreSQLiteStudio/committable.cpp | 10 +- SQLiteStudio3/coreSQLiteStudio/committable.h | 4 +- SQLiteStudio3/coreSQLiteStudio/common/table.cpp | 30 + SQLiteStudio3/coreSQLiteStudio/common/table.h | 18 + SQLiteStudio3/coreSQLiteStudio/common/utils.cpp | 21 +- SQLiteStudio3/coreSQLiteStudio/common/utils.h | 13 +- .../coreSQLiteStudio/common/utils_sql.cpp | 147 +- SQLiteStudio3/coreSQLiteStudio/common/utils_sql.h | 6 +- .../coreSQLiteStudio/completionhelper.cpp | 4 +- .../config_builder/cfgcategory.cpp | 5 + .../coreSQLiteStudio/config_builder/cfgcategory.h | 1 + .../coreSQLiteStudio/config_builder/cfgmain.cpp | 52 + .../coreSQLiteStudio/config_builder/cfgmain.h | 6 + .../coreSQLiteStudio/coreSQLiteStudio.pro | 938 +++---- .../coreSQLiteStudio/coreSQLiteStudio.qrc | 32 + .../coreSQLiteStudio/coresqlitestudio.qrc | 28 - SQLiteStudio3/coreSQLiteStudio/csvformat.cpp | 23 +- SQLiteStudio3/coreSQLiteStudio/csvformat.h | 6 + SQLiteStudio3/coreSQLiteStudio/csvserializer.cpp | 60 +- SQLiteStudio3/coreSQLiteStudio/db/abstractdb.cpp | 2 +- .../coreSQLiteStudio/db/chainexecutor.cpp | 16 +- SQLiteStudio3/coreSQLiteStudio/db/chainexecutor.h | 19 +- .../coreSQLiteStudio/db/queryexecutor.cpp | 126 +- SQLiteStudio3/coreSQLiteStudio/db/queryexecutor.h | 67 +- .../queryexecutorsteps/queryexecutoraddrowids.cpp | 31 +- .../queryexecutorsteps/queryexecutorcellsize.cpp | 8 +- .../db/queryexecutorsteps/queryexecutorcolumns.cpp | 38 +- .../db/queryexecutorsteps/queryexecutorcolumns.h | 2 +- .../queryexecutordatasources.cpp | 2 +- .../db/queryexecutorsteps/queryexecutorexecute.cpp | 10 +- .../queryexecutorreplaceviews.cpp | 1 + .../coreSQLiteStudio/dbversionconverter.cpp | 3 + SQLiteStudio3/coreSQLiteStudio/exportworker.cpp | 12 +- SQLiteStudio3/coreSQLiteStudio/importworker.cpp | 24 +- SQLiteStudio3/coreSQLiteStudio/log.cpp | 12 +- SQLiteStudio3/coreSQLiteStudio/log.h | 1 + .../parser/ast/sqlitecolumntype.cpp | 4 +- .../coreSQLiteStudio/parser/ast/sqliteexpr.cpp | 20 +- .../coreSQLiteStudio/parser/ast/sqliteexpr.h | 2 + SQLiteStudio3/coreSQLiteStudio/parser/lexer.cpp | 1 + .../coreSQLiteStudio/parser/lexer_low_lev.cpp | 2 +- .../coreSQLiteStudio/parser/sqlite3_parse.cpp | 1549 ++++++----- .../coreSQLiteStudio/parser/sqlite3_parse.h | 8 +- .../coreSQLiteStudio/parser/sqlite3_parse.y | 138 +- .../parser/statementtokenbuilder.cpp | 4 +- .../parser/statementtokenbuilder.h | 2 +- SQLiteStudio3/coreSQLiteStudio/parser/token.cpp | 10 + SQLiteStudio3/coreSQLiteStudio/parser/token.h | 1 + .../coreSQLiteStudio/plugins/dbpluginsqlite3.cpp | 2 +- .../plugins/dbpluginstdfilebase.cpp | 33 + .../coreSQLiteStudio/plugins/dbpluginstdfilebase.h | 16 + .../coreSQLiteStudio/plugins/uiconfiguredplugin.h | 2 +- SQLiteStudio3/coreSQLiteStudio/querygenerator.cpp | 7 +- SQLiteStudio3/coreSQLiteStudio/schemaresolver.cpp | 76 +- SQLiteStudio3/coreSQLiteStudio/schemaresolver.h | 2 + SQLiteStudio3/coreSQLiteStudio/selectresolver.cpp | 72 +- SQLiteStudio3/coreSQLiteStudio/selectresolver.h | 20 +- SQLiteStudio3/coreSQLiteStudio/services/config.cpp | 11 + SQLiteStudio3/coreSQLiteStudio/services/config.h | 7 +- .../coreSQLiteStudio/services/impl/configimpl.cpp | 71 +- .../coreSQLiteStudio/services/impl/configimpl.h | 3 + .../services/impl/functionmanagerimpl.cpp | 107 + .../services/impl/functionmanagerimpl.h | 4 + .../coreSQLiteStudio/services/importmanager.cpp | 7 +- .../coreSQLiteStudio/services/importmanager.h | 3 +- SQLiteStudio3/coreSQLiteStudio/sqlitestudio.cpp | 6 +- SQLiteStudio3/coreSQLiteStudio/tablemodifier.cpp | 4 +- .../translations/coreSQLiteStudio_de.ts | 101 +- .../translations/coreSQLiteStudio_es.ts | 101 +- .../translations/coreSQLiteStudio_fr.qm | Bin 41104 -> 41388 bytes .../translations/coreSQLiteStudio_fr.ts | 407 +-- .../translations/coreSQLiteStudio_it.ts | 101 +- .../translations/coreSQLiteStudio_pl.qm | Bin 42248 -> 43087 bytes .../translations/coreSQLiteStudio_pl.ts | 101 +- .../translations/coreSQLiteStudio_pt_BR.qm | Bin 23 -> 2939 bytes .../translations/coreSQLiteStudio_pt_BR.ts | 129 +- .../translations/coreSQLiteStudio_ru.qm | Bin 41441 -> 42098 bytes .../translations/coreSQLiteStudio_ru.ts | 107 +- .../translations/coreSQLiteStudio_sk.ts | 101 +- .../translations/coreSQLiteStudio_zh_CN.ts | 101 +- SQLiteStudio3/create_linux_portable.sh | 156 -- SQLiteStudio3/create_macosx_bundle.sh | 18 +- SQLiteStudio3/create_win32_portable.bat | 120 - .../constraints/tableforeignkeypanel.cpp | 3 - .../guiSQLiteStudio/datagrid/sqlqueryitem.cpp | 87 +- .../guiSQLiteStudio/datagrid/sqlqueryitem.h | 12 +- .../datagrid/sqlqueryitemdelegate.cpp | 133 +- .../datagrid/sqlqueryitemdelegate.h | 7 +- .../guiSQLiteStudio/datagrid/sqlquerymodel.cpp | 135 +- .../guiSQLiteStudio/datagrid/sqlquerymodel.h | 40 +- .../guiSQLiteStudio/datagrid/sqlqueryview.cpp | 34 +- .../guiSQLiteStudio/datagrid/sqltablemodel.cpp | 24 +- SQLiteStudio3/guiSQLiteStudio/dataview.cpp | 4 +- SQLiteStudio3/guiSQLiteStudio/dataview.h | 2 +- SQLiteStudio3/guiSQLiteStudio/dbtree/dbtree.cpp | 64 +- SQLiteStudio3/guiSQLiteStudio/dbtree/dbtree.h | 3 +- SQLiteStudio3/guiSQLiteStudio/dbtree/dbtree.ui | 2 +- .../guiSQLiteStudio/dbtree/dbtreemodel.cpp | 4 +- SQLiteStudio3/guiSQLiteStudio/dbtree/dbtreemodel.h | 2 +- .../guiSQLiteStudio/dialogs/configdialog.cpp | 2 +- .../guiSQLiteStudio/dialogs/configdialog.ui | 90 +- SQLiteStudio3/guiSQLiteStudio/dialogs/dbdialog.cpp | 93 +- SQLiteStudio3/guiSQLiteStudio/dialogs/dbdialog.h | 4 +- SQLiteStudio3/guiSQLiteStudio/dialogs/dbdialog.ui | 21 +- .../guiSQLiteStudio/dialogs/quitconfirmdialog.ui | 2 +- .../dialogs/triggercolumnsdialog.cpp | 24 +- .../guiSQLiteStudio/dialogs/triggercolumnsdialog.h | 8 +- .../dialogs/triggercolumnsdialog.ui | 56 +- .../guiSQLiteStudio/dialogs/triggerdialog.cpp | 4 +- SQLiteStudio3/guiSQLiteStudio/formview.cpp | 4 +- SQLiteStudio3/guiSQLiteStudio/formview.h | 8 +- SQLiteStudio3/guiSQLiteStudio/guiSQLiteStudio.pro | 6 +- SQLiteStudio3/guiSQLiteStudio/guiSQLiteStudio.qrc | 4 + SQLiteStudio3/guiSQLiteStudio/iconmanager.h | 2 + SQLiteStudio3/guiSQLiteStudio/icons.qrc | 2 + SQLiteStudio3/guiSQLiteStudio/img/search.png | Bin 0 -> 700 bytes .../guiSQLiteStudio/img/search_and_replace.png | Bin 0 -> 825 bytes SQLiteStudio3/guiSQLiteStudio/mainwindow.cpp | 4 +- SQLiteStudio3/guiSQLiteStudio/mdiwindow.cpp | 6 +- .../guiSQLiteStudio/searchtextlocator.cpp | 10 + SQLiteStudio3/guiSQLiteStudio/searchtextlocator.h | 1 + SQLiteStudio3/guiSQLiteStudio/sqleditor.cpp | 25 +- .../guiSQLiteStudio/sqlitesyntaxhighlighter.cpp | 5 +- .../guiSQLiteStudio/sqlitesyntaxhighlighter.h | 2 + .../translations/guiSQLiteStudio_de.qm | Bin 135940 -> 131563 bytes .../translations/guiSQLiteStudio_de.ts | 928 ++++--- .../translations/guiSQLiteStudio_es.ts | 890 +++---- .../translations/guiSQLiteStudio_fr.qm | Bin 142714 -> 136435 bytes .../translations/guiSQLiteStudio_fr.ts | 2736 ++++++++++++-------- .../translations/guiSQLiteStudio_it.ts | 890 +++---- .../translations/guiSQLiteStudio_pl.qm | Bin 139196 -> 163698 bytes .../translations/guiSQLiteStudio_pl.ts | 942 ++++--- .../translations/guiSQLiteStudio_pt_BR.ts | 890 +++---- .../translations/guiSQLiteStudio_ru.qm | Bin 147413 -> 155959 bytes .../translations/guiSQLiteStudio_ru.ts | 1088 ++++---- .../translations/guiSQLiteStudio_sk.qm | Bin 101600 -> 96699 bytes .../translations/guiSQLiteStudio_sk.ts | 946 ++++--- .../translations/guiSQLiteStudio_zh_CN.qm | Bin 53694 -> 52503 bytes .../translations/guiSQLiteStudio_zh_CN.ts | 908 ++++--- SQLiteStudio3/guiSQLiteStudio/uiconfig.h | 6 +- SQLiteStudio3/guiSQLiteStudio/uidebug.cpp | 5 + .../windows/bugreporthistorywindow.cpp | 4 +- .../windows/bugreporthistorywindow.h | 4 +- .../guiSQLiteStudio/windows/collationseditor.cpp | 6 +- .../guiSQLiteStudio/windows/collationseditor.h | 4 +- .../guiSQLiteStudio/windows/ddlhistorywindow.cpp | 4 +- .../guiSQLiteStudio/windows/ddlhistorywindow.h | 4 +- .../guiSQLiteStudio/windows/editorwindow.cpp | 18 +- .../guiSQLiteStudio/windows/editorwindow.h | 6 +- .../guiSQLiteStudio/windows/functionseditor.cpp | 6 +- .../guiSQLiteStudio/windows/functionseditor.h | 4 +- .../guiSQLiteStudio/windows/tablewindow.cpp | 57 +- .../guiSQLiteStudio/windows/tablewindow.h | 7 +- .../guiSQLiteStudio/windows/viewwindow.cpp | 47 +- SQLiteStudio3/guiSQLiteStudio/windows/viewwindow.h | 7 +- SQLiteStudio3/lang.tcl | 78 +- SQLiteStudio3/sqlitestudio/main.cpp | 5 + SQLiteStudio3/sqlitestudio/sqlitestudio.pro | 6 +- SQLiteStudio3/sqlitestudio/sqlitestudio.qrc | 4 + .../sqlitestudio/translations/sqlitestudio_de.ts | 20 +- .../sqlitestudio/translations/sqlitestudio_es.ts | 20 +- .../sqlitestudio/translations/sqlitestudio_fr.qm | Bin 1824 -> 1824 bytes .../sqlitestudio/translations/sqlitestudio_fr.ts | 25 +- .../sqlitestudio/translations/sqlitestudio_it.ts | 20 +- .../sqlitestudio/translations/sqlitestudio_pl.qm | Bin 2259 -> 2450 bytes .../sqlitestudio/translations/sqlitestudio_pl.ts | 10 +- .../translations/sqlitestudio_pt_BR.ts | 20 +- .../sqlitestudio/translations/sqlitestudio_ru.qm | Bin 2380 -> 3002 bytes .../sqlitestudio/translations/sqlitestudio_ru.ts | 22 +- .../sqlitestudio/translations/sqlitestudio_sk.ts | 20 +- .../translations/sqlitestudio_zh_CN.ts | 20 +- SQLiteStudio3/sqlitestudiocli/cli.cpp | 2 +- .../sqlitestudiocli/commands/clicommandsql.cpp | 19 +- .../sqlitestudiocli/commands/clicommandsql.h | 2 +- SQLiteStudio3/sqlitestudiocli/sqlitestudiocli.pro | 6 +- SQLiteStudio3/sqlitestudiocli/sqlitestudiocli.qrc | 8 + .../translations/sqlitestudiocli_de.ts | 10 +- .../translations/sqlitestudiocli_es.ts | 10 +- .../translations/sqlitestudiocli_fr.qm | Bin 40873 -> 41642 bytes .../translations/sqlitestudiocli_fr.ts | 168 +- .../translations/sqlitestudiocli_it.ts | 10 +- .../translations/sqlitestudiocli_pl.qm | Bin 39355 -> 40792 bytes .../translations/sqlitestudiocli_pl.ts | 2 +- .../translations/sqlitestudiocli_pt_BR.ts | 10 +- .../translations/sqlitestudiocli_ru.ts | 10 +- .../translations/sqlitestudiocli_sk.ts | 10 +- .../translations/sqlitestudiocli_zh_CN.ts | 10 +- 196 files changed, 10201 insertions(+), 7526 deletions(-) create mode 100644 SQLiteStudio3/Tests/UtilsTest/UtilsTest.pro create mode 100644 SQLiteStudio3/Tests/UtilsTest/tst_utilssqltest.cpp create mode 100644 SQLiteStudio3/coreSQLiteStudio/Info.plist create mode 100644 SQLiteStudio3/coreSQLiteStudio/coreSQLiteStudio.qrc delete mode 100644 SQLiteStudio3/coreSQLiteStudio/coresqlitestudio.qrc create mode 100644 SQLiteStudio3/coreSQLiteStudio/plugins/dbpluginstdfilebase.cpp create mode 100644 SQLiteStudio3/coreSQLiteStudio/plugins/dbpluginstdfilebase.h delete mode 100644 SQLiteStudio3/create_linux_portable.sh delete mode 100644 SQLiteStudio3/create_win32_portable.bat create mode 100644 SQLiteStudio3/guiSQLiteStudio/img/search.png create mode 100644 SQLiteStudio3/guiSQLiteStudio/img/search_and_replace.png (limited to 'SQLiteStudio3') diff --git a/SQLiteStudio3/SQLiteStudio3.pro b/SQLiteStudio3/SQLiteStudio3.pro index a535b81..3d19c5c 100644 --- a/SQLiteStudio3/SQLiteStudio3.pro +++ b/SQLiteStudio3/SQLiteStudio3.pro @@ -33,14 +33,6 @@ win32: { SUBDIRS += update_app } -linux: { - portable.commands = sh $$PWD/create_linux_portable.sh $$PWD/../$$OUTPUT_DIR_NAME $$QMAKE_QMAKE - tgz.commands = sh $$PWD/create_linux_portable.sh $$PWD/../$$OUTPUT_DIR_NAME $$QMAKE_QMAKE tgz - pkg.commands = sh $$PWD/create_linux_portable.sh $$PWD/../$$OUTPUT_DIR_NAME $$QMAKE_QMAKE dist - pkg_plugins.commands = sh $$PWD/create_linux_portable.sh $$PWD/../$$OUTPUT_DIR_NAME $$QMAKE_QMAKE dist_plugins - pkg_full.commands = sh $$PWD/create_linux_portable.sh $$PWD/../$$OUTPUT_DIR_NAME $$QMAKE_QMAKE dist_full - QMAKE_EXTRA_TARGETS += portable tgz pkg pkg_plugins pkg_full -} macx: { bundle.commands = sh $$PWD/create_macosx_bundle.sh $$PWD/../$$OUTPUT_DIR_NAME $$QMAKE_QMAKE diff --git a/SQLiteStudio3/Tests/ParserTest/tst_parsertest.cpp b/SQLiteStudio3/Tests/ParserTest/tst_parsertest.cpp index 0dc58b0..7355616 100644 --- a/SQLiteStudio3/Tests/ParserTest/tst_parsertest.cpp +++ b/SQLiteStudio3/Tests/ParserTest/tst_parsertest.cpp @@ -21,6 +21,7 @@ class ParserTest : public QObject private Q_SLOTS: void test(); + void testScientificNumber(); void testUniqConflict(); void testGetTableTokens(); void testGetTableTokens2(); @@ -72,6 +73,15 @@ void ParserTest::test() TokenList tokens = query->getContextTableTokens(); } +void ParserTest::testScientificNumber() +{ + QString sql = "SELECT 1e100;"; + TokenList tokens = Lexer::tokenize(sql, Dialect::Sqlite3); + + QVERIFY(tokens.size() == 4); + QVERIFY(tokens[2]->type == Token::Type::FLOAT); +} + void ParserTest::testGetTableTokens() { QString sql = "select someTable.* FROM someTable;"; diff --git a/SQLiteStudio3/Tests/SelectResolverTest/tst_selectresolvertest.cpp b/SQLiteStudio3/Tests/SelectResolverTest/tst_selectresolvertest.cpp index 969ebad..2d6762e 100644 --- a/SQLiteStudio3/Tests/SelectResolverTest/tst_selectresolvertest.cpp +++ b/SQLiteStudio3/Tests/SelectResolverTest/tst_selectresolvertest.cpp @@ -29,6 +29,7 @@ class SelectResolverTest : public QObject void testWithCommonTableExpression(); void testStarWithJoinAndError(); void test1(); + void testSubselectWithAlias(); }; SelectResolverTest::SelectResolverTest() @@ -42,28 +43,28 @@ void SelectResolverTest::testTableHash() SelectResolver::Table t1; t1.database = "d1"; t1.table = "t1"; - t1.alias = "a1"; + t1.tableAlias = "a1"; tables << t1; // different alias and database SelectResolver::Table t2; t2.database = "d2"; t2.table = "t1"; - t2.alias = QString::null; + t2.tableAlias = QString::null; tables << t2; // different database SelectResolver::Table t3; t3.database = "d2"; t3.table = "t1"; - t3.alias = "a1"; + t3.tableAlias = "a1"; tables << t3; // same as t3 SelectResolver::Table t4; t4.database = "d2"; t4.table = "t1"; - t4.alias = "a1"; + t4.tableAlias = "a1"; tables << t4; // all null @@ -78,21 +79,21 @@ void SelectResolverTest::testTableHash() SelectResolver::Table t7; t7.database = "x"; t7.table = "t1"; - t7.alias = "a1"; + t7.tableAlias = "a1"; tables << t7; // similar to t1, but different table SelectResolver::Table t8; t8.database = "d1"; t8.table = "x"; - t8.alias = "a1"; + t8.tableAlias = "a1"; tables << t8; // similar to t1, but different alias SelectResolver::Table t9; t9.database = "d1"; t9.table = "t1"; - t9.alias = "x"; + t9.tableAlias = "x"; tables << t9; QVERIFY(tables.size() == 7); @@ -222,6 +223,26 @@ void SelectResolverTest::test1() QVERIFY(coreColumns[1].column == "col2"); } +void SelectResolverTest::testSubselectWithAlias() +{ + QString sql = "SELECT * FROM (SELECT m.col1, m.col2, secm.col3 FROM test AS m LEFT OUTER JOIN test AS secm ON secm.col1 = m.col2) alias3;"; + SelectResolver resolver(db, sql); + Parser parser(db->getDialect()); + QVERIFY(parser.parse(sql)); + + QList > columns = resolver.resolve(parser.getQueries().first().dynamicCast().data()); + QList coreColumns = columns.first(); + QVERIFY(coreColumns[0].tableAlias == "alias3"); + QVERIFY(coreColumns[1].tableAlias == "alias3"); + QVERIFY(coreColumns[2].tableAlias == "alias3"); + QVERIFY(coreColumns[0].oldTableAliases.size() == 1); + QVERIFY(coreColumns[1].oldTableAliases.size() == 1); + QVERIFY(coreColumns[2].oldTableAliases.size() == 1); + QVERIFY(coreColumns[0].oldTableAliases.first() == "m"); + QVERIFY(coreColumns[1].oldTableAliases.first() == "m"); + QVERIFY(coreColumns[2].oldTableAliases.first() == "secm"); +} + void SelectResolverTest::initTestCase() { initKeywords(); diff --git a/SQLiteStudio3/Tests/Tests.pro b/SQLiteStudio3/Tests/Tests.pro index 7995bf1..2690494 100644 --- a/SQLiteStudio3/Tests/Tests.pro +++ b/SQLiteStudio3/Tests/Tests.pro @@ -1,34 +1,35 @@ -TEMPLATE = subdirs - -test_utils.subdir = TestUtils - -completion_helper.subdir = CompletionHelperTest -completion_helper.depends = test_utils - -select_resolver.subdir = SelectResolverTest -select_resolver.depends = test_utils - -parser.subdir = ParserTest -parser.depends = test_utils - -table_modifier.subdir = TableModifierTest -table_modifier.depends = test_utils - -hash_tables.subdir = HashTablesTest -hash_tables.depends = test_utils - -db_ver_conv.subdir = DbVersionConverterTest -db_ver_conv.depends = test_utils - -dsv.subdir = DsvFormatsTest -dsv.depends = test_utils - -SUBDIRS += \ - test_utils \ - completion_helper \ - select_resolver \ - parser \ - table_modifier \ - hash_tables \ - db_ver_conv \ - dsv +TEMPLATE = subdirs + +test_utils.subdir = TestUtils + +completion_helper.subdir = CompletionHelperTest +completion_helper.depends = test_utils + +select_resolver.subdir = SelectResolverTest +select_resolver.depends = test_utils + +parser.subdir = ParserTest +parser.depends = test_utils + +table_modifier.subdir = TableModifierTest +table_modifier.depends = test_utils + +hash_tables.subdir = HashTablesTest +hash_tables.depends = test_utils + +db_ver_conv.subdir = DbVersionConverterTest +db_ver_conv.depends = test_utils + +dsv.subdir = DsvFormatsTest +dsv.depends = test_utils + +SUBDIRS += \ + test_utils \ + completion_helper \ + select_resolver \ + parser \ + table_modifier \ + hash_tables \ + db_ver_conv \ + dsv \ + UtilsTest diff --git a/SQLiteStudio3/Tests/UtilsTest/UtilsTest.pro b/SQLiteStudio3/Tests/UtilsTest/UtilsTest.pro new file mode 100644 index 0000000..394c7b0 --- /dev/null +++ b/SQLiteStudio3/Tests/UtilsTest/UtilsTest.pro @@ -0,0 +1,21 @@ +#------------------------------------------------- +# +# Project created by QtCreator 2016-10-03T10:48:04 +# +#------------------------------------------------- + +include($$PWD/../TestUtils/test_common.pri) + +QT += testlib + +QT -= gui + +TARGET = tst_utilssqltest +CONFIG += console +CONFIG -= app_bundle + +TEMPLATE = app + + +SOURCES += tst_utilssqltest.cpp +DEFINES += SRCDIR=\\\"$$PWD/\\\" diff --git a/SQLiteStudio3/Tests/UtilsTest/tst_utilssqltest.cpp b/SQLiteStudio3/Tests/UtilsTest/tst_utilssqltest.cpp new file mode 100644 index 0000000..97c9234 --- /dev/null +++ b/SQLiteStudio3/Tests/UtilsTest/tst_utilssqltest.cpp @@ -0,0 +1,75 @@ +#include +#include +#include "common/utils_sql.h" + +class UtilsSqlTest : public QObject +{ + Q_OBJECT + +public: + UtilsSqlTest(); + +private Q_SLOTS: + void testCaseDefault(); + void testRemoveEmpties(); + void testRemoveComments(); + void testRemoveCommentsAndEmpties(); +}; + +UtilsSqlTest::UtilsSqlTest() +{ +} + +void UtilsSqlTest::testCaseDefault() +{ + QString sql = "select 'dfgh ;sdg '' dfga' from aa; insert into x values ('sdg', ';drghd;;;''', 4); select 1, ''; select 2;"; + QStringList sp = quickSplitQueries(sql); + + QString failure = "Failure, got: \"%1\""; + + QVERIFY2(sp.size() == 4, failure.arg(sp.size()).toLatin1().data()); + QVERIFY2(sp[0] == "select 'dfgh ;sdg '' dfga' from aa;", failure.arg(sp[0]).toLatin1().data()); + QVERIFY2(sp[1] == " insert into x values ('sdg', ';drghd;;;''', 4);", failure.arg(sp[1]).toLatin1().data()); + QVERIFY2(sp[2] == " select 1, '';", failure.arg(sp[2]).toLatin1().data()); + QVERIFY2(sp[3] == " select 2;", failure.arg(sp[3]).toLatin1().data()); +} + +void UtilsSqlTest::testRemoveEmpties() +{ + QString sql = "select 'dfgh ;sdg '' dfga' from aa; ; select 1, '';"; + QStringList sp = quickSplitQueries(sql, false); + + QString failure = "Failure, got: \"%1\""; + + QVERIFY2(sp.size() == 2, failure.arg(sp.size()).toLatin1().data()); + QVERIFY2(sp[0] == "select 'dfgh ;sdg '' dfga' from aa;", failure.arg(sp[0]).toLatin1().data()); + QVERIFY2(sp[1] == " select 1, '';", failure.arg(sp[1]).toLatin1().data()); +} + +void UtilsSqlTest::testRemoveComments() +{ + QString sql = "select 'dfgh ;sdg '' dfga' from aa; select 1/*, ''*/;--select 1\nselect 2;"; + QStringList sp = quickSplitQueries(sql, true, true); + + QString failure = "Failure, got: \"%1\""; + + QVERIFY2(sp.size() == 3, failure.arg(sp.size()).toLatin1().data()); + QVERIFY2(sp[0] == "select 'dfgh ;sdg '' dfga' from aa;", failure.arg(sp[0]).toLatin1().data()); + QVERIFY2(sp[1] == " select 1;", failure.arg(sp[1]).toLatin1().data()); + QVERIFY2(sp[2] == "select 2;", failure.arg(sp[2]).toLatin1().data()); +} + +void UtilsSqlTest::testRemoveCommentsAndEmpties() +{ + QString sql = "select 'dfgh ;sdg /*''*/ dfga' from aa; /*select 1, ''*/;--select 1\n--select 2;"; + QStringList sp = quickSplitQueries(sql, false, true); + + QString failure = "Failure, got: \"%1\""; + + QVERIFY2(sp.size() == 1, failure.arg(sp.size()).toLatin1().data()); + QVERIFY2(sp[0] == "select 'dfgh ;sdg /*''*/ dfga' from aa;", failure.arg(sp[0]).toLatin1().data()); +} + +QTEST_APPLESS_MAIN(UtilsSqlTest) + +#include "tst_utilssqltest.moc" diff --git a/SQLiteStudio3/coreSQLiteStudio/ChangeLog.txt b/SQLiteStudio3/coreSQLiteStudio/ChangeLog.txt index a477b8c..c0c42cd 100644 --- a/SQLiteStudio3/coreSQLiteStudio/ChangeLog.txt +++ b/SQLiteStudio3/coreSQLiteStudio/ChangeLog.txt @@ -1,3 +1,57 @@ +[3.1.1] + * [ADDED]: WxSQLite3 plugin (with encryption support). + * [ADDED]: System.Data.SQLite plugin (ADO.NET, includes encryption support). + * [ADDED]: Support for "Row Value" introduced in SQLite 3.15.0. + * [ADDED]: New option in configuration dialog to decide whether you want to keep NULL values when entering empty strings in cells (new, more intuitive behavior), or overwrite NULLs with empty string values (as it used to be so far). + * [ADDED]: Editor window has now "Find" and "Replace" toolbar buttons for those functions (which were already there, available under shortcuts). + * [ADDED]: New built-in functions: import(), import_formats(), import_options() and charset(). All described on SQLiteStudio's wiki (at User Manual page). + * [ADDED]: #3106 ScriptingTcl has now "tcl_init" command to invoke full interpreter initialization, which creates [clock] commands and some others. It's not invoked automatically to avoid performane issues. + * [ADDED]: #3136 Added "--master-config" command line option to have a settings file (regular SQLiteStudio config file) that all running SQLiteStudio instances import settings from. More details in manual on wiki page. + * [ADDED]: #3127 Added 'select all' and 'deselect all' buttons in tigger's UPDATE OF columns dialog. + * [CHANGE]: #3135 Re-enabled possibility to close database list panel (and reopen it from the View menu entry). + * [CHANGE]: #2901 Automatically generated database name includes full file name, except for the file extension only (unlike before, when it took only a file name up to the first dot). + * [CHANGE]: #3140 The "generate name automatically" checkbox has been removed. Now the name is generated automatically by default, unless user starts to edit the name manually. + * [BUGFIX]: #3118 #3124 #2943 Fixed double precision numbers formatting. + * [BUGFIX]: DbAndroid plugin: Fixed 'adb' automatic detection under Linux. + * [BUGFIX]: #3126 #3092 Fixed problem with database versions in Android plugin. + * [BUGFIX]: #3155 Fixed crash when confiriming custom FK value with Enter key. + * [BUGFIX]: #3094 #3095 Fixed default FK value preselection when tabbing through cells. + * [BUGFIX]: #3154 Fixed crash when mass replacing token to another token containing initial token. + * [BUGFIX]: Fixed query generation for "UPDATE" and "DELETE" when invoking it from Database List context menu for the table. + * [BUGFIX]: Fixed Ctrl+click (Cmd+click on MacOSX) handling of object names that require name wrapping (such as names with spaces in it). + * [BUGFIX]: #3133 Fixed resolving tables with unusual (like cyrillic) characters in their names. + * [BUGFIX]: #3096 Restored data editing by Return key hit, that got broken in 3.1.0 for MacOSX. + * [BUGFIX]: #3122 Several tweaks to Android shell mode connection. + * [BUGFIX]: #3093 Fixed memory leak in Android plugin. + * [BUGFIX]: #3132 Fixed column resolving in a View that uses same alias for two different columns. + * [BUGFIX]: Fixed importing Windows and Macintosh end-line format CSV files (handling \r\n and \r properly). + * [BUGFIX]: #3134 Fixed recognizing CREATE TRIGGER statements properly when CASE-WHEN-END is used inside. + * [BUGFIX]: #3112 Fixed Foreign Key editing when the foreign table was modified (for example renamed) and the local column was already presented in the data view. + * [BUGFIX]: #3113 DEFAULT value is now automatically inserted only when committing NULL for NOT NULL column. Also new option is introduced to use DEFAULT always for NULL values, regardles of NOT NULL constraint. + * [BUGFIX]: Fixed refreshing database list view when changing labels display settings in configuration dialog. + * [BUGFIX]: Fixed FormView row navigation shortcuts. + * [BUGFIX]: #3097 Fixed alphabetical ordering when exporting entire database. + * [BUGFIX]: Fixed "UPDATE OF" column list formatting (indentation) in Enterprise Formater plugin. + * [BUGFIX]: Fixed SqlSimpleFormatter plugin to add ";" at the end of CREATE TABLE statements while exporting database schema to SQL format. + * [BUGFIX]: Data view fonts now apply to other tabs in the table window and view window. + * [BUGFIX]: #3005 Fixed performance issue with lots of big values loaded into the grid. Also fixed editing those values using the inline cell editor. + * [BUGFIX]: #2938 Fixed query executor to idenfity properly tables in named subselects, to the ROWID is handled correctly. + * [BUGFIX]: #3168 Fixed data filter field in data view, so it handles the single quote character. + * [BUGFIX]: #2942 Erasing table data context menu option now honors multiple table selection. + * [BUGFIX]: #2900 Optimized execution of thousands of queries at once in SQL editor window. + * [BUGFIX]: #2934 Table foreign key dialog can now refer to the same table. So far only column dialog constraint for FK could do it. + * [BUGFIX]: #3120 Performance of SQL editor window greatly increased when working with huge sets if queries (like thousands). + * [BUGFIX]: #3028 Fixed formatter for "NOT EXISTS" expression. + * [BUGFIX]: #2990 Fixed handling scientific numbers notation. + * [BUGFIX]: #2987 Fixed "go to referenced row" function when using multi word object names. + * [BUGFIX]: #3173 Fixed numerous typos in messages and names. + * [BUGFIX]: #3178 Fixed pagination for query simple execution method. + * [BUGFIX]: #3177 Fixed ORDER BY with column numbers, instead of names. + * [BUGFIX]: #3125 Fixed trigger UPDATE OF columns popup dialog positioning. + * [BUGFIX]: #3166 Fixed crash when trying to print data. + * [BUGFIX]: Fixed reading long values of not-editable result columns (like expressions or functions that return long values). They used to be truncated. + * [BUGFIX]: Compilation fixes. + [3.1.0] * [ADDED]: SQLCipher plugin is now free, open source and distributed together with other standard plugins. * [ADDED]: #2963 Indexed expressions for CREATE INDEX statements (introduced in SQLite 3.9) are now supported and can be edited in Index Dialog. @@ -98,7 +152,7 @@ [3.0.5] * [ADDED]: #2831 Ported 'Erase table data' feature (in table's context menu) from version 2.1.5. - * [CHANGE]: Data view has now a 'cover' with progress bar when commiting more changes at once. This eliminates weird GUI freeze when commiting lots of new/deleted rows. + * [CHANGE]: Data view has now a 'cover' with progress bar when committing more changes at once. This eliminates weird GUI freeze when committing lots of new/deleted rows. * [CHANGE]: Populate dialog has now progress bar when working. * [CHANGE]: Enhanced SQL formatter to format CREATE TRIGGER statements in a bit more readable way. * [BUGFIX]: #2838 Fixed outstanding bug causing database file to be deleted if a user tried "Test connection" on the database under Windows. @@ -181,7 +235,7 @@ * [BUGFIX]: #2703 Fixed compilation errors on GCC 4.9. * [BUGFIX]: #2707 Fixed crash when importing CSV file with empty value for last column. * [BUGFIX]: Valid objects in SQL editor are now highlighted and are Ctrl+clickable (the feature was there, but was broken and it didn't work). - * [BUGFIX]: Fixed invalid 'modified' status when focusing out NumberMultiEditor in FormView, resulting in uncommited change on FormView, even there was no change. + * [BUGFIX]: Fixed invalid 'modified' status when focusing out NumberMultiEditor in FormView, resulting in uncommitted change on FormView, even there was no change. * [BUGFIX]: #2698 Fixed double precision numbers displaying in the Grid View. * [BUGFIX]: #2696 Fixed handling foreign keys when the main table was not renamed, just columns changed. * [BUGFIX]: #2713 Fixed foreign key actions in Foreign Key dialog, so they are no longer the same for ON UPDATE and ON DELETE, even they were configured differently. @@ -221,7 +275,7 @@ * [ADDED]: Scripting languages are now provided by plugins. With this version there is support for QtScript (built in), SQL (built in) and Tcl (as a plugin). * [ADDED]: Support for sorting data by multiple columns by right-clicking on the data grid header. * [ADDED]: Support for "WITHOUT ROWID" tables and "WITH" clause in queries. - * [ADDED]: If there are any uncommited changes (in data or schema), user will be asked for confirmation before closing application or MDI window. + * [ADDED]: If there are any uncommitted changes (in data or schema), user will be asked for confirmation before closing application or MDI window. * [ADDED]: Printing (for data, schema and query) support. * [ADDED]: Much, much more, it's just hard to put every single detail in the changelog. After all, the entire application was written from the very beginning. * [CHANGE]: Table is now edited in the table window directly, not in any special dialog. @@ -282,7 +336,7 @@ * [BUGFIX]: Fixed http://bugs.sqlitestudio.pl/?id=1743 * [BUGFIX]: Fixed http://bugs.sqlitestudio.pl/?id=1700 * [BUGFIX]: Fixed http://bugs.sqlitestudio.pl/?id=1763 - * [BUGFIX]: When editing a cell from query results and commiting changes, then all cells representing the same database cell will be updated with new value as well. + * [BUGFIX]: When editing a cell from query results and committing changes, then all cells representing the same database cell will be updated with new value as well. * [BUGFIX]: Fonts initialization optimized. SQL editor widgets should open slightly faster, especially under Windows. * [BUGFIX]: Transparent attach/detach mechanism fixed to avoid multiple attaches of the same database. * [BUGFIX]: Fixed column edition dialog to not hide under Windows after being open with "double click". @@ -580,7 +634,7 @@ * [CHANGE]: Datatypes in column edition dialog are now autocompleted while typing, so it's enough to type "t" to get "TEXT" type. * [CHANGE]: Datatype list in column edition can now be fast navigated using keys, so if you drop down the list, you can press "i" to select "INT" type fast. (http://bugs.sqlitestudio.pl/?id=190) * [BUGFIX]: Fixed bug related to "_toCommit". - * [BUGFIX]: Fixed bug, when user was able to edit deleted but uncommited row (even the edition was ignored). + * [BUGFIX]: Fixed bug, when user was able to edit deleted but uncommitted row (even the edition was ignored). * [BUGFIX]: Fixed insertion of numeric values in data view - they're now treated as numeric if column type says so (they used to be treated as string and CHECK constraint was not satisfied very often). * [BUGFIX]: Fixed http://bugs.sqlitestudio.pl/?id=168 * [BUGFIX]: Fixed http://bugs.sqlitestudio.pl/?id=172 @@ -660,7 +714,7 @@ [2.0.6] * [ADDED]: Context menu (with copy/cut/paste) in text fields. - * [CHANGE]: Removed "autoCommit". Now all changes have to be commited. + * [CHANGE]: Removed "autoCommit". Now all changes have to be committed. * [CHANGE]: Database add/edit dialog modified for Mac OS X. Now it uses two dialogs to pick file - native OSX dialogs! * [BUGFIX]: Commit/Rollback buttons activates when editing starts by typing value. * [BUGFIX]: Fixed: http://forum.sqlitestudio.pl/viewtopic.php?f=4&t=3972 @@ -944,11 +998,11 @@ * [BUGFIX]: Result grid editing for table name with whitespace fixed. * [BUGFIX]: Fixed control-a shortcut for some edit fields. * [BUGFIX]: Keyboard/mouse input focus grabbing for some of modal dialogs fixed. - * [BUGFIX]: Handling of uncommited grid editions while closing MDI window. + * [BUGFIX]: Handling of uncommitted grid editions while closing MDI window. * [BUGFIX]: Handling of NOT NULL constraint used and no DEFAULT specified in table column editing dialog in case when table already contains some data filled in. * [BUGFIX]: Small grammar fixes in tips dialog. * [BUGFIX]: Font handling rewritten. Should not cause problems anymore, but if it does, then fixing will be now much easier. - * [BUGFIX]: Fixed 100% CPU usage for sequence: open 2 table windows, edit data cell in one window, then focus the other one window without commiting edition before. + * [BUGFIX]: Fixed 100% CPU usage for sequence: open 2 table windows, edit data cell in one window, then focus the other one window without committing edition before. * [BUGFIX]: Fixed MDI window placement, so they won't appear at exactly same position while creating anymore. * [BUGFIX]: Added DATETIME data type support. * [BUGFIX]: DEFAULT values handled properly. Now you can use functions and other expressions, as well as literal values. @@ -1052,7 +1106,7 @@ * [CHANGE]: There is a known bug that is not 100%-repeatable. It occurs sometimes when switching to FormView of table data. This change has added some additional logs to debug the bug. * [BUGFIX]: A very obvious bug included in beta5 - adding database dialog didn't disappear when database is added correctly. * [BUGFIX]: Fixed error while switching from standard BLOB editor to hexadecimal editor. - * [BUGFIX]: Fixed commiting new rows from FormView of table data. + * [BUGFIX]: Fixed committing new rows from FormView of table data. [1.0.0-beta5] * [ADDED]: Databases tree refresh button on toolbar and in View menu. @@ -1122,7 +1176,7 @@ * [BUGFIX]: ColorPicker handles incorrect colors passed to it and in that case it uses white color as default. * [BUGFIX]: ColorPicker handles HTML color editing much better then before. Now it might be impossible to break it. * [BUGFIX]: Better detection of operating system (fixed problems with Windows Vista and Windows 2000). - * [BUGFIX]: Fixed adding new row to table data grid when there was an error while commiting previous row. + * [BUGFIX]: Fixed adding new row to table data grid when there was an error while committing previous row. * [BUGFIX]: Shortcuts Ctrl+Left, Ctrl+Right, Ctrl+Shift+Left and Ctrl+Shift+Right are back! * [BUGFIX]: Detection of 'language changed' in configuration dialog fixed (it used to detect change even there was no change). * [BUGFIX]: Fixed active task changing while setting MDI windows in cascade layout, then pushing maximize button on some window other than the currently active. diff --git a/SQLiteStudio3/coreSQLiteStudio/Info.plist b/SQLiteStudio3/coreSQLiteStudio/Info.plist new file mode 100644 index 0000000..3ce6f15 --- /dev/null +++ b/SQLiteStudio3/coreSQLiteStudio/Info.plist @@ -0,0 +1,22 @@ + + + + + NSPrincipalClass + NSApplication + CFBundleIconFile + sqlitestudio.icns + CFBundlePackageType + APPL + CFBundleGetInfoString + SalSoft, %YEAR% + CFBundleSignature + ???? + CFBundleShortVersionString + %VERSION% + CFBundleExecutable + SQLiteStudio + CFBundleIdentifier + pl.com.salsoft.SQLiteStudio + + diff --git a/SQLiteStudio3/coreSQLiteStudio/TODO.txt b/SQLiteStudio3/coreSQLiteStudio/TODO.txt index 4faac9d..9e0a77d 100644 --- a/SQLiteStudio3/coreSQLiteStudio/TODO.txt +++ b/SQLiteStudio3/coreSQLiteStudio/TODO.txt @@ -11,8 +11,6 @@ cannot reproduce: - BLOB preview engine based on plugins - ERD plugin - DB compare plugin -- Foreign Key value suggestions in GridView -- Foreign Key previews in subframes - executing query with bind params - comments support in formatter @@ -20,7 +18,7 @@ cannot reproduce: - object names (columns, tables, etc) in dialogs should be validated against suffix/prefix whitespaces and if they appear, user should be asked for confirmation - small useful features: generating template queries from context menu for table/view, from data view. - code templates -- commiting DataView should be async +- committing DataView should be async - syntax checkers as services - per language - code assistants as services - per language - specialized validation of expressions for DEFAULT constraint. @@ -48,6 +46,7 @@ cannot reproduce: - constraints tab in table window should have toolbar for adding/editing/deleting constraints - add menu mnemonics support (underlined shortcut letters) - per column filtering field when clicked on column header(?) +- option to show current window's DB path in top window title CLI: - plugin management commands diff --git a/SQLiteStudio3/coreSQLiteStudio/committable.cpp b/SQLiteStudio3/coreSQLiteStudio/committable.cpp index 892437a..dd35244 100644 --- a/SQLiteStudio3/coreSQLiteStudio/committable.cpp +++ b/SQLiteStudio3/coreSQLiteStudio/committable.cpp @@ -27,15 +27,15 @@ bool Committable::canQuit() return true; } - QList uncommitedInstances; + QList uncommittedInstances; for (Committable* c : instances) { - if (c->isUncommited()) - uncommitedInstances << c; + if (c->isUncommitted()) + uncommittedInstances << c; } - if (uncommitedInstances.size() == 0) + if (uncommittedInstances.size() == 0) return true; - return confirmFunc(uncommitedInstances); + return confirmFunc(uncommittedInstances); } diff --git a/SQLiteStudio3/coreSQLiteStudio/committable.h b/SQLiteStudio3/coreSQLiteStudio/committable.h index cf1d48b..daa0f92 100644 --- a/SQLiteStudio3/coreSQLiteStudio/committable.h +++ b/SQLiteStudio3/coreSQLiteStudio/committable.h @@ -13,8 +13,8 @@ class API_EXPORT Committable Committable(); virtual ~Committable(); - virtual bool isUncommited() const = 0; - virtual QString getQuitUncommitedConfirmMessage() const = 0; + virtual bool isUncommitted() const = 0; + virtual QString getQuitUncommittedConfirmMessage() const = 0; static void init(ConfirmFunction confirmFunc); static bool canQuit(); diff --git a/SQLiteStudio3/coreSQLiteStudio/common/table.cpp b/SQLiteStudio3/coreSQLiteStudio/common/table.cpp index a9b0f16..20a9864 100644 --- a/SQLiteStudio3/coreSQLiteStudio/common/table.cpp +++ b/SQLiteStudio3/coreSQLiteStudio/common/table.cpp @@ -90,3 +90,33 @@ int qHash(AliasedTable table) { return qHash(table.getDatabase() + "." + table.getTable() + " " + table.getTableAlias()); } + +DbAndTable::DbAndTable() : + Table() +{ +} + +DbAndTable::DbAndTable(Db *db, const QString &database, const QString &table) : + Table(database, table), db(db) +{ +} + +DbAndTable::DbAndTable(const DbAndTable &other) : + Table(other), db(other.db) +{ +} + +int DbAndTable::operator ==(const DbAndTable &other) const +{ + return other.database == this->database && other.table == this->table && other.db == this->db; +} + +Db *DbAndTable::getDb() const +{ + return db; +} + +void DbAndTable::setDb(Db *value) +{ + db = value; +} diff --git a/SQLiteStudio3/coreSQLiteStudio/common/table.h b/SQLiteStudio3/coreSQLiteStudio/common/table.h index 5cc4570..5460148 100644 --- a/SQLiteStudio3/coreSQLiteStudio/common/table.h +++ b/SQLiteStudio3/coreSQLiteStudio/common/table.h @@ -4,6 +4,8 @@ #include "coreSQLiteStudio_global.h" #include +class Db; + class API_EXPORT Table { public: @@ -25,6 +27,22 @@ class API_EXPORT Table QString table; }; +class API_EXPORT DbAndTable : public Table +{ +public: + DbAndTable(); + DbAndTable(Db* db, const QString& database, const QString& table); + DbAndTable(const DbAndTable& other); + + int operator ==(const DbAndTable& other) const; + + Db *getDb() const; + void setDb(Db *value); + +protected: + Db* db = nullptr; +}; + class API_EXPORT AliasedTable : public Table { public: diff --git a/SQLiteStudio3/coreSQLiteStudio/common/utils.cpp b/SQLiteStudio3/coreSQLiteStudio/common/utils.cpp index 6cf1892..e3d2e47 100644 --- a/SQLiteStudio3/coreSQLiteStudio/common/utils.cpp +++ b/SQLiteStudio3/coreSQLiteStudio/common/utils.cpp @@ -694,6 +694,9 @@ QString getOsString() case QSysInfo::WV_WINDOWS8_1: os += " 8.1"; break; + case QSysInfo::WV_WINDOWS10: + os += " 10"; + break; case QSysInfo::WV_32s: case QSysInfo::WV_95: case QSysInfo::WV_98: @@ -707,6 +710,7 @@ QString getOsString() case QSysInfo::WV_CE_5: case QSysInfo::WV_CE_6: case QSysInfo::WV_CE_based: + case QSysInfo::WV_None: break; } #elif defined(Q_OS_LINUX) @@ -742,6 +746,12 @@ QString getOsString() case QSysInfo::MV_10_9: os += " 10.9 Mavericks"; break; + case QSysInfo::MV_10_10: + os += " 10.10 Yosemite"; + break; + case QSysInfo::MV_10_11: + os += " 10.11 El Capitan"; + break; case QSysInfo::MV_9: case QSysInfo::MV_10_0: case QSysInfo::MV_10_1: @@ -755,6 +765,13 @@ QString getOsString() case QSysInfo::MV_IOS_6_1: case QSysInfo::MV_IOS_7_0: case QSysInfo::MV_IOS_7_1: + case QSysInfo::MV_IOS_8_0: + case QSysInfo::MV_IOS_8_1: + case QSysInfo::MV_IOS_8_2: + case QSysInfo::MV_IOS_8_3: + case QSysInfo::MV_IOS_8_4: + case QSysInfo::MV_IOS_9_0: + case QSysInfo::MV_None: case QSysInfo::MV_Unknown: break; } @@ -899,9 +916,9 @@ QStringList concat(const QList& list) return result; } -QString doubleToString(double val) +QString doubleToString(const QVariant& val) { - return QString::number(val, 'g', 16); + return val.toString(); } void sortWithReferenceList(QList& listToSort, const QList& referenceList, Qt::CaseSensitivity cs) diff --git a/SQLiteStudio3/coreSQLiteStudio/common/utils.h b/SQLiteStudio3/coreSQLiteStudio/common/utils.h index 934e70a..c56a4db 100644 --- a/SQLiteStudio3/coreSQLiteStudio/common/utils.h +++ b/SQLiteStudio3/coreSQLiteStudio/common/utils.h @@ -87,6 +87,17 @@ int indexOf(const QList& list, std::function predicate) return -1; } +template +T* findFirst(const QList& list, std::function predicate) +{ + for (T* item : list) + { + if (predicate(item)) + return item; + } + return nullptr; +} + /** * @brief Returns only those elements from the list, which passed the filter. * @tparam T type for which the filter will be applied for. It should match the type in the list and in the function argument. @@ -231,7 +242,7 @@ API_EXPORT bool renameBetweenPartitions(const QString& src, const QString& dst); API_EXPORT bool isWritableRecursively(const QString& dir); API_EXPORT QString encryptRsa(const QString& input, const QString& modulus, const QString& exponent); API_EXPORT QString decryptRsa(const QString& input, const QString& modulus, const QString& exponent); -API_EXPORT QString doubleToString(double val); +API_EXPORT QString doubleToString(const QVariant& val); /** * @brief Sorts string list using reference list for ordering. diff --git a/SQLiteStudio3/coreSQLiteStudio/common/utils_sql.cpp b/SQLiteStudio3/coreSQLiteStudio/common/utils_sql.cpp index 5c7e7e9..ad37ff0 100644 --- a/SQLiteStudio3/coreSQLiteStudio/common/utils_sql.cpp +++ b/SQLiteStudio3/coreSQLiteStudio/common/utils_sql.cpp @@ -4,6 +4,7 @@ #include "parser/token.h" #include "parser/lexer.h" #include "parser/keywords.h" +#include "log.h" #include #include #include @@ -368,11 +369,23 @@ QString removeComments(const QString& value) return tokens.detokenize(); } +void splitQueriesUpdateCaseWhenDepth(Token::Type type, const QString& value, int& caseWhenDepth) +{ + if (type != Token::KEYWORD) + return; + + if (value == "CASE") + caseWhenDepth++; + else if (value == "END" && caseWhenDepth > 0) + caseWhenDepth--; +} + QList splitQueries(const TokenList& tokenizedQuery, bool* complete) { QList queries; TokenList currentQueryTokens; QString value; + int caseWhenDepth = 0; int createTriggerMeter = 0; bool insideTrigger = false; bool completeQuery = false; @@ -384,16 +397,19 @@ QList splitQueries(const TokenList& tokenizedQuery, bool* complete) if (insideTrigger) { - if (token->type == Token::KEYWORD && value == "END") + if (token->type == Token::KEYWORD && value == "END" && caseWhenDepth <= 0 && caseWhenDepth == 0) { insideTrigger = false; completeQuery = true; } currentQueryTokens << token; + splitQueriesUpdateCaseWhenDepth(token->type, value, caseWhenDepth); continue; } + splitQueriesUpdateCaseWhenDepth(token->type, value, caseWhenDepth); + if (token->type == Token::KEYWORD) { if (value == "CREATE" || value == "TRIGGER" || value == "BEGIN") @@ -407,6 +423,7 @@ QList splitQueries(const TokenList& tokenizedQuery, bool* complete) else if (token->type == Token::OPERATOR && value == ";") { createTriggerMeter = 0; + caseWhenDepth = 0; currentQueryTokens << token; queries << currentQueryTokens; currentQueryTokens.clear(); @@ -427,9 +444,114 @@ QList splitQueries(const TokenList& tokenizedQuery, bool* complete) return queries; } -QStringList splitQueries(const QString& sql, Dialect dialect, bool keepEmptyQueries, bool* complete) +QStringList quickSplitQueries(const QString& sql, bool keepEmptyQueries, bool removeComments) +{ + QChar c; + bool inString = false; + bool inMultiLineComment = false; + bool inSingleLineComment = false; + QStringList queries; + QString query; + QString trimmed; + for (int i = 0, total = sql.size(); i < total; ++i) + { + c = sql[i]; + + // String + if (inString) + { + query += c; + if (c == '\'') + { + inString = false; + } + continue; + } + + // One-line comment + if (inSingleLineComment) + { + if (!removeComments) + query += c; + + if (c == '\r' && (i + 1) < total && sql[i+1] == '\n') + { + if (!removeComments) + query += '\n'; + + i++; + inSingleLineComment = false; + } + else if (c == '\n' || c == '\r') + inSingleLineComment = false; + + continue; + } + + // Multi-line comment + if (inMultiLineComment) + { + if (!removeComments) + query += c; + + if (c == '*' && (i + 1) < total && sql[i+1] == '/') + { + if (!removeComments) + query += '/'; + + i++; + inMultiLineComment = false; + } + + continue; + } + + // Everything rest + if (c == '\'') + { + query += c; + inString = true; + } + else if (c == '-' && (i + 1) < total && sql[i+1] == '-') + { + inSingleLineComment = true; + i++; + if (!removeComments) + query += "--"; + } + else if (c == '/' && (i + 1) < total && sql[i+1] == '*') + { + inMultiLineComment = true; + i++; + if (!removeComments) + query += "/*"; + } + else if (c == ';') + { + query += c; + if (keepEmptyQueries || (!(trimmed = query.trimmed()).isEmpty() && trimmed != ";")) + queries << query; + + query.clear(); + } + else + { + query += c; + } + } + + if (!query.isNull() && (!(trimmed = query.trimmed()).isEmpty() && trimmed != ";")) + queries << query; + + return queries; +} + +QStringList splitQueries(const QString& sql, Dialect dialect, bool keepEmptyQueries, bool removeComments, bool* complete) { TokenList tokens = Lexer::tokenize(sql, dialect); + if (removeComments) + tokens = tokens.filterOut(Token::COMMENT); + QList tokenizedQueries = splitQueries(tokens, complete); QString query; @@ -437,7 +559,7 @@ QStringList splitQueries(const QString& sql, Dialect dialect, bool keepEmptyQuer foreach (const TokenList& queryTokens, tokenizedQueries) { query = queryTokens.detokenize(); - if (keepEmptyQueries || !query.trimmed().isEmpty()) + if (keepEmptyQueries || (!query.trimmed().isEmpty() && query.trimmed() != ";")) queries << query; } @@ -452,7 +574,7 @@ QString getQueryWithPosition(const QStringList& queries, int position, int* star if (startPos) *startPos = 0; - foreach (const QString& query, queries) + for (const QString& query : queries) { length = query.length(); if (position >= currentPos && position < currentPos+length) @@ -479,9 +601,9 @@ QString getQueryWithPosition(const QStringList& queries, int position, int* star return QString::null; } -QString getQueryWithPosition(const QString& queries, int position, Dialect dialect, int* startPos) +QString getQueryWithPosition(const QString& queries, int position, int* startPos) { - QStringList queryList = splitQueries(queries, dialect); + QStringList queryList = quickSplitQueries(queries); return getQueryWithPosition(queryList, position, startPos); } @@ -665,7 +787,7 @@ QStringList valueListToSqlList(const QVariantList& values, Dialect dialect) argList << value.toString(); break; case QVariant::Double: - argList << doubleToString(value.toDouble()); + argList << doubleToString(value); break; case QVariant::Bool: argList << QString::number(value.toInt()); @@ -694,3 +816,14 @@ QStringList wrapStrings(const QStringList& strList) return list; } + +QString trimQueryEnd(const QString &query) +{ + QString q = query.trimmed(); + while (q.endsWith(";")) + { + q.chop(1); + q = q.trimmed(); + } + return q; +} diff --git a/SQLiteStudio3/coreSQLiteStudio/common/utils_sql.h b/SQLiteStudio3/coreSQLiteStudio/common/utils_sql.h index ceccea0..1da3108 100644 --- a/SQLiteStudio3/coreSQLiteStudio/common/utils_sql.h +++ b/SQLiteStudio3/coreSQLiteStudio/common/utils_sql.h @@ -67,9 +67,10 @@ API_EXPORT bool isSystemTable(const QString& name); API_EXPORT bool isSystemIndex(const QString& name, Dialect dialect); API_EXPORT QString removeComments(const QString& value); API_EXPORT QList splitQueries(const TokenList& tokenizedQueries, bool* complete = nullptr); -API_EXPORT QStringList splitQueries(const QString& sql, Dialect dialect, bool keepEmptyQueries = true, bool* complete = nullptr); +API_EXPORT QStringList splitQueries(const QString& sql, Dialect dialect, bool keepEmptyQueries = true, bool removeComments = false, bool* complete = nullptr); +API_EXPORT QStringList quickSplitQueries(const QString& sql, bool keepEmptyQueries = true, bool removeComments = false); API_EXPORT QString getQueryWithPosition(const QStringList& queries, int position, int* startPos = nullptr); -API_EXPORT QString getQueryWithPosition(const QString& queries, int position, Dialect dialect, int* startPos = nullptr); +API_EXPORT QString getQueryWithPosition(const QString& queries, int position, int* startPos = nullptr); API_EXPORT QList getQueriesWithParamNames(const QString& query, Dialect dialect); API_EXPORT QList getQueriesWithParamCount(const QString& query, Dialect dialect); API_EXPORT QueryWithParamNames getQueryWithParamNames(const QString& query, Dialect dialect); @@ -79,6 +80,7 @@ API_EXPORT QString commentAllSqlLines(const QString& sql); API_EXPORT QString getBindTokenName(const TokenPtr& token); API_EXPORT QueryAccessMode getQueryAccessMode(const QString& query, Dialect dialect, bool* isSelect = nullptr); API_EXPORT QStringList valueListToSqlList(const QList& values, Dialect dialect); +API_EXPORT QString trimQueryEnd(const QString& query); #endif // UTILS_SQL_H diff --git a/SQLiteStudio3/coreSQLiteStudio/completionhelper.cpp b/SQLiteStudio3/coreSQLiteStudio/completionhelper.cpp index 528df73..aae4a60 100644 --- a/SQLiteStudio3/coreSQLiteStudio/completionhelper.cpp +++ b/SQLiteStudio3/coreSQLiteStudio/completionhelper.cpp @@ -1032,7 +1032,7 @@ void CompletionHelper::parseFullSql() QString sql = fullSql; // Selecting query at cursor position - QString query = getQueryWithPosition(sql, cursorPosition, dialect); + QString query = getQueryWithPosition(sql, cursorPosition); // Token list of the query. Also useful, not only parsed query. queryTokens = Lexer::tokenize(query, dialect); @@ -1051,7 +1051,7 @@ void CompletionHelper::parseFullSql() // Second try - handling open parenthesis for expr (which could not be handled by the grammar, because of bug #2755) parser.setLemonDebug(false); // avoid spamming with lemon debug QString truncatedSql = sql.left(cursorPosition); - query = getQueryWithPosition(truncatedSql, cursorPosition, dialect); + query = getQueryWithPosition(truncatedSql, cursorPosition); query += ");"; if (tryToParse(&parser, query)) diff --git a/SQLiteStudio3/coreSQLiteStudio/config_builder/cfgcategory.cpp b/SQLiteStudio3/coreSQLiteStudio/config_builder/cfgcategory.cpp index 1a63776..a5c661e 100644 --- a/SQLiteStudio3/coreSQLiteStudio/config_builder/cfgcategory.cpp +++ b/SQLiteStudio3/coreSQLiteStudio/config_builder/cfgcategory.cpp @@ -24,6 +24,11 @@ CfgCategory::CfgCategory(const QString &name, const QString &title) : lastCreatedCfgMain->childs[name] = this; } +CfgEntry *CfgCategory::getEntryByName(const QString& name) +{ + return childs[name]; +} + QString CfgCategory::toString() const { return name; diff --git a/SQLiteStudio3/coreSQLiteStudio/config_builder/cfgcategory.h b/SQLiteStudio3/coreSQLiteStudio/config_builder/cfgcategory.h index 45197d6..4b4aaac 100644 --- a/SQLiteStudio3/coreSQLiteStudio/config_builder/cfgcategory.h +++ b/SQLiteStudio3/coreSQLiteStudio/config_builder/cfgcategory.h @@ -20,6 +20,7 @@ class API_EXPORT CfgCategory : public QObject CfgCategory(const CfgCategory& other); CfgCategory(const QString& name, const QString& title); + CfgEntry* getEntryByName(const QString &name); QString toString() const; operator QString() const; QHash& getEntries(); diff --git a/SQLiteStudio3/coreSQLiteStudio/config_builder/cfgmain.cpp b/SQLiteStudio3/coreSQLiteStudio/config_builder/cfgmain.cpp index 480b4cc..fb7d199 100644 --- a/SQLiteStudio3/coreSQLiteStudio/config_builder/cfgmain.cpp +++ b/SQLiteStudio3/coreSQLiteStudio/config_builder/cfgmain.cpp @@ -1,6 +1,7 @@ #include "cfgmain.h" #include "config_builder/cfgcategory.h" #include "config_builder/cfgentry.h" +#include "common/global.h" CfgMain* lastCreatedCfgMain = nullptr; QList* CfgMain::instances = nullptr; @@ -50,6 +51,36 @@ QList CfgMain::getPersistableInstances() return list; } +CfgCategory* CfgMain::getCategoryByName(const QString &name) +{ + for (CfgMain* cfg : getInstances()) + { + if (!cfg->childs.contains(name)) + continue; + + return cfg->childs[name]; + } + return nullptr; +} + +CfgEntry *CfgMain::getEntryByName(const QString &categoryName, const QString &name) +{ + CfgCategory* cat = getCategoryByName(categoryName); + if (!cat) + return nullptr; + + return cat->getEntryByName(name); +} + +CfgEntry *CfgMain::getEntryByPath(const QString &path) +{ + QStringList sp = path.split("."); + if (sp.size() != 2) + return nullptr; + + return getEntryByName(sp[0], sp[1]); +} + QHash &CfgMain::getCategories() { return childs; @@ -101,6 +132,27 @@ void CfgMain::rollback() restore(); } +QStringList CfgMain::getPaths() const +{ + static_qstring(tpl, "%1.%2"); + QStringList paths; + for (CfgCategory* cat : childs.values()) + { + for (const QString& entry : cat->getEntries().keys()) + paths << tpl.arg(cat->toString(), entry); + } + return paths; +} + +QList CfgMain::getEntries() const +{ + QList entries; + for (CfgCategory* cat : childs.values()) + entries += cat->getEntries().values(); + + return entries; +} + bool CfgMain::isPersistable() const { return persistable; diff --git a/SQLiteStudio3/coreSQLiteStudio/config_builder/cfgmain.h b/SQLiteStudio3/coreSQLiteStudio/config_builder/cfgmain.h index d42f03b..ea11c6d 100644 --- a/SQLiteStudio3/coreSQLiteStudio/config_builder/cfgmain.h +++ b/SQLiteStudio3/coreSQLiteStudio/config_builder/cfgmain.h @@ -8,6 +8,7 @@ #include class CfgCategory; +class CfgEntry; class API_EXPORT CfgMain { @@ -20,6 +21,9 @@ class API_EXPORT CfgMain static void staticInit(); static QList getInstances(); static QList getPersistableInstances(); + static CfgCategory* getCategoryByName(const QString& name); + static CfgEntry* getEntryByName(const QString& categoryName, const QString& name); + static CfgEntry* getEntryByPath(const QString& path); QHash& getCategories(); void translateTitle(); @@ -30,6 +34,8 @@ class API_EXPORT CfgMain void begin(); void commit(); void rollback(); + QStringList getPaths() const; + QList getEntries() const; bool isPersistable() const; QString getName() const; diff --git a/SQLiteStudio3/coreSQLiteStudio/coreSQLiteStudio.pro b/SQLiteStudio3/coreSQLiteStudio/coreSQLiteStudio.pro index 59da902..8c3c21a 100644 --- a/SQLiteStudio3/coreSQLiteStudio/coreSQLiteStudio.pro +++ b/SQLiteStudio3/coreSQLiteStudio/coreSQLiteStudio.pro @@ -1,465 +1,473 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2013-02-28T23:00:28 -# -#------------------------------------------------- - -include($$PWD/../dirs.pri) -include($$PWD/../utils.pri) - -OBJECTS_DIR = $$OBJECTS_DIR/coreSQLiteStudio -MOC_DIR = $$MOC_DIR/coreSQLiteStudio -UI_DIR = $$UI_DIR/coreSQLiteStudio - -QT -= gui -QT += script network - -TARGET = coreSQLiteStudio -TEMPLATE = lib - -win32 { - LIBS += -lpsapi $$PWD/../../../lib/libquazip.a - LIBS += -limagehlp - - THE_FILE = $$PWD/qt.conf - THE_DEST = $${DESTDIR} - THE_FILE ~= s,/,\\,g - THE_DEST ~= s,/,\\,g - QMAKE_POST_LINK += $$QMAKE_COPY $$THE_FILE $$THE_DEST $$escape_expand(\\n\\t) -} - -linux: { - DEFINES += SYS_PLUGINS_DIR=$$LIBDIR/sqlitestudio - portable: { - DESTDIR = $$DESTDIR/lib - } -} - -macx: { - out_file = $$DESTDIR/lib $$TARGET .dylib - QMAKE_POST_LINK += install_name_tool -change libsqlite3.dylib @loader_path/../Frameworks/libsqlite3.dylib $$join(out_file) -} - -LIBS += -lsqlite3 - -DEFINES += CORESQLITESTUDIO_LIBRARY - -portable { - DEFINES += PORTABLE_CONFIG -} - -CONFIG += c++11 -QMAKE_CXXFLAGS += -pedantic - -TRANSLATIONS += translations/coreSQLiteStudio_it.ts \ - translations/coreSQLiteStudio_zh_CN.ts \ - translations/coreSQLiteStudio_sk.ts \ - translations/coreSQLiteStudio_de.ts \ - translations/coreSQLiteStudio_ru.ts \ - translations/coreSQLiteStudio_pt_BR.ts \ - translations/coreSQLiteStudio_fr.ts \ - translations/coreSQLiteStudio_es.ts \ - translations/coreSQLiteStudio_pl.ts - -SOURCES += sqlitestudio.cpp \ - returncode.cpp \ - services/config.cpp \ - common/nulldevice.cpp \ - parser/lexer_low_lev.cpp \ - common/utils.cpp \ - parser/keywords.cpp \ - common/utils_sql.cpp \ - parser/token.cpp \ - parser/lexer.cpp \ - parser/sqlite3_parse.cpp \ - parser/parsercontext.cpp \ - parser/parser.cpp \ - parser/sqlite2_parse.cpp \ - parser/ast/sqlitestatement.cpp \ - parser/ast/sqlitequery.cpp \ - parser/ast/sqlitealtertable.cpp \ - parser/ast/sqliteanalyze.cpp \ - parser/ast/sqlitebegintrans.cpp \ - parser/ast/sqlitecommittrans.cpp \ - parser/ast/sqlitecreateindex.cpp \ - parser/ast/sqlitecreatetable.cpp \ - parser/ast/sqlitecreatetrigger.cpp \ - parser/ast/sqlitecreateview.cpp \ - parser/ast/sqlitecreatevirtualtable.cpp \ - parser/ast/sqlitedelete.cpp \ - parser/ast/sqlitedetach.cpp \ - parser/ast/sqlitedroptable.cpp \ - parser/ast/sqlitedroptrigger.cpp \ - parser/ast/sqlitedropindex.cpp \ - parser/ast/sqlitedropview.cpp \ - parser/ast/sqliteinsert.cpp \ - parser/ast/sqlitepragma.cpp \ - parser/ast/sqlitereindex.cpp \ - parser/ast/sqlitesavepoint.cpp \ - parser/ast/sqliterelease.cpp \ - parser/ast/sqliterollback.cpp \ - parser/ast/sqliteselect.cpp \ - parser/ast/sqliteupdate.cpp \ - parser/ast/sqlitevacuum.cpp \ - parser/ast/sqlitecopy.cpp \ - parser/ast/sqliteemptyquery.cpp \ - parser/parser_helper_stubs.cpp \ - parser/ast/sqliteexpr.cpp \ - parser/ast/sqliteforeignkey.cpp \ - parser/ast/sqliteindexedcolumn.cpp \ - parser/ast/sqlitecolumntype.cpp \ - parser/ast/sqliteconflictalgo.cpp \ - parser/ast/sqlitesortorder.cpp \ - parser/ast/sqliteraise.cpp \ - parser/ast/sqliteorderby.cpp \ - parser/ast/sqlitelimit.cpp \ - parser/ast/sqliteattach.cpp \ - parser/parsererror.cpp \ - selectresolver.cpp \ - schemaresolver.cpp \ - parser/ast/sqlitequerytype.cpp \ - db/db.cpp \ - services/dbmanager.cpp \ - db/sqlresultsrow.cpp \ - db/asyncqueryrunner.cpp \ - completionhelper.cpp \ - completioncomparer.cpp \ - db/queryexecutor.cpp \ - qio.cpp \ - plugins/pluginsymbolresolver.cpp \ - db/sqlerrorresults.cpp \ - db/queryexecutorsteps/queryexecutorstep.cpp \ - db/queryexecutorsteps/queryexecutorcountresults.cpp \ - db/queryexecutorsteps/queryexecutorparsequery.cpp \ - db/queryexecutorsteps/queryexecutorexecute.cpp \ - db/queryexecutorsteps/queryexecutorattaches.cpp \ - db/queryexecutorsteps/queryexecutoraddrowids.cpp \ - db/queryexecutorsteps/queryexecutorlimit.cpp \ - db/queryexecutorsteps/queryexecutorcolumns.cpp \ - db/queryexecutorsteps/queryexecutorcellsize.cpp \ - db/queryexecutorsteps/queryexecutororder.cpp \ - db/sqlerrorcodes.cpp \ - common/readwritelocker.cpp \ - db/queryexecutorsteps/queryexecutorwrapdistinctresults.cpp \ - csvformat.cpp \ - csvserializer.cpp \ - db/queryexecutorsteps/queryexecutordatasources.cpp \ - expectedtoken.cpp \ - sqlhistorymodel.cpp \ - db/queryexecutorsteps/queryexecutorexplainmode.cpp \ - services/notifymanager.cpp \ - parser/statementtokenbuilder.cpp \ - parser/ast/sqlitedeferrable.cpp \ - tablemodifier.cpp \ - db/chainexecutor.cpp \ - db/queryexecutorsteps/queryexecutorreplaceviews.cpp \ - services/codeformatter.cpp \ - viewmodifier.cpp \ - log.cpp \ - plugins/plugintype.cpp \ - plugins/genericplugin.cpp \ - common/memoryusage.cpp \ - ddlhistorymodel.cpp \ - datatype.cpp \ - common/table.cpp \ - common/column.cpp \ - dbattacher.cpp \ - services/functionmanager.cpp \ - plugins/scriptingqt.cpp \ - services/impl/configimpl.cpp \ - services/impl/dbmanagerimpl.cpp \ - db/abstractdb.cpp \ - services/impl/functionmanagerimpl.cpp \ - services/impl/pluginmanagerimpl.cpp \ - impl/dbattacherimpl.cpp \ - db/dbsqlite3.cpp \ - plugins/dbpluginsqlite3.cpp \ - parser/ast/sqlitewith.cpp \ - services/impl/collationmanagerimpl.cpp \ - services/exportmanager.cpp \ - exportworker.cpp \ - plugins/scriptingsql.cpp \ - db/queryexecutorsteps/queryexecutordetectschemaalter.cpp \ - querymodel.cpp \ - plugins/genericexportplugin.cpp \ - dbobjectorganizer.cpp \ - db/attachguard.cpp \ - db/invaliddb.cpp \ - dbversionconverter.cpp \ - diff/diff_match_patch.cpp \ - db/sqlquery.cpp \ - db/queryexecutorsteps/queryexecutorvaluesmode.cpp \ - services/importmanager.cpp \ - importworker.cpp \ - services/populatemanager.cpp \ - pluginservicebase.cpp \ - populateworker.cpp \ - plugins/populatesequence.cpp \ - plugins/populaterandom.cpp \ - plugins/populaterandomtext.cpp \ - plugins/populateconstant.cpp \ - plugins/populatedictionary.cpp \ - plugins/populatescript.cpp \ - plugins/builtinplugin.cpp \ - plugins/scriptingqtdbproxy.cpp \ - plugins/sqlformatterplugin.cpp \ - services/bugreporter.cpp \ - services/updatemanager.cpp \ - config_builder/cfgmain.cpp \ - config_builder/cfgcategory.cpp \ - config_builder/cfgentry.cpp \ - config_builder/cfglazyinitializer.cpp \ - committable.cpp \ - services/extralicensemanager.cpp \ - tsvserializer.cpp \ - rsa/BigInt.cpp \ - rsa/Key.cpp \ - rsa/KeyPair.cpp \ - rsa/PrimeGenerator.cpp \ - rsa/RSA.cpp \ - translations.cpp \ - common/signalwait.cpp \ - common/blockingsocket.cpp \ - common/threadwitheventloop.cpp \ - common/private/blockingsocketprivate.cpp \ - querygenerator.cpp \ - common/bistrhash.cpp - -HEADERS += sqlitestudio.h\ - coreSQLiteStudio_global.h \ - returncode.h \ - services/config.h \ - common/nulldevice.h \ - parser/lexer_low_lev.h \ - common/utils.h \ - parser/keywords.h \ - parser/token.h \ - common/utils_sql.h \ - parser/lexer.h \ - parser/sqlite3_parse.h \ - parser/parsercontext.h \ - parser/parser.h \ - parser/sqlite2_parse.h \ - parser/ast/sqlitestatement.h \ - parser/ast/sqlitequery.h \ - parser/ast/sqlitealtertable.h \ - parser/ast/sqliteanalyze.h \ - parser/ast/sqlitebegintrans.h \ - parser/ast/sqlitecommittrans.h \ - parser/ast/sqlitecreateindex.h \ - parser/ast/sqlitecreatetable.h \ - parser/ast/sqlitecreatetrigger.h \ - parser/ast/sqlitecreateview.h \ - parser/ast/sqlitecreatevirtualtable.h \ - parser/ast/sqlitedelete.h \ - parser/ast/sqlitedetach.h \ - parser/ast/sqlitedroptable.h \ - parser/ast/sqlitedroptrigger.h \ - parser/ast/sqlitedropindex.h \ - parser/ast/sqlitedropview.h \ - parser/ast/sqliteinsert.h \ - parser/ast/sqlitepragma.h \ - parser/ast/sqlitereindex.h \ - parser/ast/sqlitesavepoint.h \ - parser/ast/sqliterelease.h \ - parser/ast/sqliterollback.h \ - parser/ast/sqliteselect.h \ - parser/ast/sqliteupdate.h \ - parser/ast/sqlitevacuum.h \ - parser/ast/sqlitecopy.h \ - parser/ast/sqlitequerytype.h \ - parser/ast/sqliteemptyquery.h \ - parser/parser_helper_stubs.h \ - parser/ast/sqliteconflictalgo.h \ - parser/ast/sqliteexpr.h \ - parser/ast/sqliteforeignkey.h \ - parser/ast/sqliteindexedcolumn.h \ - parser/ast/sqlitecolumntype.h \ - parser/ast/sqlitesortorder.h \ - parser/ast/sqlitedeferrable.h \ - parser/ast/sqliteraise.h \ - parser/ast/sqliteorderby.h \ - parser/ast/sqlitelimit.h \ - parser/ast/sqliteattach.h \ - parser/parsererror.h \ - common/objectpool.h \ - selectresolver.h \ - schemaresolver.h \ - dialect.h \ - db/db.h \ - services/dbmanager.h \ - db/sqlresultsrow.h \ - db/asyncqueryrunner.h \ - completionhelper.h \ - expectedtoken.h \ - completioncomparer.h \ - plugins/dbplugin.h \ - services/pluginmanager.h \ - db/queryexecutor.h \ - qio.h \ - db/dbpluginoption.h \ - common/global.h \ - parser/ast/sqlitetablerelatedddl.h \ - plugins/pluginsymbolresolver.h \ - db/sqlerrorresults.h \ - db/sqlerrorcodes.h \ - db/queryexecutorsteps/queryexecutorstep.h \ - db/queryexecutorsteps/queryexecutorcountresults.h \ - db/queryexecutorsteps/queryexecutorparsequery.h \ - db/queryexecutorsteps/queryexecutorexecute.h \ - db/queryexecutorsteps/queryexecutorattaches.h \ - db/queryexecutorsteps/queryexecutoraddrowids.h \ - db/queryexecutorsteps/queryexecutorlimit.h \ - db/queryexecutorsteps/queryexecutorcolumns.h \ - db/queryexecutorsteps/queryexecutorcellsize.h \ - common/unused.h \ - db/queryexecutorsteps/queryexecutororder.h \ - common/readwritelocker.h \ - db/queryexecutorsteps/queryexecutorwrapdistinctresults.h \ - csvformat.h \ - csvserializer.h \ - db/queryexecutorsteps/queryexecutordatasources.h \ - sqlhistorymodel.h \ - db/queryexecutorsteps/queryexecutorexplainmode.h \ - services/notifymanager.h \ - parser/statementtokenbuilder.h \ - tablemodifier.h \ - db/chainexecutor.h \ - db/queryexecutorsteps/queryexecutorreplaceviews.h \ - plugins/sqlformatterplugin.h \ - services/codeformatter.h \ - viewmodifier.h \ - log.h \ - plugins/plugintype.h \ - plugins/plugin.h \ - plugins/genericplugin.h \ - common/memoryusage.h \ - ddlhistorymodel.h \ - datatype.h \ - plugins/generalpurposeplugin.h \ - common/table.h \ - common/column.h \ - common/bihash.h \ - common/strhash.h \ - dbattacher.h \ - common/bistrhash.h \ - services/functionmanager.h \ - common/sortedhash.h \ - plugins/scriptingplugin.h \ - plugins/scriptingqt.h \ - services/impl/configimpl.h \ - services/impl/dbmanagerimpl.h \ - db/abstractdb.h \ - services/impl/functionmanagerimpl.h \ - services/impl/pluginmanagerimpl.h \ - impl/dbattacherimpl.h \ - db/abstractdb3.h \ - db/dbsqlite3.h \ - plugins/dbpluginsqlite3.h \ - db/abstractdb2.h \ - parser/ast/sqlitewith.h \ - services/collationmanager.h \ - services/impl/collationmanagerimpl.h \ - plugins/exportplugin.h \ - config_builder.h \ - services/exportmanager.h \ - exportworker.h \ - plugins/scriptingsql.h \ - db/queryexecutorsteps/queryexecutordetectschemaalter.h \ - querymodel.h \ - plugins/genericexportplugin.h \ - dbobjectorganizer.h \ - db/attachguard.h \ - interruptable.h \ - db/invaliddb.h \ - dbversionconverter.h \ - diff/diff_match_patch.h \ - db/sqlquery.h \ - dbobjecttype.h \ - db/queryexecutorsteps/queryexecutorvaluesmode.h \ - plugins/importplugin.h \ - services/importmanager.h \ - importworker.h \ - plugins/populateplugin.h \ - services/populatemanager.h \ - pluginservicebase.h \ - populateworker.h \ - plugins/populatesequence.h \ - plugins/populaterandom.h \ - plugins/populaterandomtext.h \ - plugins/populateconstant.h \ - plugins/populatedictionary.h \ - plugins/populatescript.h \ - plugins/builtinplugin.h \ - plugins/scriptingqtdbproxy.h \ - plugins/codeformatterplugin.h \ - services/bugreporter.h \ - services/updatemanager.h \ - config_builder/cfgmain.h \ - config_builder/cfgcategory.h \ - config_builder/cfgentry.h \ - config_builder/cfglazyinitializer.h \ - plugins/confignotifiableplugin.h \ - committable.h \ - plugins/uiconfiguredplugin.h \ - services/extralicensemanager.h \ - db/stdsqlite3driver.h \ - tsvserializer.h \ - rsa/BigInt.h \ - rsa/Key.h \ - rsa/KeyPair.h \ - rsa/PrimeGenerator.h \ - rsa/RSA.h \ - translations.h \ - common/signalwait.h \ - common/blockingsocket.h \ - common/threadwitheventloop.h \ - common/private/blockingsocketprivate.h \ - common/expiringcache.h \ - parser/ast/sqliteddlwithdbcontext.h \ - parser/ast/sqliteextendedindexedcolumn.h \ - querygenerator.h \ - common/sortedset.h - -unix: { - target.path = $$LIBDIR - INSTALLS += target -} - -OTHER_FILES += \ - parser/lempar.c \ - parser/sqlite3_parse.y \ - parser/sqlite2_parse.y \ - parser/run_lemon.sh \ - TODO.txt \ - licenses/fugue_icons.txt \ - licenses/qhexedit.txt \ - licenses/sqlitestudio_license.txt \ - licenses/lgpl.txt \ - licenses/diff_match.txt \ - licenses/gpl.txt \ - ChangeLog.txt \ - qt.conf - -FORMS += \ - plugins/populatesequence.ui \ - plugins/populaterandom.ui \ - plugins/populaterandomtext.ui \ - plugins/populateconstant.ui \ - plugins/populatedictionary.ui \ - plugins/populatescript.ui - -RESOURCES += \ - coresqlitestudio.qrc - - - - - - - - - - - - +#------------------------------------------------- +# +# Project created by QtCreator 2013-02-28T23:00:28 +# +#------------------------------------------------- + +include($$PWD/../dirs.pri) +include($$PWD/../utils.pri) + +OBJECTS_DIR = $$OBJECTS_DIR/coreSQLiteStudio +MOC_DIR = $$MOC_DIR/coreSQLiteStudio +UI_DIR = $$UI_DIR/coreSQLiteStudio + +QT -= gui +QT += script network + +TARGET = coreSQLiteStudio +TEMPLATE = lib + +win32 { + LIBS += -lpsapi $$PWD/../../../lib/libquazip.a + LIBS += -limagehlp + + THE_FILE = $$PWD/qt.conf + THE_DEST = $${DESTDIR} + THE_FILE ~= s,/,\\,g + THE_DEST ~= s,/,\\,g + QMAKE_POST_LINK += $$QMAKE_COPY $$THE_FILE $$THE_DEST $$escape_expand(\\n\\t) +} + +linux: { + DEFINES += SYS_PLUGINS_DIR=$$LIBDIR/sqlitestudio + portable: { + DESTDIR = $$DESTDIR/lib + } +} + +macx: { + out_file = $$DESTDIR/lib $$TARGET .dylib + QMAKE_POST_LINK += install_name_tool -change libsqlite3.dylib @loader_path/../Frameworks/libsqlite3.dylib $$join(out_file) + QMAKE_POST_LINK += ; $$QMAKE_MKDIR $$DESTDIR/SQLiteStudio.app + QMAKE_POST_LINK += ; $$QMAKE_MKDIR $$DESTDIR/SQLiteStudio.app/Contents + QMAKE_POST_LINK += ; $$QMAKE_COPY $$PWD/Info.plist $$DESTDIR/SQLiteStudio.app/Contents +} + +LIBS += -lsqlite3 + +DEFINES += CORESQLITESTUDIO_LIBRARY + +portable { + DEFINES += PORTABLE_CONFIG +} + +CONFIG += c++11 +QMAKE_CXXFLAGS += -pedantic + +TRANSLATIONS += translations/coreSQLiteStudio_de.ts \ + translations/coreSQLiteStudio_it.ts \ + translations/coreSQLiteStudio_zh_CN.ts \ + translations/coreSQLiteStudio_sk.ts \ + translations/coreSQLiteStudio_ru.ts \ + translations/coreSQLiteStudio_pt_BR.ts \ + translations/coreSQLiteStudio_fr.ts \ + translations/coreSQLiteStudio_es.ts \ + translations/coreSQLiteStudio_pl.ts + +SOURCES += sqlitestudio.cpp \ + returncode.cpp \ + services/config.cpp \ + common/nulldevice.cpp \ + parser/lexer_low_lev.cpp \ + common/utils.cpp \ + parser/keywords.cpp \ + common/utils_sql.cpp \ + parser/token.cpp \ + parser/lexer.cpp \ + parser/sqlite3_parse.cpp \ + parser/parsercontext.cpp \ + parser/parser.cpp \ + parser/sqlite2_parse.cpp \ + parser/ast/sqlitestatement.cpp \ + parser/ast/sqlitequery.cpp \ + parser/ast/sqlitealtertable.cpp \ + parser/ast/sqliteanalyze.cpp \ + parser/ast/sqlitebegintrans.cpp \ + parser/ast/sqlitecommittrans.cpp \ + parser/ast/sqlitecreateindex.cpp \ + parser/ast/sqlitecreatetable.cpp \ + parser/ast/sqlitecreatetrigger.cpp \ + parser/ast/sqlitecreateview.cpp \ + parser/ast/sqlitecreatevirtualtable.cpp \ + parser/ast/sqlitedelete.cpp \ + parser/ast/sqlitedetach.cpp \ + parser/ast/sqlitedroptable.cpp \ + parser/ast/sqlitedroptrigger.cpp \ + parser/ast/sqlitedropindex.cpp \ + parser/ast/sqlitedropview.cpp \ + parser/ast/sqliteinsert.cpp \ + parser/ast/sqlitepragma.cpp \ + parser/ast/sqlitereindex.cpp \ + parser/ast/sqlitesavepoint.cpp \ + parser/ast/sqliterelease.cpp \ + parser/ast/sqliterollback.cpp \ + parser/ast/sqliteselect.cpp \ + parser/ast/sqliteupdate.cpp \ + parser/ast/sqlitevacuum.cpp \ + parser/ast/sqlitecopy.cpp \ + parser/ast/sqliteemptyquery.cpp \ + parser/parser_helper_stubs.cpp \ + parser/ast/sqliteexpr.cpp \ + parser/ast/sqliteforeignkey.cpp \ + parser/ast/sqliteindexedcolumn.cpp \ + parser/ast/sqlitecolumntype.cpp \ + parser/ast/sqliteconflictalgo.cpp \ + parser/ast/sqlitesortorder.cpp \ + parser/ast/sqliteraise.cpp \ + parser/ast/sqliteorderby.cpp \ + parser/ast/sqlitelimit.cpp \ + parser/ast/sqliteattach.cpp \ + parser/parsererror.cpp \ + selectresolver.cpp \ + schemaresolver.cpp \ + parser/ast/sqlitequerytype.cpp \ + db/db.cpp \ + services/dbmanager.cpp \ + db/sqlresultsrow.cpp \ + db/asyncqueryrunner.cpp \ + completionhelper.cpp \ + completioncomparer.cpp \ + db/queryexecutor.cpp \ + qio.cpp \ + plugins/pluginsymbolresolver.cpp \ + db/sqlerrorresults.cpp \ + db/queryexecutorsteps/queryexecutorstep.cpp \ + db/queryexecutorsteps/queryexecutorcountresults.cpp \ + db/queryexecutorsteps/queryexecutorparsequery.cpp \ + db/queryexecutorsteps/queryexecutorexecute.cpp \ + db/queryexecutorsteps/queryexecutorattaches.cpp \ + db/queryexecutorsteps/queryexecutoraddrowids.cpp \ + db/queryexecutorsteps/queryexecutorlimit.cpp \ + db/queryexecutorsteps/queryexecutorcolumns.cpp \ + db/queryexecutorsteps/queryexecutorcellsize.cpp \ + db/queryexecutorsteps/queryexecutororder.cpp \ + db/sqlerrorcodes.cpp \ + common/readwritelocker.cpp \ + db/queryexecutorsteps/queryexecutorwrapdistinctresults.cpp \ + csvformat.cpp \ + csvserializer.cpp \ + db/queryexecutorsteps/queryexecutordatasources.cpp \ + expectedtoken.cpp \ + sqlhistorymodel.cpp \ + db/queryexecutorsteps/queryexecutorexplainmode.cpp \ + services/notifymanager.cpp \ + parser/statementtokenbuilder.cpp \ + parser/ast/sqlitedeferrable.cpp \ + tablemodifier.cpp \ + db/chainexecutor.cpp \ + db/queryexecutorsteps/queryexecutorreplaceviews.cpp \ + services/codeformatter.cpp \ + viewmodifier.cpp \ + log.cpp \ + plugins/plugintype.cpp \ + plugins/genericplugin.cpp \ + common/memoryusage.cpp \ + ddlhistorymodel.cpp \ + datatype.cpp \ + common/table.cpp \ + common/column.cpp \ + dbattacher.cpp \ + services/functionmanager.cpp \ + plugins/scriptingqt.cpp \ + services/impl/configimpl.cpp \ + services/impl/dbmanagerimpl.cpp \ + db/abstractdb.cpp \ + services/impl/functionmanagerimpl.cpp \ + services/impl/pluginmanagerimpl.cpp \ + impl/dbattacherimpl.cpp \ + db/dbsqlite3.cpp \ + plugins/dbpluginsqlite3.cpp \ + parser/ast/sqlitewith.cpp \ + services/impl/collationmanagerimpl.cpp \ + services/exportmanager.cpp \ + exportworker.cpp \ + plugins/scriptingsql.cpp \ + db/queryexecutorsteps/queryexecutordetectschemaalter.cpp \ + querymodel.cpp \ + plugins/genericexportplugin.cpp \ + dbobjectorganizer.cpp \ + db/attachguard.cpp \ + db/invaliddb.cpp \ + dbversionconverter.cpp \ + diff/diff_match_patch.cpp \ + db/sqlquery.cpp \ + db/queryexecutorsteps/queryexecutorvaluesmode.cpp \ + services/importmanager.cpp \ + importworker.cpp \ + services/populatemanager.cpp \ + pluginservicebase.cpp \ + populateworker.cpp \ + plugins/populatesequence.cpp \ + plugins/populaterandom.cpp \ + plugins/populaterandomtext.cpp \ + plugins/populateconstant.cpp \ + plugins/populatedictionary.cpp \ + plugins/populatescript.cpp \ + plugins/builtinplugin.cpp \ + plugins/scriptingqtdbproxy.cpp \ + plugins/sqlformatterplugin.cpp \ + services/bugreporter.cpp \ + services/updatemanager.cpp \ + config_builder/cfgmain.cpp \ + config_builder/cfgcategory.cpp \ + config_builder/cfgentry.cpp \ + config_builder/cfglazyinitializer.cpp \ + committable.cpp \ + services/extralicensemanager.cpp \ + tsvserializer.cpp \ + rsa/BigInt.cpp \ + rsa/Key.cpp \ + rsa/KeyPair.cpp \ + rsa/PrimeGenerator.cpp \ + rsa/RSA.cpp \ + translations.cpp \ + common/signalwait.cpp \ + common/blockingsocket.cpp \ + common/threadwitheventloop.cpp \ + common/private/blockingsocketprivate.cpp \ + querygenerator.cpp \ + common/bistrhash.cpp \ + plugins/dbpluginstdfilebase.cpp + +HEADERS += sqlitestudio.h\ + coreSQLiteStudio_global.h \ + returncode.h \ + services/config.h \ + common/nulldevice.h \ + parser/lexer_low_lev.h \ + common/utils.h \ + parser/keywords.h \ + parser/token.h \ + common/utils_sql.h \ + parser/lexer.h \ + parser/sqlite3_parse.h \ + parser/parsercontext.h \ + parser/parser.h \ + parser/sqlite2_parse.h \ + parser/ast/sqlitestatement.h \ + parser/ast/sqlitequery.h \ + parser/ast/sqlitealtertable.h \ + parser/ast/sqliteanalyze.h \ + parser/ast/sqlitebegintrans.h \ + parser/ast/sqlitecommittrans.h \ + parser/ast/sqlitecreateindex.h \ + parser/ast/sqlitecreatetable.h \ + parser/ast/sqlitecreatetrigger.h \ + parser/ast/sqlitecreateview.h \ + parser/ast/sqlitecreatevirtualtable.h \ + parser/ast/sqlitedelete.h \ + parser/ast/sqlitedetach.h \ + parser/ast/sqlitedroptable.h \ + parser/ast/sqlitedroptrigger.h \ + parser/ast/sqlitedropindex.h \ + parser/ast/sqlitedropview.h \ + parser/ast/sqliteinsert.h \ + parser/ast/sqlitepragma.h \ + parser/ast/sqlitereindex.h \ + parser/ast/sqlitesavepoint.h \ + parser/ast/sqliterelease.h \ + parser/ast/sqliterollback.h \ + parser/ast/sqliteselect.h \ + parser/ast/sqliteupdate.h \ + parser/ast/sqlitevacuum.h \ + parser/ast/sqlitecopy.h \ + parser/ast/sqlitequerytype.h \ + parser/ast/sqliteemptyquery.h \ + parser/parser_helper_stubs.h \ + parser/ast/sqliteconflictalgo.h \ + parser/ast/sqliteexpr.h \ + parser/ast/sqliteforeignkey.h \ + parser/ast/sqliteindexedcolumn.h \ + parser/ast/sqlitecolumntype.h \ + parser/ast/sqlitesortorder.h \ + parser/ast/sqlitedeferrable.h \ + parser/ast/sqliteraise.h \ + parser/ast/sqliteorderby.h \ + parser/ast/sqlitelimit.h \ + parser/ast/sqliteattach.h \ + parser/parsererror.h \ + common/objectpool.h \ + selectresolver.h \ + schemaresolver.h \ + dialect.h \ + db/db.h \ + services/dbmanager.h \ + db/sqlresultsrow.h \ + db/asyncqueryrunner.h \ + completionhelper.h \ + expectedtoken.h \ + completioncomparer.h \ + plugins/dbplugin.h \ + services/pluginmanager.h \ + db/queryexecutor.h \ + qio.h \ + db/dbpluginoption.h \ + common/global.h \ + parser/ast/sqlitetablerelatedddl.h \ + plugins/pluginsymbolresolver.h \ + db/sqlerrorresults.h \ + db/sqlerrorcodes.h \ + db/queryexecutorsteps/queryexecutorstep.h \ + db/queryexecutorsteps/queryexecutorcountresults.h \ + db/queryexecutorsteps/queryexecutorparsequery.h \ + db/queryexecutorsteps/queryexecutorexecute.h \ + db/queryexecutorsteps/queryexecutorattaches.h \ + db/queryexecutorsteps/queryexecutoraddrowids.h \ + db/queryexecutorsteps/queryexecutorlimit.h \ + db/queryexecutorsteps/queryexecutorcolumns.h \ + db/queryexecutorsteps/queryexecutorcellsize.h \ + common/unused.h \ + db/queryexecutorsteps/queryexecutororder.h \ + common/readwritelocker.h \ + db/queryexecutorsteps/queryexecutorwrapdistinctresults.h \ + csvformat.h \ + csvserializer.h \ + db/queryexecutorsteps/queryexecutordatasources.h \ + sqlhistorymodel.h \ + db/queryexecutorsteps/queryexecutorexplainmode.h \ + services/notifymanager.h \ + parser/statementtokenbuilder.h \ + tablemodifier.h \ + db/chainexecutor.h \ + db/queryexecutorsteps/queryexecutorreplaceviews.h \ + plugins/sqlformatterplugin.h \ + services/codeformatter.h \ + viewmodifier.h \ + log.h \ + plugins/plugintype.h \ + plugins/plugin.h \ + plugins/genericplugin.h \ + common/memoryusage.h \ + ddlhistorymodel.h \ + datatype.h \ + plugins/generalpurposeplugin.h \ + common/table.h \ + common/column.h \ + common/bihash.h \ + common/strhash.h \ + dbattacher.h \ + common/bistrhash.h \ + services/functionmanager.h \ + common/sortedhash.h \ + plugins/scriptingplugin.h \ + plugins/scriptingqt.h \ + services/impl/configimpl.h \ + services/impl/dbmanagerimpl.h \ + db/abstractdb.h \ + services/impl/functionmanagerimpl.h \ + services/impl/pluginmanagerimpl.h \ + impl/dbattacherimpl.h \ + db/abstractdb3.h \ + db/dbsqlite3.h \ + plugins/dbpluginsqlite3.h \ + db/abstractdb2.h \ + parser/ast/sqlitewith.h \ + services/collationmanager.h \ + services/impl/collationmanagerimpl.h \ + plugins/exportplugin.h \ + config_builder.h \ + services/exportmanager.h \ + exportworker.h \ + plugins/scriptingsql.h \ + db/queryexecutorsteps/queryexecutordetectschemaalter.h \ + querymodel.h \ + plugins/genericexportplugin.h \ + dbobjectorganizer.h \ + db/attachguard.h \ + interruptable.h \ + db/invaliddb.h \ + dbversionconverter.h \ + diff/diff_match_patch.h \ + db/sqlquery.h \ + dbobjecttype.h \ + db/queryexecutorsteps/queryexecutorvaluesmode.h \ + plugins/importplugin.h \ + services/importmanager.h \ + importworker.h \ + plugins/populateplugin.h \ + services/populatemanager.h \ + pluginservicebase.h \ + populateworker.h \ + plugins/populatesequence.h \ + plugins/populaterandom.h \ + plugins/populaterandomtext.h \ + plugins/populateconstant.h \ + plugins/populatedictionary.h \ + plugins/populatescript.h \ + plugins/builtinplugin.h \ + plugins/scriptingqtdbproxy.h \ + plugins/codeformatterplugin.h \ + services/bugreporter.h \ + services/updatemanager.h \ + config_builder/cfgmain.h \ + config_builder/cfgcategory.h \ + config_builder/cfgentry.h \ + config_builder/cfglazyinitializer.h \ + plugins/confignotifiableplugin.h \ + committable.h \ + plugins/uiconfiguredplugin.h \ + services/extralicensemanager.h \ + db/stdsqlite3driver.h \ + tsvserializer.h \ + rsa/BigInt.h \ + rsa/Key.h \ + rsa/KeyPair.h \ + rsa/PrimeGenerator.h \ + rsa/RSA.h \ + translations.h \ + common/signalwait.h \ + common/blockingsocket.h \ + common/threadwitheventloop.h \ + common/private/blockingsocketprivate.h \ + common/expiringcache.h \ + parser/ast/sqliteddlwithdbcontext.h \ + parser/ast/sqliteextendedindexedcolumn.h \ + querygenerator.h \ + common/sortedset.h \ + plugins/dbpluginstdfilebase.h + +unix: { + target.path = $$LIBDIR + INSTALLS += target +} + +OTHER_FILES += \ + parser/lempar.c \ + parser/sqlite3_parse.y \ + parser/sqlite2_parse.y \ + parser/run_lemon.sh \ + TODO.txt \ + licenses/fugue_icons.txt \ + licenses/qhexedit.txt \ + licenses/sqlitestudio_license.txt \ + licenses/lgpl.txt \ + licenses/diff_match.txt \ + licenses/gpl.txt \ + ChangeLog.txt \ + qt.conf \ + Info.plist + +FORMS += \ + plugins/populatesequence.ui \ + plugins/populaterandom.ui \ + plugins/populaterandomtext.ui \ + plugins/populateconstant.ui \ + plugins/populatedictionary.ui \ + plugins/populatescript.ui + +RESOURCES += \ + coreSQLiteStudio.qrc + + + + + + + + + + + + + + diff --git a/SQLiteStudio3/coreSQLiteStudio/coreSQLiteStudio.qrc b/SQLiteStudio3/coreSQLiteStudio/coreSQLiteStudio.qrc new file mode 100644 index 0000000..d58efc1 --- /dev/null +++ b/SQLiteStudio3/coreSQLiteStudio/coreSQLiteStudio.qrc @@ -0,0 +1,32 @@ + + + plugins/populatesequence.ui + plugins/populaterandomtext.ui + plugins/populatedictionary.ui + plugins/populateconstant.ui + plugins/populaterandom.ui + plugins/populatescript.ui + + + plugins/scriptingsql.png + plugins/scriptingqt.png + + + licenses/fugue_icons.txt + licenses/sqlitestudio_license.txt + licenses/lgpl.txt + licenses/diff_match.txt + licenses/gpl.txt + + + translations/coreSQLiteStudio_pl.qm + translations/coreSQLiteStudio_ru.qm + translations/coreSQLiteStudio_fr.qm + translations/coreSQLiteStudio_sk.qm + translations/coreSQLiteStudio_zh_CN.qm + translations/coreSQLiteStudio_de.qm + + + + + diff --git a/SQLiteStudio3/coreSQLiteStudio/coresqlitestudio.qrc b/SQLiteStudio3/coreSQLiteStudio/coresqlitestudio.qrc deleted file mode 100644 index 7b814ec..0000000 --- a/SQLiteStudio3/coreSQLiteStudio/coresqlitestudio.qrc +++ /dev/null @@ -1,28 +0,0 @@ - - - plugins/populatesequence.ui - plugins/populaterandomtext.ui - plugins/populatedictionary.ui - plugins/populateconstant.ui - plugins/populaterandom.ui - plugins/populatescript.ui - - - plugins/scriptingsql.png - plugins/scriptingqt.png - - - licenses/fugue_icons.txt - licenses/sqlitestudio_license.txt - licenses/lgpl.txt - licenses/diff_match.txt - licenses/gpl.txt - - - translations/coreSQLiteStudio_pl.qm - translations/coreSQLiteStudio_ru.qm - translations/coreSQLiteStudio_fr.qm - translations/coreSQLiteStudio_sk.qm - translations/coreSQLiteStudio_zh_CN.qm - - diff --git a/SQLiteStudio3/coreSQLiteStudio/csvformat.cpp b/SQLiteStudio3/coreSQLiteStudio/csvformat.cpp index f5daa60..151fffd 100644 --- a/SQLiteStudio3/coreSQLiteStudio/csvformat.cpp +++ b/SQLiteStudio3/coreSQLiteStudio/csvformat.cpp @@ -1,7 +1,7 @@ #include "csvformat.h" #include -const CsvFormat CsvFormat::DEFAULT = {",", "\n"}; +const CsvFormat CsvFormat::DEFAULT = {{","}, {"\r\n", "\n", "\r"}}; CsvFormat::CsvFormat() { @@ -12,6 +12,27 @@ CsvFormat::CsvFormat(const QString& columnSeparator, const QString& rowSeparator { } +CsvFormat::CsvFormat(const QStringList &columnSeparators, const QStringList &rowSeparators) +{ + if (rowSeparators.size() > 1) + { + this->rowSeparators = rowSeparators; + multipleRowSeparators = true; + strictRowSeparator = true; + } + else if (rowSeparators.size() > 0) + this->rowSeparator = rowSeparators.first(); + + if (columnSeparators.size() > 1) + { + this->columnSeparators = columnSeparators; + multipleColumnSeparators = true; + strictColumnSeparator = true; + } + else if (columnSeparators.size() > 0) + this->columnSeparator = columnSeparators.first(); +} + CsvFormat::CsvFormat(const QString& columnSeparator, const QString& rowSeparator, bool strictRowSeparator, bool strictColumnSeparator) : columnSeparator(columnSeparator), rowSeparator(rowSeparator), strictColumnSeparator(strictColumnSeparator), strictRowSeparator(strictRowSeparator) { diff --git a/SQLiteStudio3/coreSQLiteStudio/csvformat.h b/SQLiteStudio3/coreSQLiteStudio/csvformat.h index 5ce00ad..3e8dda2 100644 --- a/SQLiteStudio3/coreSQLiteStudio/csvformat.h +++ b/SQLiteStudio3/coreSQLiteStudio/csvformat.h @@ -3,17 +3,23 @@ #include "coreSQLiteStudio_global.h" #include +#include struct API_EXPORT CsvFormat { CsvFormat(); CsvFormat(const QString& columnSeparator, const QString& rowSeparator); + CsvFormat(const QStringList& columnSeparators, const QStringList& rowSeparators); CsvFormat(const QString& columnSeparator, const QString& rowSeparator, bool strictRowSeparator, bool strictColumnSeparator); QString columnSeparator; QString rowSeparator; + QStringList columnSeparators; + QStringList rowSeparators; bool strictColumnSeparator = false; bool strictRowSeparator = false; + bool multipleRowSeparators = false; + bool multipleColumnSeparators = false; static const CsvFormat DEFAULT; }; diff --git a/SQLiteStudio3/coreSQLiteStudio/csvserializer.cpp b/SQLiteStudio3/coreSQLiteStudio/csvserializer.cpp index 15bf4e8..ce568e9 100644 --- a/SQLiteStudio3/coreSQLiteStudio/csvserializer.cpp +++ b/SQLiteStudio3/coreSQLiteStudio/csvserializer.cpp @@ -10,20 +10,34 @@ bool isCsvColumnSeparator(QTextStream& data, const C& theChar, const CsvFormat& return format.columnSeparator.contains(theChar); // Strict checking (characters in defined order make a separator) + QStringList separators; + if (format.multipleColumnSeparators) + separators = format.columnSeparators; + else + separators << format.columnSeparator; + qint64 origPos = data.pos(); - data.seek(origPos - 1); - C nextChar; - for (const QChar& c : format.columnSeparator) + bool match = true; + for (const QString sep : separators) { - data >> nextChar; - if (c != nextChar) + match = true; + data.seek(origPos - 1); + C nextChar; + for (const QChar& c : sep) { - data.seek(origPos); - return false; + data >> nextChar; + if (c != nextChar) + { + data.seek(origPos); + match = false; + break; + } } + if (match) + break; } - return true; + return match; } template @@ -33,20 +47,34 @@ bool isCsvRowSeparator(QTextStream& data, const C& theChar, const CsvFormat& for return format.rowSeparator.contains(theChar); // Strict checking (characters in defined order make a separator) + QStringList separators; + if (format.multipleRowSeparators) + separators = format.rowSeparators; + else + separators << format.rowSeparator; + qint64 origPos = data.pos(); - data.seek(origPos - 1); - C nextChar; - for (const QChar& c : format.rowSeparator) + bool match = true; + for (const QString sep : separators) { - data >> nextChar; - if (data.atEnd() || c != nextChar) + match = true; + data.seek(origPos - 1); + C nextChar; + for (const QChar& c : sep) { - data.seek(origPos); - return false; + data >> nextChar; + if (data.atEnd() || c != nextChar) + { + data.seek(origPos); + match = false; + break; + } } + if (match) + break; } - return true; + return match; } template diff --git a/SQLiteStudio3/coreSQLiteStudio/db/abstractdb.cpp b/SQLiteStudio3/coreSQLiteStudio/db/abstractdb.cpp index 8c08a51..cd9b972 100644 --- a/SQLiteStudio3/coreSQLiteStudio/db/abstractdb.cpp +++ b/SQLiteStudio3/coreSQLiteStudio/db/abstractdb.cpp @@ -761,7 +761,7 @@ bool AbstractDb::commit() SqlQueryPtr results = exec("COMMIT;", Flag::NO_LOCK); if (results->isError()) { - qCritical() << "Error while commiting a transaction: " << results->getErrorCode() << results->getErrorText(); + qCritical() << "Error while committing a transaction: " << results->getErrorCode() << results->getErrorText(); return false; } diff --git a/SQLiteStudio3/coreSQLiteStudio/db/chainexecutor.cpp b/SQLiteStudio3/coreSQLiteStudio/db/chainexecutor.cpp index a35856b..1f553ea 100644 --- a/SQLiteStudio3/coreSQLiteStudio/db/chainexecutor.cpp +++ b/SQLiteStudio3/coreSQLiteStudio/db/chainexecutor.cpp @@ -2,6 +2,7 @@ #include "sqlerrorcodes.h" #include "db/sqlquery.h" #include +#include ChainExecutor::ChainExecutor(QObject *parent) : QObject(parent) @@ -32,12 +33,14 @@ void ChainExecutor::exec() { if (!db) { + emit finished(SqlQueryPtr()); emit failure(SqlErrorCode::DB_NOT_DEFINED, tr("The database for executing queries was not defined.", "chain executor")); return; } if (!db->isOpen()) { + emit finished(SqlQueryPtr()); emit failure(SqlErrorCode::DB_NOT_OPEN, tr("The database for executing queries was not open.", "chain executor")); return; } @@ -47,6 +50,7 @@ void ChainExecutor::exec() SqlQueryPtr result = db->exec("PRAGMA foreign_keys = 0;"); if (result->isError()) { + emit finished(SqlQueryPtr()); emit failure(db->getErrorCode(), tr("Could not disable foreign keys in the database. Details: %1", "chain executor").arg(db->getErrorText())); return; } @@ -54,6 +58,7 @@ void ChainExecutor::exec() if (transaction && !db->begin()) { + emit finished(SqlQueryPtr()); emit failure(db->getErrorCode(), tr("Could not start a database transaction. Details: %1", "chain executor").arg(db->getErrorText())); return; } @@ -75,7 +80,7 @@ void ChainExecutor::executeCurrentSql() { if (currentSqlIndex >= sqls.size()) { - executionSuccessful(); + executionSuccessful(lastExecutionResults); return; } @@ -135,10 +140,11 @@ void ChainExecutor::executionFailure(int errorCode, const QString& errorText) restoreFk(); successfulExecution = false; executionErrors << ExecutionError(errorCode, errorText); + emit finished(lastExecutionResults); emit failure(errorCode, errorText); } -void ChainExecutor::executionSuccessful() +void ChainExecutor::executionSuccessful(SqlQueryPtr results) { if (transaction && !db->commit()) { @@ -148,7 +154,8 @@ void ChainExecutor::executionSuccessful() restoreFk(); successfulExecution = true; - emit success(); + emit finished(results); + emit success(results); } void ChainExecutor::executeSync() @@ -163,11 +170,12 @@ void ChainExecutor::executeSync() currentSqlIndex++; } - executionSuccessful(); + executionSuccessful(results); } bool ChainExecutor::handleResults(SqlQueryPtr results) { + lastExecutionResults = results; if (results->isError()) { if (interrupted || currentSqlIndex >= mandatoryQueries.size() || mandatoryQueries[currentSqlIndex]) diff --git a/SQLiteStudio3/coreSQLiteStudio/db/chainexecutor.h b/SQLiteStudio3/coreSQLiteStudio/db/chainexecutor.h index 0afbdb8..90c56f6 100644 --- a/SQLiteStudio3/coreSQLiteStudio/db/chainexecutor.h +++ b/SQLiteStudio3/coreSQLiteStudio/db/chainexecutor.h @@ -229,7 +229,7 @@ class API_EXPORT ChainExecutor : public QObject * * Commits transaction (in case of transactional execution) and emits success(). */ - void executionSuccessful(); + void executionSuccessful(SqlQueryPtr results); /** * @brief Executes all queries synchronously. @@ -328,6 +328,8 @@ class API_EXPORT ChainExecutor : public QObject bool disableForeignKeys = false; bool disableObjectDropsDetection = false; + SqlQueryPtr lastExecutionResults; + public slots: /** * @brief Interrupts query execution. @@ -353,10 +355,23 @@ class API_EXPORT ChainExecutor : public QObject signals: /** * @brief Emitted when all mandatory queries were successfully executed. + * @param results Execution results from last query execution. * * See setMandatoryQueries() for details on mandatory queries. */ - void success(); + void success(SqlQueryPtr results); + + /** + * @brief Emitted when chain execution is finished, regardless of result. + * @param results Execution results from last query execution (may be null). + * + * In slot for this signal always check getSuccessfulExecution(), + * because execution could failed, despite results providing no error. + * It may happen for example if execution was interrupted, + * or executor could not pass through execution preparation phase + * (in which case results will be null). + */ + void finished(SqlQueryPtr results); /** * @brief Emitted when major error occurred while executing a query. diff --git a/SQLiteStudio3/coreSQLiteStudio/db/queryexecutor.cpp b/SQLiteStudio3/coreSQLiteStudio/db/queryexecutor.cpp index d2e7072..4a1c2f6 100644 --- a/SQLiteStudio3/coreSQLiteStudio/db/queryexecutor.cpp +++ b/SQLiteStudio3/coreSQLiteStudio/db/queryexecutor.cpp @@ -20,6 +20,7 @@ #include "queryexecutorsteps/queryexecutordetectschemaalter.h" #include "queryexecutorsteps/queryexecutorvaluesmode.h" #include "common/unused.h" +#include "chainexecutor.h" #include "log.h" #include #include @@ -36,6 +37,8 @@ QueryExecutor::QueryExecutor(Db* db, const QString& query, QObject *parent) : QObject(parent) { context = new Context(); + simpleExecutor = new ChainExecutor(this); + simpleExecutor->setTransaction(false); originalQuery = query; setDb(db); setAutoDelete(false); @@ -43,6 +46,8 @@ QueryExecutor::QueryExecutor(Db* db, const QString& query, QObject *parent) : connect(this, SIGNAL(executionFailed(int,QString)), this, SLOT(cleanupAfterExecFailed(int,QString))); connect(DBLIST, SIGNAL(dbAboutToBeUnloaded(Db*, DbPlugin*)), this, SLOT(cleanupBeforeDbDestroy(Db*))); connect(DBLIST, SIGNAL(dbRemoved(Db*)), this, SLOT(cleanupBeforeDbDestroy(Db*))); + connect(simpleExecutor, SIGNAL(finished(SqlQueryPtr)), this, SLOT(simpleExecutionFinished(SqlQueryPtr))); + } QueryExecutor::~QueryExecutor() @@ -205,12 +210,26 @@ void QueryExecutor::run() void QueryExecutor::execInternal() { + queriesForSimpleExecution.clear(); if (forceSimpleMode) { executeSimpleMethod(); return; } + if (queryCountLimitForSmartMode > -1) + { + queriesForSimpleExecution = quickSplitQueries(originalQuery, false, true); + int queryCount = queriesForSimpleExecution.size(); + if (queryCount > queryCountLimitForSmartMode) + { + qDebug() << "Number of queries" << queryCount << "exceeds maximum number allowed for smart execution method" << + queryCountLimitForSmartMode << ". Simple method will be used to retain efficiency."; + executeSimpleMethod(); + return; + } + } + simpleExecution = false; interrupted = false; @@ -280,6 +299,14 @@ bool QueryExecutor::countResults() return true; } +void QueryExecutor::dbAsyncExecFinished(quint32 asyncId, SqlQueryPtr results) +{ + if (handleRowCountingResults(asyncId, results)) + return; + + // If this was raised by any other asyncExec, handle it here. +} + qint64 QueryExecutor::getLastExecutionTime() const { return context->executionTime; @@ -391,45 +418,26 @@ void QueryExecutor::exec(const QString& query) exec(); } -void QueryExecutor::dbAsyncExecFinished(quint32 asyncId, SqlQueryPtr results) -{ - if (handleRowCountingResults(asyncId, results)) - return; - - if (!simpleExecution) - return; - - if (this->asyncId == 0) - return; - - if (this->asyncId != asyncId) - return; - - this->asyncId = 0; - - simpleExecutionFinished(results); -} - void QueryExecutor::executeSimpleMethod() { simpleExecution = true; context->editionForbiddenReasons << EditionForbiddenReason::SMART_EXECUTION_FAILED; - simpleExecutionStartTime = QDateTime::currentMSecsSinceEpoch(); + if (queriesForSimpleExecution.isEmpty()) + queriesForSimpleExecution = quickSplitQueries(originalQuery, false, true); - if (asyncMode) - { - asyncId = db->asyncExec(originalQuery, context->queryParameters, Db::Flag::PRELOAD); - } - else - { - SqlQueryPtr results = db->exec(originalQuery, context->queryParameters, Db::Flag::PRELOAD); - simpleExecutionFinished(results); - } + QStringList queriesWithPagination = applyLimitForSimpleMethod(queriesForSimpleExecution); + + simpleExecutor->setQueries(queriesWithPagination); + simpleExecutor->setDb(db); + simpleExecutor->setAsync(false); // this is already in a thread + + simpleExecutionStartTime = QDateTime::currentMSecsSinceEpoch(); + simpleExecutor->exec(); } void QueryExecutor::simpleExecutionFinished(SqlQueryPtr results) { - if (results->isError()) + if (results.isNull() || results->isError() || !simpleExecutor->getSuccessfulExecution()) { executionMutex.lock(); executionInProgress = false; @@ -437,9 +445,10 @@ void QueryExecutor::simpleExecutionFinished(SqlQueryPtr results) handleErrorsFromSmartAndSimpleMethods(results); return; } + context->executionTime = QDateTime::currentMSecsSinceEpoch() - simpleExecutionStartTime; if (simpleExecIsSelect()) - context->countingQuery = "SELECT count(*) AS cnt FROM ("+originalQuery+");"; + context->countingQuery = "SELECT count(*) AS cnt FROM ("+trimQueryEnd(queriesForSimpleExecution.last())+");"; else context->rowsCountingRequired = true; @@ -452,7 +461,6 @@ void QueryExecutor::simpleExecutionFinished(SqlQueryPtr results) context->resultColumns << resCol; } - context->executionTime = QDateTime::currentMSecsSinceEpoch() - simpleExecutionStartTime; context->rowsAffected = results->rowsAffected(); context->totalRowsReturned = 0; context->executionResults = results; @@ -467,7 +475,7 @@ void QueryExecutor::simpleExecutionFinished(SqlQueryPtr results) context->resultsHandler = nullptr; } - if (!forceSimpleMode) + if (!forceSimpleMode && queriesForSimpleExecution.size() <= queryCountLimitForSmartMode) notifyWarn(tr("SQLiteStudio was unable to extract metadata from the query. Results won't be editable.")); emit executionFinished(results); @@ -475,7 +483,7 @@ void QueryExecutor::simpleExecutionFinished(SqlQueryPtr results) bool QueryExecutor::simpleExecIsSelect() { - TokenList tokens = Lexer::tokenize(originalQuery, db->getDialect()); + TokenList tokens = Lexer::tokenize(queriesForSimpleExecution.last(), db->getDialect()); tokens.trim(); // First check if it's explicit "SELECT" or "VALUES" (the latter one added in SQLite 3.8.4). @@ -563,6 +571,34 @@ bool QueryExecutor::handleRowCountingResults(quint32 asyncId, SqlQueryPtr result return true; } + +QStringList QueryExecutor::applyLimitForSimpleMethod(const QStringList &queries) +{ + static_qstring(tpl, "SELECT * FROM (%1) LIMIT %2 OFFSET %3"); + QStringList result = queries; + + QString lastQuery = queries.last(); + + bool isSelect = false; + getQueryAccessMode(lastQuery, db->getDialect(), &isSelect); + if (isSelect) + { + result.removeLast(); + result << tpl.arg(trimQueryEnd(lastQuery), QString::number(resultsPerPage), QString::number(page * resultsPerPage)); + } + return result; +} + +int QueryExecutor::getQueryCountLimitForSmartMode() const +{ + return queryCountLimitForSmartMode; +} + +void QueryExecutor::setQueryCountLimitForSmartMode(int value) +{ + queryCountLimitForSmartMode = value; +} + bool QueryExecutor::getForceSimpleMode() const { return forceSimpleMode; @@ -602,13 +638,25 @@ void QueryExecutor::handleErrorsFromSmartAndSimpleMethods(SqlQueryPtr results) // therefore we need to check code from smart execution, before deciding which one to use). // Just rename attach names in the message. bool useSmartError = context->errorCodeFromSmartExecution != 0; - QString msg = useSmartError ? context->errorMessageFromSmartExecution : results->getErrorText(); - int code = useSmartError ? context->errorCodeFromSmartExecution : results->getErrorCode(); - QString match; - QString replaceName; - Dialect dialect = db->getDialect(); + QString msg; + int code; + + if (!useSmartError && (results.isNull() || !results->isError()) && !simpleExecutor->getErrors().isEmpty()) + { + code = simpleExecutor->getErrors().first().first; + msg = simpleExecutor->getErrors().first().second; + } + else + { + msg = useSmartError ? context->errorMessageFromSmartExecution : results->getErrorText(); + code = useSmartError ? context->errorCodeFromSmartExecution : results->getErrorCode(); + } + if (useSmartError) { + QString match; + QString replaceName; + Dialect dialect = db->getDialect(); for (const QString& attachName : context->dbNameToAttach.rightValues()) { match = attachName + "."; diff --git a/SQLiteStudio3/coreSQLiteStudio/db/queryexecutor.h b/SQLiteStudio3/coreSQLiteStudio/db/queryexecutor.h index eddbe8c..4830e36 100644 --- a/SQLiteStudio3/coreSQLiteStudio/db/queryexecutor.h +++ b/SQLiteStudio3/coreSQLiteStudio/db/queryexecutor.h @@ -18,6 +18,7 @@ class Parser; class SqliteQuery; class QueryExecutorStep; class DbPlugin; +class ChainExecutor; /** * @brief Advanced SQL query execution handler. @@ -1034,6 +1035,9 @@ class API_EXPORT QueryExecutor : public QObject, public QRunnable bool isInterrupted() const; + int getQueryCountLimitForSmartMode() const; + void setQueryCountLimitForSmartMode(int value); + private: /** * @brief Executes query. @@ -1087,17 +1091,6 @@ class API_EXPORT QueryExecutor : public QObject, public QRunnable */ void executeSimpleMethod(); - /** - * @brief Handles results of simple execution. - * @param results Results object returned from Db. - * - * Checks results for errors and extracts basic meta information, - * such as rows affected, total result rows and time of execution. - * - * In case of success emits executionFinished(), in case of error emits executionFailed(). - */ - void simpleExecutionFinished(SqlQueryPtr results); - /** * @brief Tests whether the original query is a SELECT statement. * @return true if the query is SELECT, or false otherwise. @@ -1130,6 +1123,8 @@ class API_EXPORT QueryExecutor : public QObject, public QRunnable */ bool handleRowCountingResults(quint32 asyncId, SqlQueryPtr results); + QStringList applyLimitForSimpleMethod(const QStringList &queries); + /** * @brief Query executor context object. * @@ -1173,6 +1168,8 @@ class API_EXPORT QueryExecutor : public QObject, public QRunnable */ QString originalQuery; + QStringList queriesForSimpleExecution; + /** * @brief Predefined number of results per page. * @@ -1245,18 +1242,20 @@ class API_EXPORT QueryExecutor : public QObject, public QRunnable int dataLengthLimit = -1; /** - * @brief Exact moment when query execution started. + * @brief Limit of queries, after which simple mode is used. * - * Expressed in number of milliseconds since 1970-01-01 00:00:00. + * Up to the defined limit the smart execution will be used (unless #forceSimpleMode was set). + * After exceeding this limit, the simple mode will be used. + * Set to negative number to disable this limit. */ - qint64 simpleExecutionStartTime; + int queryCountLimitForSmartMode = -1; /** - * @brief Asynchronous ID of query execution. + * @brief Exact moment when query execution started. * - * Asynchronous ID returned from Db::asyncExec() for the query execution. + * Expressed in number of milliseconds since 1970-01-01 00:00:00. */ - quint32 asyncId = 0; + qint64 simpleExecutionStartTime; /** * @brief Asynchronous ID of counting query execution. @@ -1329,6 +1328,7 @@ class API_EXPORT QueryExecutor : public QObject, public QRunnable Db::QueryResultsHandler resultsHandler = nullptr; bool forceSimpleMode = false; + ChainExecutor* simpleExecutor = nullptr; signals: /** @@ -1380,17 +1380,6 @@ class API_EXPORT QueryExecutor : public QObject, public QRunnable void exec(const QString& originalQuery); private slots: - /** - * @brief Handles asynchronous database execution results. - * @param asyncId Asynchronous ID of the execution. - * @param results Results from the execution. - * - * QueryExecutor checks whether the \p asyncId belongs to the counting query execution, - * or the simple execution. - * Dispatches query results to a proper handler method. - */ - void dbAsyncExecFinished(quint32 asyncId, SqlQueryPtr results); - /** * @brief Calledn when an executor step has failed with its job. * @@ -1416,6 +1405,28 @@ class API_EXPORT QueryExecutor : public QObject, public QRunnable * be unloaded soon and we won't be able to call results destructor. */ void cleanupBeforeDbDestroy(Db* dbToBeUnloaded); + + /** + * @brief Handles results of simple execution. + * @param results Results object returned from Db. + * + * Checks results for errors and extracts basic meta information, + * such as rows affected, total result rows and time of execution. + * + * In case of success emits executionFinished(), in case of error emits executionFailed(). + */ + void simpleExecutionFinished(SqlQueryPtr results); + + /** + * @brief Handles asynchronous database execution results. + * @param asyncId Asynchronous ID of the execution. + * @param results Results from the execution. + * + * QueryExecutor checks whether the \p asyncId belongs to the counting query execution, + * or the simple execution. + * Dispatches query results to a proper handler method. + */ + void dbAsyncExecFinished(quint32 asyncId, SqlQueryPtr results); }; int qHash(QueryExecutor::EditionForbiddenReason reason); diff --git a/SQLiteStudio3/coreSQLiteStudio/db/queryexecutorsteps/queryexecutoraddrowids.cpp b/SQLiteStudio3/coreSQLiteStudio/db/queryexecutorsteps/queryexecutoraddrowids.cpp index 8cc344c..d417072 100644 --- a/SQLiteStudio3/coreSQLiteStudio/db/queryexecutorsteps/queryexecutoraddrowids.cpp +++ b/SQLiteStudio3/coreSQLiteStudio/db/queryexecutorsteps/queryexecutoraddrowids.cpp @@ -31,8 +31,10 @@ bool QueryExecutorAddRowIds::exec() } // ...and putting it into parsed query, then update processed query +// qDebug() << "before addrowid: " << context->processedQuery; select->rebuildTokens(); updateQueries(); +// qDebug() << "after addrowid: " << context->processedQuery; return true; } @@ -148,17 +150,30 @@ QHash QueryExecutorAddRowIds::getNextColNames(const SelectResol bool QueryExecutorAddRowIds::addResultColumns(SqliteSelect::Core* core, const SelectResolver::Table& table, QHash>& rowIdColsMap, bool isTopSelect) { + SelectResolver::Table keyTable = table; + if (!rowIdColsMap.contains(table)) + { + for (const SelectResolver::Table& rowIdColsMapTable : rowIdColsMap.keys()) + { + if (!table.oldTableAliases.contains(rowIdColsMapTable.tableAlias, Qt::CaseInsensitive)) + continue; + + keyTable = rowIdColsMapTable; + } + } + + // Find ROWID column from inner SELECT, or create new column for the table. QHash executorToRealColumns; bool aliasOnlyAsSelectColumn = false; - if (rowIdColsMap.contains(table)) + if (rowIdColsMap.contains(keyTable)) { - executorToRealColumns = rowIdColsMap[table]; // we already have resCol names from subselect + executorToRealColumns = rowIdColsMap[keyTable]; // we already have resCol names from subselect aliasOnlyAsSelectColumn = true; } else { - executorToRealColumns = getNextColNames(table); - rowIdColsMap[table] = executorToRealColumns; + executorToRealColumns = getNextColNames(keyTable); + rowIdColsMap[keyTable] = executorToRealColumns; } if (executorToRealColumns.size() == 0) @@ -182,7 +197,7 @@ bool QueryExecutorAddRowIds::addResultColumns(SqliteSelect::Core* core, const Se queryExecutorResCol->dbName = table.originalDatabase; queryExecutorResCol->database = table.database; queryExecutorResCol->table = table.table; - queryExecutorResCol->tableAlias = table.alias; + queryExecutorResCol->tableAlias = table.tableAlias; queryExecutorResCol->queryExecutorAliasToColumn = executorToRealColumns; context->rowIdColumns << queryExecutorResCol; } @@ -207,9 +222,9 @@ bool QueryExecutorAddRowIds::addResultColumns(SqliteSelect::Core* core, const Se else { resCol->expr->initId(realColumn); - if (!table.alias.isNull()) + if (!table.tableAlias.isNull()) { - resCol->expr->table = table.alias; + resCol->expr->table = table.tableAlias; } else { @@ -222,6 +237,6 @@ bool QueryExecutorAddRowIds::addResultColumns(SqliteSelect::Core* core, const Se resCol->asKw = true; resCol->alias = queryExecutorColumn; - core->resultColumns.insert(0, resCol); + core->resultColumns << resCol; return true; } diff --git a/SQLiteStudio3/coreSQLiteStudio/db/queryexecutorsteps/queryexecutorcellsize.cpp b/SQLiteStudio3/coreSQLiteStudio/db/queryexecutorsteps/queryexecutorcellsize.cpp index 934a20d..54bd35a 100644 --- a/SQLiteStudio3/coreSQLiteStudio/db/queryexecutorsteps/queryexecutorcellsize.cpp +++ b/SQLiteStudio3/coreSQLiteStudio/db/queryexecutorsteps/queryexecutorcellsize.cpp @@ -31,21 +31,21 @@ bool QueryExecutorCellSize::applyDataLimit(SqliteSelect* select, SqliteSelect::C bool first = true; TokenList tokens; - foreach (const QueryExecutor::ResultRowIdColumnPtr& col, context->rowIdColumns) + foreach (const QueryExecutor::ResultColumnPtr& col, context->resultColumns) { if (!first) tokens += getSeparatorTokens(); - tokens += getNoLimitTokens(col); + tokens += getLimitTokens(col); first = false; } - foreach (const QueryExecutor::ResultColumnPtr& col, context->resultColumns) + foreach (const QueryExecutor::ResultRowIdColumnPtr& col, context->rowIdColumns) { if (!first) tokens += getSeparatorTokens(); - tokens += getLimitTokens(col); + tokens += getNoLimitTokens(col); first = false; } diff --git a/SQLiteStudio3/coreSQLiteStudio/db/queryexecutorsteps/queryexecutorcolumns.cpp b/SQLiteStudio3/coreSQLiteStudio/db/queryexecutorsteps/queryexecutorcolumns.cpp index 344f2e5..30a4f5d 100644 --- a/SQLiteStudio3/coreSQLiteStudio/db/queryexecutorsteps/queryexecutorcolumns.cpp +++ b/SQLiteStudio3/coreSQLiteStudio/db/queryexecutorsteps/queryexecutorcolumns.cpp @@ -48,6 +48,7 @@ bool QueryExecutorColumns::exec() SqliteSelect::Core::ResultColumn* resultColumnForSelect = nullptr; bool rowIdColumn = false; int i = 0; + QSet usedAliases; for (const SelectResolver::Column& col : columns) { // Convert column to QueryExecutor result column @@ -58,7 +59,7 @@ bool QueryExecutorColumns::exec() if (rowIdColumn && col.alias.contains(":")) continue; // duplicate ROWID column provided by SelectResolver. See isRowIdColumn() for details. - resultColumnForSelect = getResultColumnForSelect(resultColumn, col); + resultColumnForSelect = getResultColumnForSelect(resultColumn, col, usedAliases); if (!resultColumnForSelect) return false; @@ -126,7 +127,7 @@ QueryExecutor::ResultColumnPtr QueryExecutorColumns::getResultColumn(const Selec return resultColumn; } -SqliteSelect::Core::ResultColumn* QueryExecutorColumns::getResultColumnForSelect(const QueryExecutor::ResultColumnPtr& resultColumn, const SelectResolver::Column& col) +SqliteSelect::Core::ResultColumn* QueryExecutorColumns::getResultColumnForSelect(const QueryExecutor::ResultColumnPtr& resultColumn, const SelectResolver::Column& col, QSet &usedAliases) { SqliteSelect::Core::ResultColumn* selectResultColumn = new SqliteSelect::Core::ResultColumn(); @@ -177,6 +178,15 @@ SqliteSelect::Core::ResultColumn* QueryExecutorColumns::getResultColumnForSelect else selectResultColumn->alias = resultColumn->queryExecutorAlias; + // If this alias was already used we need to use sequential alias + static_qstring(aliasTpl, "%1:%2"); + int nextAliasCounter = 1; + QString aliasBase = selectResultColumn->alias; + while (usedAliases.contains(selectResultColumn->alias)) + selectResultColumn->alias = aliasTpl.arg(aliasBase, QString::number(nextAliasCounter++)); + + usedAliases += selectResultColumn->alias; + return selectResultColumn; } @@ -206,18 +216,6 @@ void QueryExecutorColumns::wrapWithAliasedColumns(SqliteSelect* select) bool first = true; TokenList outerColumns; - for (const QueryExecutor::ResultRowIdColumnPtr& rowIdColumn : context->rowIdColumns) - { - for (const QString& alias : rowIdColumn->queryExecutorAliasToColumn.keys()) - { - if (!first) - outerColumns += sepTokens; - - outerColumns << TokenPtr::create(Token::OTHER, alias); - first = false; - } - } - QStringList columnNamesUsed; QString baseColName; QString colName; @@ -251,6 +249,18 @@ void QueryExecutorColumns::wrapWithAliasedColumns(SqliteSelect* select) first = false; } + for (const QueryExecutor::ResultRowIdColumnPtr& rowIdColumn : context->rowIdColumns) + { + for (const QString& alias : rowIdColumn->queryExecutorAliasToColumn.keys()) + { + if (!first) + outerColumns += sepTokens; + + outerColumns << TokenPtr::create(Token::OTHER, alias); + first = false; + } + } + //QString t = outerColumns.detokenize(); // keeping it for debug purposes select->tokens = wrapSelect(select->tokens, outerColumns); } diff --git a/SQLiteStudio3/coreSQLiteStudio/db/queryexecutorsteps/queryexecutorcolumns.h b/SQLiteStudio3/coreSQLiteStudio/db/queryexecutorsteps/queryexecutorcolumns.h index e23b9f6..8e1ebd2 100644 --- a/SQLiteStudio3/coreSQLiteStudio/db/queryexecutorsteps/queryexecutorcolumns.h +++ b/SQLiteStudio3/coreSQLiteStudio/db/queryexecutorsteps/queryexecutorcolumns.h @@ -50,7 +50,7 @@ class QueryExecutorColumns : public QueryExecutorStep * @param rowIdColumn Indicates if this is a call for ROWID column added by QueryExecutorRowId step. * @return Result column object ready for rebuilding tokens and detokenizing. */ - SqliteSelect::Core::ResultColumn* getResultColumnForSelect(const QueryExecutor::ResultColumnPtr& resultColumn, const SelectResolver::Column& col); + SqliteSelect::Core::ResultColumn* getResultColumnForSelect(const QueryExecutor::ResultColumnPtr& resultColumn, const SelectResolver::Column& col, QSet& usedAliases); /** * @brief Translates attach name into database name. diff --git a/SQLiteStudio3/coreSQLiteStudio/db/queryexecutorsteps/queryexecutordatasources.cpp b/SQLiteStudio3/coreSQLiteStudio/db/queryexecutorsteps/queryexecutordatasources.cpp index 31cda9e..4a422d3 100644 --- a/SQLiteStudio3/coreSQLiteStudio/db/queryexecutorsteps/queryexecutordatasources.cpp +++ b/SQLiteStudio3/coreSQLiteStudio/db/queryexecutorsteps/queryexecutordatasources.cpp @@ -24,7 +24,7 @@ bool QueryExecutorDataSources::exec() QueryExecutor::SourceTablePtr table = QueryExecutor::SourceTablePtr::create(); table->database = resolvedTable.database; table->table = resolvedTable.table; - table->alias = resolvedTable.alias; + table->alias = resolvedTable.tableAlias; context->sourceTables << table; } diff --git a/SQLiteStudio3/coreSQLiteStudio/db/queryexecutorsteps/queryexecutorexecute.cpp b/SQLiteStudio3/coreSQLiteStudio/db/queryexecutorsteps/queryexecutorexecute.cpp index 3036796..aaa8014 100644 --- a/SQLiteStudio3/coreSQLiteStudio/db/queryexecutorsteps/queryexecutorexecute.cpp +++ b/SQLiteStudio3/coreSQLiteStudio/db/queryexecutorsteps/queryexecutorexecute.cpp @@ -3,13 +3,14 @@ #include "db/queryexecutor.h" #include "parser/ast/sqlitequery.h" #include "parser/lexer.h" +#include "log.h" #include "parser/ast/sqlitecreatetable.h" #include "datatype.h" +#include "schemaresolver.h" +#include "common/table.h" #include #include #include -#include -#include bool QueryExecutorExecute::exec() { @@ -58,8 +59,9 @@ bool QueryExecutorExecute::executeQueries() if (isBeginTransaction(query->queryType)) rowsAffectedBeforeTransaction.push(context->rowsAffected); -// qDebug() << "Executing query:" << queryStr; + //qDebug() << getLogDateTime() << "Executing query:" << queryStr; results->execute(); + //qDebug() << getLogDateTime() << "Done."; if (results->isError()) { @@ -155,7 +157,7 @@ void QueryExecutorExecute::setupSqlite2ColumnDataTypes(SqlQueryPtr results) sqlite2Helper->clearBinaryTypes(); SqliteCreateTable::Column* column = nullptr; - int idx = -1 + context->rowIdColumns.size(); + int idx = -1; for (QueryExecutor::ResultColumnPtr resCol : context->resultColumns) { idx++; diff --git a/SQLiteStudio3/coreSQLiteStudio/db/queryexecutorsteps/queryexecutorreplaceviews.cpp b/SQLiteStudio3/coreSQLiteStudio/db/queryexecutorsteps/queryexecutorreplaceviews.cpp index 1f2e736..affe45c 100644 --- a/SQLiteStudio3/coreSQLiteStudio/db/queryexecutorsteps/queryexecutorreplaceviews.cpp +++ b/SQLiteStudio3/coreSQLiteStudio/db/queryexecutorsteps/queryexecutorreplaceviews.cpp @@ -91,6 +91,7 @@ void QueryExecutorReplaceViews::replaceViews(SqliteSelect* select) } src->select = view->select; + src->alias = view->view; src->database = QString::null; src->table = QString::null; diff --git a/SQLiteStudio3/coreSQLiteStudio/dbversionconverter.cpp b/SQLiteStudio3/coreSQLiteStudio/dbversionconverter.cpp index 9e4c664..96f73d7 100644 --- a/SQLiteStudio3/coreSQLiteStudio/dbversionconverter.cpp +++ b/SQLiteStudio3/coreSQLiteStudio/dbversionconverter.cpp @@ -755,6 +755,9 @@ bool DbVersionConverter::modifySingleExprForVersion2(SqliteExpr* expr) case SqliteExpr::Mode::CTIME: errors << QObject::tr("SQLite %1 does not support current date or time clauses in expressions.").arg("2"); return false; + case SqliteExpr::Mode::ROW_VALUE: + errors << QObject::tr("SQLite %1 does not support row value clauses in expressions.").arg("2"); + return false; case SqliteExpr::Mode::IN: case SqliteExpr::Mode::SUB_SELECT: { diff --git a/SQLiteStudio3/coreSQLiteStudio/exportworker.cpp b/SQLiteStudio3/coreSQLiteStudio/exportworker.cpp index 6427138..bc34bd0 100644 --- a/SQLiteStudio3/coreSQLiteStudio/exportworker.cpp +++ b/SQLiteStudio3/coreSQLiteStudio/exportworker.cpp @@ -204,7 +204,8 @@ QHash ExportWorker::getProviderData else { QList colWidths; - for (const QVariant& value : results->next()->valueList()) + SqlResultsRowPtr row = results->next(); + for (const QVariant& value : row->valueList()) colWidths << value.toInt(); providerData[ExportManager::DATA_LENGTHS] = QVariant::fromValue(colWidths); @@ -242,15 +243,6 @@ bool ExportWorker::exportDatabase() return false; } - QList order = { - ExportManager::ExportObject::TABLE, ExportManager::ExportObject::INDEX, ExportManager::ExportObject::TRIGGER, ExportManager::ExportObject::VIEW - }; - - qSort(dbObjects.begin(), dbObjects.end(), [=](const ExportManager::ExportObjectPtr& dbObj1, const ExportManager::ExportObjectPtr& dbObj2) -> bool - { - return order.indexOf(dbObj1->type) < order.indexOf(dbObj2->type); - }); - if (!plugin->beforeExportTables()) { logExportFail("beforeExportTables()"); diff --git a/SQLiteStudio3/coreSQLiteStudio/importworker.cpp b/SQLiteStudio3/coreSQLiteStudio/importworker.cpp index a8ca8f7..ea6c40d 100644 --- a/SQLiteStudio3/coreSQLiteStudio/importworker.cpp +++ b/SQLiteStudio3/coreSQLiteStudio/importworker.cpp @@ -25,7 +25,7 @@ void ImportWorker::run() return; } - if (!db->begin()) + if (!config->skipTransaction && !db->begin()) { error(tr("Could not start transaction in order to import a data: %1").arg(db->getErrorText())); return; @@ -33,20 +33,26 @@ void ImportWorker::run() if (!prepareTable()) { - db->rollback(); + if (!config->skipTransaction) + db->rollback(); + return; } if (!importData()) { - db->rollback(); + if (!config->skipTransaction) + db->rollback(); + return; } - if (!db->commit()) + if (!config->skipTransaction && !db->commit()) { error(tr("Could not commit transaction for imported data: %1").arg(db->getErrorText())); - db->rollback(); + if (!config->skipTransaction) + db->rollback(); + return; } @@ -111,7 +117,8 @@ bool ImportWorker::prepareTable() colDefs << (wrapObjIfNeeded(columnsFromPlugin[i], dialect) + " " + columnTypesFromPlugin[i]).trimmed(); static const QString ddl = QStringLiteral("CREATE TABLE %1 (%2)"); - SqlQueryPtr result = db->exec(ddl.arg(wrapObjIfNeeded(table, dialect), colDefs.join(", "))); + Db::Flags flags = config->skipTransaction ? Db::Flag::NO_LOCK : Db::Flag::NONE; + SqlQueryPtr result = db->exec(ddl.arg(wrapObjIfNeeded(table, dialect), colDefs.join(", ")), flags); if (result->isError()) { error(tr("Could not create table to import to: %1").arg(result->getErrorText())); @@ -153,6 +160,11 @@ bool ImportWorker::importData() // Assign argument values query->setArgs(row.mid(0, colCount)); + + // No transactions = already in transaction, skip locking + if (config->skipTransaction) + query->setFlags(Db::Flag::NO_LOCK); + if (!query->execute()) { if (config->ignoreErrors) diff --git a/SQLiteStudio3/coreSQLiteStudio/log.cpp b/SQLiteStudio3/coreSQLiteStudio/log.cpp index d45f1aa..60a22b2 100644 --- a/SQLiteStudio3/coreSQLiteStudio/log.cpp +++ b/SQLiteStudio3/coreSQLiteStudio/log.cpp @@ -1,6 +1,7 @@ #include "log.h" #include "db/queryexecutorsteps/queryexecutorstep.h" #include +#include #include static bool SQL_DEBUG = false; @@ -17,6 +18,11 @@ void setSqlLoggingFilter(const QString& filter) SQL_DEBUG_FILTER = filter; } +QString getLogDateTime() +{ + return QDateTime::currentDateTime().toString("[HH:mm:ss.zzz]"); +} + void logSql(Db* db, const QString& str, const QHash& args, Db::Flags flags) { if (!SQL_DEBUG) @@ -44,7 +50,7 @@ void logSql(Db* db, const QString& str, const QList& args, Db::Flags f qDebug() << QString("SQL %1> %2").arg(db->getName()).arg(str) << "(flags:" << Db::flagsToString(flags) << ")"; int i = 0; - foreach (const QVariant& arg, args) + for (const QVariant& arg : args) qDebug() << " SQL arg>" << i++ << "=" << arg; } @@ -58,7 +64,7 @@ void logExecutorStep(QueryExecutorStep* step) if (!EXECUTOR_DEBUG) return; - qDebug() << "Executing step:" << step->metaObject()->className() << step->objectName(); + qDebug() << getLogDateTime() << "Executing step:" << step->metaObject()->className() << step->objectName(); } @@ -67,5 +73,5 @@ void logExecutorAfterStep(const QString& str) if (!EXECUTOR_DEBUG) return; - qDebug() << str; + qDebug() << getLogDateTime() << str; } diff --git a/SQLiteStudio3/coreSQLiteStudio/log.h b/SQLiteStudio3/coreSQLiteStudio/log.h index 1cf8dc5..0167509 100644 --- a/SQLiteStudio3/coreSQLiteStudio/log.h +++ b/SQLiteStudio3/coreSQLiteStudio/log.h @@ -10,6 +10,7 @@ class QueryExecutorStep; +API_EXPORT QString getLogDateTime(); API_EXPORT void logSql(Db* db, const QString& str, const QHash& args, Db::Flags flags); API_EXPORT void logSql(Db* db, const QString& str, const QList& args, Db::Flags flags); API_EXPORT void logExecutorStep(QueryExecutorStep* step); diff --git a/SQLiteStudio3/coreSQLiteStudio/parser/ast/sqlitecolumntype.cpp b/SQLiteStudio3/coreSQLiteStudio/parser/ast/sqlitecolumntype.cpp index cc773bb..2c48119 100644 --- a/SQLiteStudio3/coreSQLiteStudio/parser/ast/sqlitecolumntype.cpp +++ b/SQLiteStudio3/coreSQLiteStudio/parser/ast/sqlitecolumntype.cpp @@ -60,7 +60,7 @@ TokenList SqliteColumnType::rebuildTokensFromContents() else if (scale.userType() == QVariant::LongLong) builder.withInteger(scale.toLongLong()); else if (scale.userType() == QVariant::Double) - builder.withFloat(scale.toDouble()); + builder.withFloat(scale); else builder.withOther(scale.toString()); @@ -72,7 +72,7 @@ TokenList SqliteColumnType::rebuildTokensFromContents() else if (precision.userType() == QVariant::LongLong) builder.withInteger(precision.toLongLong()); else if (precision.userType() == QVariant::Double) - builder.withFloat(precision.toDouble()); + builder.withFloat(precision); else builder.withOther(precision.toString()); } diff --git a/SQLiteStudio3/coreSQLiteStudio/parser/ast/sqliteexpr.cpp b/SQLiteStudio3/coreSQLiteStudio/parser/ast/sqliteexpr.cpp index 3009b4b..5dc830b 100644 --- a/SQLiteStudio3/coreSQLiteStudio/parser/ast/sqliteexpr.cpp +++ b/SQLiteStudio3/coreSQLiteStudio/parser/ast/sqliteexpr.cpp @@ -124,6 +124,21 @@ void SqliteExpr::initSubExpr(SqliteExpr *expr) expr->setParent(this); } +void SqliteExpr::initRowValue(const QList &exprList) +{ + if (exprList.size() == 1) + { + initSubExpr(exprList.first()); + return; + } + + mode = SqliteExpr::Mode::ROW_VALUE; + this->exprList = exprList; + + for (SqliteExpr* expr : exprList) + expr->setParent(this); +} + void SqliteExpr::initBindParam(const QString& value) { mode = SqliteExpr::Mode::BIND_PARAM; @@ -158,7 +173,7 @@ void SqliteExpr::initFunction(const QString& fnName, int distinct, const QListsetParent(this); } @@ -496,6 +511,9 @@ TokenList SqliteExpr::rebuildTokensFromContents() case SqliteExpr::Mode::IN: builder.withTokens(rebuildIn()); break; + case SqliteExpr::Mode::ROW_VALUE: + builder.withParLeft().withStatementList(exprList).withParRight(); + break; case SqliteExpr::Mode::EXISTS: builder.withKeyword("EXISTS").withParLeft().withStatement(select).withParRight(); break; diff --git a/SQLiteStudio3/coreSQLiteStudio/parser/ast/sqliteexpr.h b/SQLiteStudio3/coreSQLiteStudio/parser/ast/sqliteexpr.h index f57004f..4d5bb03 100644 --- a/SQLiteStudio3/coreSQLiteStudio/parser/ast/sqliteexpr.h +++ b/SQLiteStudio3/coreSQLiteStudio/parser/ast/sqliteexpr.h @@ -24,6 +24,7 @@ class API_EXPORT SqliteExpr : public SqliteStatement BINARY_OP, FUNCTION, SUB_EXPR, + ROW_VALUE, CAST, COLLATE, // in Sqlite2 exists only in expr of sortlist LIKE, @@ -69,6 +70,7 @@ class API_EXPORT SqliteExpr : public SqliteStatement void initNull(); void initCTime(const QString& name); void initSubExpr(SqliteExpr* expr); + void initRowValue(const QList& exprList); void initId(const QString& db, const QString& table, const QString& column); void initId(const QString& table, const QString& column); void initId(const QString& column); diff --git a/SQLiteStudio3/coreSQLiteStudio/parser/lexer.cpp b/SQLiteStudio3/coreSQLiteStudio/parser/lexer.cpp index 6be7528..77036f7 100644 --- a/SQLiteStudio3/coreSQLiteStudio/parser/lexer.cpp +++ b/SQLiteStudio3/coreSQLiteStudio/parser/lexer.cpp @@ -1,5 +1,6 @@ #include "lexer.h" #include "keywords.h" +#include "log.h" #include "lexer_low_lev.h" #include "sqlite2_parse.h" #include "sqlite3_parse.h" diff --git a/SQLiteStudio3/coreSQLiteStudio/parser/lexer_low_lev.cpp b/SQLiteStudio3/coreSQLiteStudio/parser/lexer_low_lev.cpp index 894afd1..0f9aa91 100644 --- a/SQLiteStudio3/coreSQLiteStudio/parser/lexer_low_lev.cpp +++ b/SQLiteStudio3/coreSQLiteStudio/parser/lexer_low_lev.cpp @@ -315,7 +315,7 @@ int lexerGetToken(const QString& z, TokenPtr token, int sqliteVersion, bool tole ) { i += 2; - while ( charAt(z, i+2).isDigit() ) + while ( charAt(z, i).isDigit() ) i++; token->lemonType = v3 ? TK3_FLOAT : TK2_FLOAT; diff --git a/SQLiteStudio3/coreSQLiteStudio/parser/sqlite3_parse.cpp b/SQLiteStudio3/coreSQLiteStudio/parser/sqlite3_parse.cpp index 43cc4a0..3884655 100644 --- a/SQLiteStudio3/coreSQLiteStudio/parser/sqlite3_parse.cpp +++ b/SQLiteStudio3/coreSQLiteStudio/parser/sqlite3_parse.cpp @@ -243,602 +243,600 @@ static const YYMINORTYPE yyzerominor = { 0 }; ** shifting non-terminals after a reduce. ** yy_default[] Default action for each state. */ -#define YY_ACTTAB_COUNT (2285) +#define YY_ACTTAB_COUNT (2271) static const YYACTIONTYPE yy_action[] = { - /* 0 */ 432, 49, 49, 48, 48, 48, 47, 216, 717, 340, - /* 10 */ 644, 426, 52, 52, 52, 52, 45, 50, 50, 50, - /* 20 */ 50, 49, 49, 48, 48, 48, 47, 216, 722, 1027, - /* 30 */ 1027, 644, 131, 581, 52, 52, 52, 52, 412, 50, - /* 40 */ 50, 50, 50, 49, 49, 48, 48, 48, 47, 216, - /* 50 */ 580, 81, 59, 644, 157, 686, 302, 283, 1027, 1027, - /* 60 */ 42, 1027, 1027, 1027, 1027, 1027, 1027, 1027, 1027, 1027, - /* 70 */ 1027, 1027, 564, 1027, 1027, 1027, 1027, 39, 40, 1027, - /* 80 */ 1027, 1027, 1027, 1027, 41, 432, 529, 386, 717, 596, - /* 90 */ 595, 281, 4, 378, 717, 631, 426, 643, 609, 423, - /* 100 */ 13, 134, 688, 430, 563, 610, 484, 691, 332, 280, - /* 110 */ 715, 714, 565, 566, 643, 690, 689, 688, 235, 507, - /* 120 */ 61, 321, 611, 412, 48, 48, 48, 47, 216, 122, - /* 130 */ 243, 213, 247, 60, 1143, 1143, 487, 610, 608, 604, - /* 140 */ 686, 307, 486, 585, 717, 42, 508, 510, 643, 509, - /* 150 */ 677, 9, 643, 144, 95, 282, 380, 277, 379, 132, - /* 160 */ 298, 717, 39, 40, 602, 200, 199, 7, 356, 41, - /* 170 */ 885, 308, 1135, 275, 249, 717, 18, 4, 885, 1135, - /* 180 */ 57, 718, 643, 432, 423, 885, 330, 688, 430, 717, - /* 190 */ 688, 644, 691, 688, 426, 691, 715, 714, 691, 643, - /* 200 */ 690, 689, 688, 690, 689, 688, 690, 689, 688, 98, - /* 210 */ 683, 240, 644, 218, 411, 885, 487, 885, 885, 484, - /* 220 */ 717, 412, 239, 885, 304, 583, 513, 582, 885, 885, - /* 230 */ 885, 885, 885, 643, 644, 677, 9, 643, 686, 217, - /* 240 */ 245, 674, 102, 42, 288, 301, 715, 714, 67, 303, - /* 250 */ 148, 308, 1134, 151, 307, 485, 81, 716, 97, 1134, - /* 260 */ 39, 40, 552, 715, 714, 772, 130, 41, 947, 377, - /* 270 */ 374, 373, 448, 47, 216, 4, 947, 715, 714, 335, - /* 280 */ 643, 683, 423, 947, 607, 688, 430, 372, 449, 448, - /* 290 */ 691, 715, 714, 305, 265, 146, 268, 643, 690, 689, - /* 300 */ 688, 288, 68, 678, 692, 255, 363, 259, 360, 693, - /* 310 */ 1028, 1028, 683, 947, 716, 947, 947, 448, 699, 234, - /* 320 */ 387, 716, 715, 714, 774, 652, 947, 947, 947, 947, - /* 330 */ 110, 643, 318, 677, 9, 643, 222, 678, 300, 53, - /* 340 */ 54, 427, 290, 1028, 1028, 676, 676, 51, 51, 52, - /* 350 */ 52, 52, 52, 717, 50, 50, 50, 50, 49, 49, - /* 360 */ 48, 48, 48, 47, 216, 432, 429, 341, 717, 336, - /* 370 */ 672, 671, 288, 284, 717, 138, 426, 209, 219, 431, - /* 380 */ 269, 396, 652, 683, 337, 716, 716, 687, 187, 53, - /* 390 */ 54, 427, 290, 716, 453, 676, 676, 51, 51, 52, - /* 400 */ 52, 52, 52, 412, 50, 50, 50, 50, 49, 49, - /* 410 */ 48, 48, 48, 47, 216, 91, 954, 717, 620, 713, - /* 420 */ 686, 404, 383, 130, 711, 42, 377, 374, 373, 712, - /* 430 */ 233, 954, 395, 312, 210, 594, 667, 385, 429, 17, - /* 440 */ 317, 660, 39, 40, 372, 231, 230, 717, 89, 41, - /* 450 */ 932, 431, 717, 659, 717, 715, 714, 4, 932, 687, - /* 460 */ 92, 143, 643, 359, 423, 932, 675, 688, 430, 15, - /* 470 */ 715, 714, 691, 131, 457, 552, 715, 714, 954, 643, - /* 480 */ 690, 689, 688, 669, 668, 210, 594, 459, 385, 458, - /* 490 */ 577, 88, 1028, 1028, 14, 932, 673, 932, 932, 55, - /* 500 */ 576, 679, 43, 369, 38, 402, 36, 382, 932, 1, - /* 510 */ 932, 932, 642, 643, 635, 677, 9, 643, 662, 715, - /* 520 */ 714, 53, 54, 427, 290, 1028, 1028, 676, 676, 51, - /* 530 */ 51, 52, 52, 52, 52, 661, 50, 50, 50, 50, - /* 540 */ 49, 49, 48, 48, 48, 47, 216, 658, 649, 715, - /* 550 */ 714, 497, 543, 570, 715, 714, 715, 714, 657, 692, - /* 560 */ 544, 615, 321, 31, 693, 28, 717, 586, 275, 683, - /* 570 */ 160, 1028, 1028, 427, 290, 694, 614, 676, 676, 51, - /* 580 */ 51, 52, 52, 52, 52, 399, 50, 50, 50, 50, - /* 590 */ 49, 49, 48, 48, 48, 47, 216, 1026, 1026, 81, - /* 600 */ 53, 54, 427, 290, 1028, 1028, 676, 676, 51, 51, - /* 610 */ 52, 52, 52, 52, 497, 50, 50, 50, 50, 49, - /* 620 */ 49, 48, 48, 48, 47, 216, 1026, 1026, 1026, 1026, - /* 630 */ 1026, 1026, 1026, 1026, 1026, 1026, 1026, 1026, 1026, 1026, - /* 640 */ 717, 1026, 1026, 1026, 1026, 1026, 1026, 1026, 1026, 1026, - /* 650 */ 1026, 1026, 1028, 1028, 358, 50, 50, 50, 50, 49, - /* 660 */ 49, 48, 48, 48, 47, 216, 289, 553, 715, 714, - /* 670 */ 496, 683, 299, 663, 347, 153, 539, 69, 695, 716, - /* 680 */ 716, 53, 54, 427, 290, 1028, 1028, 676, 676, 51, - /* 690 */ 51, 52, 52, 52, 52, 1095, 50, 50, 50, 50, - /* 700 */ 49, 49, 48, 48, 48, 47, 216, 53, 54, 427, - /* 710 */ 290, 419, 512, 676, 676, 51, 51, 52, 52, 52, - /* 720 */ 52, 159, 50, 50, 50, 50, 49, 49, 48, 48, - /* 730 */ 48, 47, 216, 491, 955, 316, 483, 483, 664, 554, - /* 740 */ 215, 651, 715, 714, 81, 53, 54, 427, 290, 955, - /* 750 */ 415, 676, 676, 51, 51, 52, 52, 52, 52, 398, - /* 760 */ 50, 50, 50, 50, 49, 49, 48, 48, 48, 47, - /* 770 */ 216, 158, 1095, 22, 717, 628, 460, 717, 1080, 717, - /* 780 */ 648, 1046, 140, 89, 717, 1150, 154, 436, 2, 716, - /* 790 */ 425, 672, 671, 397, 461, 462, 955, 53, 54, 427, - /* 800 */ 290, 574, 717, 676, 676, 51, 51, 52, 52, 52, - /* 810 */ 52, 322, 50, 50, 50, 50, 49, 49, 48, 48, - /* 820 */ 48, 47, 216, 432, 1109, 81, 206, 205, 204, 53, - /* 830 */ 54, 427, 290, 717, 426, 676, 676, 51, 51, 52, - /* 840 */ 52, 52, 52, 345, 50, 50, 50, 50, 49, 49, - /* 850 */ 48, 48, 48, 47, 216, 598, 716, 667, 601, 463, - /* 860 */ 667, 412, 32, 717, 658, 90, 13, 895, 721, 669, - /* 870 */ 668, 610, 725, 435, 81, 657, 715, 714, 686, 715, - /* 880 */ 714, 715, 714, 42, 529, 273, 715, 714, 611, 350, - /* 890 */ 529, 451, 89, 678, 13, 634, 634, 339, 637, 610, - /* 900 */ 39, 40, 650, 610, 715, 714, 717, 41, 1143, 1143, - /* 910 */ 717, 525, 683, 582, 717, 4, 611, 469, 61, 451, - /* 920 */ 643, 208, 423, 507, 61, 688, 430, 678, 33, 109, - /* 930 */ 691, 610, 501, 502, 353, 715, 714, 643, 690, 689, - /* 940 */ 688, 429, 901, 901, 468, 467, 553, 466, 422, 384, - /* 950 */ 508, 510, 142, 509, 431, 441, 69, 1143, 1143, 716, - /* 960 */ 445, 723, 687, 182, 647, 715, 714, 646, 231, 230, - /* 970 */ 438, 643, 357, 677, 9, 643, 418, 445, 53, 54, - /* 980 */ 427, 290, 91, 91, 676, 676, 51, 51, 52, 52, - /* 990 */ 52, 52, 645, 50, 50, 50, 50, 49, 49, 48, - /* 1000 */ 48, 48, 47, 216, 1035, 445, 669, 668, 715, 714, - /* 1010 */ 91, 454, 715, 714, 683, 642, 715, 714, 325, 202, - /* 1020 */ 53, 54, 427, 290, 447, 681, 676, 676, 51, 51, - /* 1030 */ 52, 52, 52, 52, 640, 50, 50, 50, 50, 49, - /* 1040 */ 49, 48, 48, 48, 47, 216, 606, 53, 54, 427, - /* 1050 */ 290, 717, 447, 676, 676, 51, 51, 52, 52, 52, - /* 1060 */ 52, 460, 50, 50, 50, 50, 49, 49, 48, 48, - /* 1070 */ 48, 47, 216, 454, 716, 37, 664, 424, 215, 461, - /* 1080 */ 342, 370, 593, 53, 54, 427, 290, 639, 89, 676, - /* 1090 */ 676, 51, 51, 52, 52, 52, 52, 32, 50, 50, - /* 1100 */ 50, 50, 49, 49, 48, 48, 48, 47, 216, 414, - /* 1110 */ 724, 2, 12, 53, 54, 427, 290, 34, 589, 676, - /* 1120 */ 676, 51, 51, 52, 52, 52, 52, 625, 50, 50, - /* 1130 */ 50, 50, 49, 49, 48, 48, 48, 47, 216, 516, - /* 1140 */ 716, 538, 30, 91, 343, 667, 140, 136, 572, 53, - /* 1150 */ 54, 427, 290, 715, 714, 676, 676, 51, 51, 52, - /* 1160 */ 52, 52, 52, 549, 50, 50, 50, 50, 49, 49, - /* 1170 */ 48, 48, 48, 47, 216, 91, 717, 234, 387, 53, - /* 1180 */ 54, 427, 290, 339, 272, 676, 676, 51, 51, 52, - /* 1190 */ 52, 52, 52, 334, 50, 50, 50, 50, 49, 49, - /* 1200 */ 48, 48, 48, 47, 216, 533, 8, 518, 697, 87, - /* 1210 */ 137, 53, 54, 427, 290, 23, 558, 676, 676, 51, - /* 1220 */ 51, 52, 52, 52, 52, 135, 50, 50, 50, 50, - /* 1230 */ 49, 49, 48, 48, 48, 47, 216, 81, 1110, 91, - /* 1240 */ 717, 91, 53, 54, 427, 290, 616, 723, 676, 676, - /* 1250 */ 51, 51, 52, 52, 52, 52, 605, 50, 50, 50, - /* 1260 */ 50, 49, 49, 48, 48, 48, 47, 216, 99, 1108, - /* 1270 */ 391, 505, 389, 492, 53, 54, 427, 290, 715, 714, - /* 1280 */ 676, 676, 51, 51, 52, 52, 52, 52, 621, 50, - /* 1290 */ 50, 50, 50, 49, 49, 48, 48, 48, 47, 216, - /* 1300 */ 683, 53, 58, 427, 290, 683, 600, 676, 676, 51, - /* 1310 */ 51, 52, 52, 52, 52, 429, 50, 50, 50, 50, - /* 1320 */ 49, 49, 48, 48, 48, 47, 216, 432, 431, 717, - /* 1330 */ 5, 621, 226, 633, 492, 632, 687, 187, 426, 54, - /* 1340 */ 427, 290, 715, 714, 676, 676, 51, 51, 52, 52, - /* 1350 */ 52, 52, 717, 50, 50, 50, 50, 49, 49, 48, - /* 1360 */ 48, 48, 47, 216, 553, 412, 288, 599, 287, 717, - /* 1370 */ 404, 388, 429, 698, 69, 613, 252, 716, 429, 716, - /* 1380 */ 405, 716, 686, 30, 209, 431, 209, 42, 626, 317, - /* 1390 */ 489, 431, 597, 687, 187, 429, 223, 309, 540, 687, - /* 1400 */ 187, 329, 683, 717, 39, 40, 11, 683, 431, 287, - /* 1410 */ 432, 41, 621, 654, 91, 592, 687, 92, 556, 4, - /* 1420 */ 571, 426, 716, 625, 643, 537, 423, 404, 406, 688, - /* 1430 */ 430, 715, 714, 333, 691, 717, 716, 429, 717, 591, - /* 1440 */ 717, 643, 690, 689, 688, 107, 317, 652, 412, 531, - /* 1450 */ 431, 590, 317, 717, 715, 714, 612, 830, 687, 187, - /* 1460 */ 429, 225, 326, 717, 541, 686, 526, 417, 20, 642, - /* 1470 */ 42, 715, 714, 431, 683, 643, 717, 677, 9, 643, - /* 1480 */ 531, 687, 187, 526, 562, 717, 621, 39, 40, 327, - /* 1490 */ 376, 65, 64, 432, 41, 274, 19, 266, 371, 535, - /* 1500 */ 535, 267, 4, 271, 426, 715, 714, 643, 421, 423, - /* 1510 */ 716, 407, 688, 430, 286, 400, 717, 691, 717, 280, - /* 1520 */ 717, 63, 129, 429, 643, 690, 689, 688, 367, 717, - /* 1530 */ 603, 412, 520, 534, 317, 515, 431, 715, 714, 156, - /* 1540 */ 715, 714, 715, 714, 687, 192, 717, 209, 686, 520, - /* 1550 */ 480, 465, 515, 42, 717, 715, 714, 3, 643, 717, - /* 1560 */ 677, 9, 643, 717, 716, 715, 714, 480, 138, 125, - /* 1570 */ 39, 40, 85, 476, 79, 432, 683, 41, 715, 714, - /* 1580 */ 27, 429, 473, 511, 717, 4, 426, 715, 714, 517, - /* 1590 */ 643, 532, 423, 408, 431, 688, 430, 642, 26, 719, - /* 1600 */ 691, 717, 687, 181, 77, 476, 506, 643, 690, 689, - /* 1610 */ 688, 620, 716, 412, 354, 470, 706, 439, 715, 714, - /* 1620 */ 715, 714, 715, 714, 261, 288, 717, 473, 221, 504, - /* 1630 */ 686, 715, 714, 704, 439, 42, 717, 716, 716, 568, - /* 1640 */ 83, 643, 140, 677, 9, 643, 498, 1036, 715, 714, - /* 1650 */ 702, 284, 39, 40, 254, 642, 715, 714, 432, 41, - /* 1660 */ 328, 715, 714, 429, 716, 715, 714, 4, 1038, 426, - /* 1670 */ 119, 10, 643, 503, 423, 707, 431, 688, 430, 470, - /* 1680 */ 429, 161, 691, 251, 687, 163, 715, 714, 716, 643, - /* 1690 */ 690, 689, 688, 431, 717, 429, 412, 152, 479, 456, - /* 1700 */ 455, 687, 172, 715, 714, 72, 652, 705, 431, 429, - /* 1710 */ 630, 312, 111, 686, 530, 338, 687, 190, 42, 437, - /* 1720 */ 716, 622, 431, 643, 96, 677, 9, 643, 715, 714, - /* 1730 */ 687, 188, 209, 717, 207, 39, 40, 642, 715, 714, - /* 1740 */ 432, 224, 41, 617, 86, 429, 703, 717, 203, 429, - /* 1750 */ 4, 426, 320, 720, 642, 643, 150, 423, 431, 716, - /* 1760 */ 688, 430, 431, 700, 429, 691, 687, 196, 475, 642, - /* 1770 */ 687, 195, 643, 690, 689, 688, 716, 431, 412, 717, - /* 1780 */ 319, 710, 717, 642, 522, 687, 197, 709, 708, 258, - /* 1790 */ 499, 429, 434, 220, 500, 686, 715, 714, 625, 16, - /* 1800 */ 42, 717, 716, 257, 431, 717, 643, 256, 677, 9, - /* 1810 */ 643, 716, 687, 201, 717, 351, 716, 39, 40, 642, - /* 1820 */ 149, 248, 432, 642, 41, 482, 147, 246, 433, 442, - /* 1830 */ 368, 478, 4, 426, 716, 715, 714, 643, 642, 423, - /* 1840 */ 716, 717, 715, 430, 82, 701, 429, 691, 685, 715, - /* 1850 */ 714, 145, 495, 234, 643, 690, 689, 688, 429, 431, - /* 1860 */ 412, 559, 244, 284, 352, 642, 474, 687, 232, 18, - /* 1870 */ 242, 431, 401, 429, 471, 716, 716, 686, 295, 687, - /* 1880 */ 291, 715, 714, 716, 715, 714, 431, 294, 643, 696, - /* 1890 */ 677, 9, 643, 542, 687, 191, 528, 293, 680, 39, - /* 1900 */ 40, 717, 716, 715, 714, 429, 41, 715, 714, 429, - /* 1910 */ 490, 716, 292, 29, 4, 493, 715, 714, 431, 643, - /* 1920 */ 642, 423, 431, 227, 688, 430, 687, 194, 429, 691, - /* 1930 */ 687, 193, 642, 429, 477, 429, 643, 690, 689, 688, - /* 1940 */ 429, 431, 717, 715, 714, 429, 431, 642, 431, 687, - /* 1950 */ 185, 717, 403, 431, 687, 189, 687, 315, 431, 717, - /* 1960 */ 216, 687, 314, 429, 409, 684, 687, 313, 717, 429, - /* 1970 */ 643, 56, 677, 9, 643, 44, 431, 716, 717, 642, - /* 1980 */ 638, 627, 431, 642, 687, 184, 623, 420, 236, 653, - /* 1990 */ 687, 171, 323, 716, 716, 641, 229, 66, 214, 716, - /* 2000 */ 429, 716, 642, 715, 714, 618, 35, 642, 228, 642, - /* 2010 */ 429, 133, 394, 431, 642, 524, 276, 429, 716, 642, - /* 2020 */ 429, 687, 170, 431, 716, 716, 636, 569, 416, 716, - /* 2030 */ 431, 687, 183, 431, 429, 550, 429, 642, 687, 169, - /* 2040 */ 716, 687, 186, 642, 715, 714, 429, 431, 716, 431, - /* 2050 */ 141, 429, 108, 715, 714, 687, 168, 687, 167, 431, - /* 2060 */ 139, 715, 714, 270, 431, 519, 429, 687, 93, 390, - /* 2070 */ 715, 714, 687, 166, 642, 717, 716, 429, 584, 431, - /* 2080 */ 715, 714, 481, 429, 642, 717, 381, 687, 164, 717, - /* 2090 */ 431, 642, 444, 579, 642, 578, 431, 387, 687, 174, - /* 2100 */ 429, 263, 429, 472, 687, 173, 429, 331, 642, 278, - /* 2110 */ 642, 574, 575, 431, 716, 431, 429, 361, 464, 431, - /* 2120 */ 642, 687, 175, 687, 178, 642, 429, 687, 94, 431, - /* 2130 */ 716, 429, 573, 429, 555, 548, 348, 687, 177, 431, - /* 2140 */ 642, 547, 546, 545, 431, 429, 431, 687, 176, 716, - /* 2150 */ 393, 642, 687, 180, 687, 179, 443, 642, 431, 536, - /* 2160 */ 428, 128, 285, 431, 311, 310, 687, 165, 80, 716, - /* 2170 */ 264, 687, 70, 716, 642, 716, 642, 715, 714, 366, - /* 2180 */ 642, 649, 253, 716, 106, 250, 127, 715, 714, 241, - /* 2190 */ 642, 715, 714, 237, 126, 716, 238, 262, 716, 355, - /* 2200 */ 642, 212, 716, 25, 124, 642, 716, 642, 527, 716, - /* 2210 */ 364, 78, 105, 123, 121, 155, 84, 514, 104, 642, - /* 2220 */ 120, 349, 494, 624, 642, 346, 103, 118, 76, 344, - /* 2230 */ 117, 75, 116, 115, 74, 73, 114, 521, 324, 113, - /* 2240 */ 24, 452, 450, 21, 101, 100, 112, 446, 62, 440, - /* 2250 */ 162, 296, 670, 666, 656, 413, 279, 619, 570, 198, - /* 2260 */ 629, 375, 523, 260, 362, 306, 6, 71, 682, 665, - /* 2270 */ 655, 557, 211, 297, 410, 567, 365, 46, 551, 561, - /* 2280 */ 560, 488, 588, 81, 587, + /* 0 */ 432, 565, 566, 717, 50, 50, 49, 49, 49, 48, + /* 10 */ 215, 420, 53, 53, 53, 53, 28, 51, 51, 51, + /* 20 */ 51, 50, 50, 49, 49, 49, 48, 215, 717, 1026, + /* 30 */ 1026, 336, 666, 665, 53, 53, 53, 53, 425, 51, + /* 40 */ 51, 51, 51, 50, 50, 49, 49, 49, 48, 215, + /* 50 */ 722, 81, 205, 204, 203, 672, 592, 592, 1026, 1026, + /* 60 */ 41, 1026, 1026, 1026, 1026, 1026, 1026, 1026, 1026, 1026, + /* 70 */ 1026, 1026, 639, 1026, 1026, 1026, 1026, 38, 39, 1026, + /* 80 */ 1026, 1026, 1026, 1026, 40, 432, 529, 285, 717, 56, + /* 90 */ 108, 684, 3, 717, 668, 301, 420, 678, 661, 417, + /* 100 */ 716, 67, 688, 430, 552, 715, 714, 691, 130, 331, + /* 110 */ 60, 377, 374, 373, 678, 690, 689, 688, 674, 507, + /* 120 */ 61, 216, 717, 425, 49, 49, 49, 48, 215, 372, + /* 130 */ 715, 714, 212, 131, 1143, 1143, 242, 629, 246, 674, + /* 140 */ 672, 421, 685, 48, 215, 41, 508, 510, 678, 509, + /* 150 */ 9, 678, 33, 669, 144, 95, 281, 380, 276, 379, + /* 160 */ 132, 674, 38, 39, 609, 229, 228, 7, 356, 40, + /* 170 */ 885, 717, 403, 717, 274, 484, 685, 3, 885, 529, + /* 180 */ 248, 610, 678, 68, 417, 885, 411, 688, 430, 209, + /* 190 */ 715, 714, 691, 684, 457, 715, 714, 717, 209, 678, + /* 200 */ 690, 689, 688, 663, 662, 432, 453, 459, 460, 458, + /* 210 */ 306, 486, 507, 61, 717, 885, 420, 885, 885, 492, + /* 220 */ 725, 716, 320, 885, 715, 714, 461, 462, 885, 885, + /* 230 */ 885, 885, 885, 678, 297, 9, 678, 772, 669, 508, + /* 240 */ 510, 687, 509, 425, 717, 339, 244, 51, 51, 51, + /* 250 */ 51, 50, 50, 49, 49, 49, 48, 215, 543, 570, + /* 260 */ 672, 357, 713, 283, 688, 41, 544, 711, 448, 691, + /* 270 */ 445, 577, 712, 715, 714, 715, 714, 690, 689, 688, + /* 280 */ 492, 576, 38, 39, 449, 448, 512, 445, 487, 40, + /* 290 */ 947, 463, 661, 389, 497, 603, 602, 3, 947, 715, + /* 300 */ 714, 230, 678, 684, 417, 947, 13, 688, 430, 723, + /* 310 */ 17, 617, 691, 448, 513, 445, 715, 714, 81, 678, + /* 320 */ 690, 689, 688, 307, 1135, 679, 460, 654, 618, 360, + /* 330 */ 774, 1135, 1028, 1028, 89, 947, 1, 947, 947, 716, + /* 340 */ 110, 595, 716, 617, 461, 342, 715, 714, 947, 947, + /* 350 */ 947, 947, 1080, 678, 692, 9, 678, 497, 669, 693, + /* 360 */ 717, 54, 55, 427, 295, 1028, 1028, 681, 681, 52, + /* 370 */ 52, 53, 53, 53, 53, 717, 51, 51, 51, 51, + /* 380 */ 50, 50, 49, 49, 49, 48, 215, 432, 496, 382, + /* 390 */ 717, 553, 347, 254, 363, 258, 298, 139, 420, 218, + /* 400 */ 539, 69, 286, 287, 716, 684, 143, 231, 390, 343, + /* 410 */ 661, 54, 55, 427, 295, 716, 716, 681, 681, 52, + /* 420 */ 52, 53, 53, 53, 53, 425, 51, 51, 51, 51, + /* 430 */ 50, 50, 49, 49, 49, 48, 215, 684, 954, 608, + /* 440 */ 628, 692, 672, 663, 662, 585, 693, 41, 429, 207, + /* 450 */ 601, 491, 388, 954, 130, 652, 499, 377, 374, 373, + /* 460 */ 500, 431, 715, 714, 38, 39, 651, 199, 198, 673, + /* 470 */ 186, 40, 932, 699, 685, 372, 717, 715, 714, 3, + /* 480 */ 932, 351, 57, 653, 678, 616, 417, 932, 135, 688, + /* 490 */ 430, 59, 688, 157, 691, 717, 680, 691, 340, 1046, + /* 500 */ 954, 678, 690, 689, 688, 690, 689, 688, 685, 419, + /* 510 */ 666, 665, 724, 2, 1028, 1028, 636, 932, 208, 932, + /* 520 */ 932, 43, 386, 141, 294, 615, 611, 264, 284, 267, + /* 530 */ 932, 139, 932, 932, 122, 678, 400, 9, 678, 684, + /* 540 */ 669, 716, 142, 54, 55, 427, 295, 1028, 1028, 681, + /* 550 */ 681, 52, 52, 53, 53, 53, 53, 339, 51, 51, + /* 560 */ 51, 51, 50, 50, 49, 49, 49, 48, 215, 652, + /* 570 */ 91, 299, 483, 483, 628, 717, 661, 717, 715, 714, + /* 580 */ 651, 18, 717, 605, 717, 37, 677, 399, 311, 717, + /* 590 */ 34, 535, 535, 1028, 1028, 427, 295, 715, 714, 681, + /* 600 */ 681, 52, 52, 53, 53, 53, 53, 234, 51, 51, + /* 610 */ 51, 51, 50, 50, 49, 49, 49, 48, 215, 1027, + /* 620 */ 1027, 723, 54, 55, 427, 295, 1028, 1028, 681, 681, + /* 630 */ 52, 52, 53, 53, 53, 53, 42, 51, 51, 51, + /* 640 */ 51, 50, 50, 49, 49, 49, 48, 215, 1027, 1027, + /* 650 */ 1027, 1027, 1027, 1027, 1027, 1027, 1027, 1027, 1027, 1027, + /* 660 */ 1027, 1027, 717, 1027, 1027, 1027, 1027, 1027, 1027, 1027, + /* 670 */ 1027, 1027, 1027, 1027, 1028, 1028, 718, 715, 714, 715, + /* 680 */ 714, 454, 324, 201, 715, 714, 715, 714, 321, 695, + /* 690 */ 315, 715, 714, 658, 554, 214, 676, 46, 568, 32, + /* 700 */ 81, 88, 675, 54, 55, 427, 295, 1028, 1028, 681, + /* 710 */ 681, 52, 52, 53, 53, 53, 53, 1095, 51, 51, + /* 720 */ 51, 51, 50, 50, 49, 49, 49, 48, 215, 54, + /* 730 */ 55, 427, 295, 667, 423, 681, 681, 52, 52, 53, + /* 740 */ 53, 53, 53, 454, 51, 51, 51, 51, 50, 50, + /* 750 */ 49, 49, 49, 48, 215, 358, 955, 656, 643, 1150, + /* 760 */ 154, 436, 2, 487, 715, 714, 350, 54, 55, 427, + /* 770 */ 295, 955, 484, 681, 681, 52, 52, 53, 53, 53, + /* 780 */ 53, 160, 51, 51, 51, 51, 50, 50, 49, 49, + /* 790 */ 49, 48, 215, 600, 1095, 22, 717, 280, 307, 1134, + /* 800 */ 34, 717, 501, 502, 353, 629, 1134, 306, 485, 697, + /* 810 */ 268, 717, 229, 228, 337, 279, 717, 558, 955, 54, + /* 820 */ 55, 427, 295, 716, 717, 681, 681, 52, 52, 53, + /* 830 */ 53, 53, 53, 655, 51, 51, 51, 51, 50, 50, + /* 840 */ 49, 49, 49, 48, 215, 432, 1109, 81, 717, 225, + /* 850 */ 663, 662, 54, 55, 427, 295, 420, 153, 681, 681, + /* 860 */ 52, 52, 53, 53, 53, 53, 641, 51, 51, 51, + /* 870 */ 51, 50, 50, 49, 49, 49, 48, 215, 586, 89, + /* 880 */ 717, 231, 390, 425, 15, 717, 694, 413, 13, 895, + /* 890 */ 721, 207, 601, 617, 388, 435, 81, 574, 715, 714, + /* 900 */ 672, 272, 553, 715, 714, 41, 529, 537, 89, 14, + /* 910 */ 618, 698, 69, 715, 714, 716, 13, 209, 715, 714, + /* 920 */ 359, 617, 38, 39, 159, 617, 715, 714, 645, 40, + /* 930 */ 1143, 1143, 717, 345, 222, 674, 540, 3, 618, 469, + /* 940 */ 61, 285, 678, 625, 417, 473, 716, 688, 430, 45, + /* 950 */ 715, 714, 691, 617, 716, 416, 674, 402, 581, 678, + /* 960 */ 690, 689, 688, 429, 901, 901, 468, 467, 284, 466, + /* 970 */ 629, 81, 706, 633, 495, 580, 431, 526, 674, 1143, + /* 980 */ 1143, 716, 715, 714, 673, 92, 716, 715, 714, 91, + /* 990 */ 473, 401, 438, 678, 526, 9, 678, 370, 669, 409, + /* 1000 */ 54, 55, 427, 295, 89, 505, 681, 681, 52, 52, + /* 1010 */ 53, 53, 53, 53, 620, 51, 51, 51, 51, 50, + /* 1020 */ 50, 49, 49, 49, 48, 215, 717, 638, 311, 717, + /* 1030 */ 406, 658, 418, 214, 715, 714, 90, 642, 131, 334, + /* 1040 */ 415, 644, 54, 55, 427, 295, 451, 640, 681, 681, + /* 1050 */ 52, 52, 53, 53, 53, 53, 158, 51, 51, 51, + /* 1060 */ 51, 50, 50, 49, 49, 49, 48, 215, 369, 54, + /* 1070 */ 55, 427, 295, 12, 451, 681, 681, 52, 52, 53, + /* 1080 */ 53, 53, 53, 633, 51, 51, 51, 51, 50, 50, + /* 1090 */ 49, 49, 49, 48, 215, 36, 716, 8, 209, 54, + /* 1100 */ 55, 427, 295, 34, 589, 681, 681, 52, 52, 53, + /* 1110 */ 53, 53, 53, 704, 51, 51, 51, 51, 50, 50, + /* 1120 */ 49, 49, 49, 48, 215, 87, 138, 320, 715, 714, + /* 1130 */ 412, 715, 714, 274, 572, 54, 55, 427, 295, 30, + /* 1140 */ 624, 681, 681, 52, 52, 53, 53, 53, 53, 326, + /* 1150 */ 51, 51, 51, 51, 50, 50, 49, 49, 49, 48, + /* 1160 */ 215, 408, 717, 137, 91, 54, 55, 427, 295, 614, + /* 1170 */ 271, 681, 681, 52, 52, 53, 53, 53, 53, 465, + /* 1180 */ 51, 51, 51, 51, 50, 50, 49, 49, 49, 48, + /* 1190 */ 215, 136, 716, 538, 612, 91, 99, 54, 55, 427, + /* 1200 */ 295, 23, 607, 681, 681, 52, 52, 53, 53, 53, + /* 1210 */ 53, 395, 51, 51, 51, 51, 50, 50, 49, 49, + /* 1220 */ 49, 48, 215, 533, 1110, 516, 717, 91, 54, 55, + /* 1230 */ 427, 295, 141, 393, 681, 681, 52, 52, 53, 53, + /* 1240 */ 53, 53, 5, 51, 51, 51, 51, 50, 50, 49, + /* 1250 */ 49, 49, 48, 215, 717, 1108, 606, 91, 717, 476, + /* 1260 */ 54, 55, 427, 295, 715, 714, 681, 681, 52, 52, + /* 1270 */ 53, 53, 53, 53, 684, 51, 51, 51, 51, 50, + /* 1280 */ 50, 49, 49, 49, 48, 215, 684, 54, 58, 427, + /* 1290 */ 295, 476, 717, 681, 681, 52, 52, 53, 53, 53, + /* 1300 */ 53, 633, 51, 51, 51, 51, 50, 50, 49, 49, + /* 1310 */ 49, 48, 215, 432, 716, 251, 518, 604, 1035, 11, + /* 1320 */ 107, 629, 36, 531, 420, 55, 427, 295, 715, 714, + /* 1330 */ 681, 681, 52, 52, 53, 53, 53, 53, 224, 51, + /* 1340 */ 51, 51, 51, 50, 50, 49, 49, 49, 48, 215, + /* 1350 */ 91, 425, 717, 583, 531, 582, 715, 714, 429, 20, + /* 1360 */ 715, 714, 429, 684, 429, 619, 384, 352, 672, 562, + /* 1370 */ 387, 431, 623, 41, 489, 431, 684, 431, 657, 673, + /* 1380 */ 186, 308, 717, 673, 186, 673, 186, 622, 684, 470, + /* 1390 */ 38, 39, 599, 597, 715, 714, 432, 40, 719, 683, + /* 1400 */ 91, 830, 634, 596, 91, 3, 571, 420, 541, 591, + /* 1410 */ 678, 716, 417, 391, 385, 688, 430, 332, 707, 333, + /* 1420 */ 691, 525, 429, 582, 717, 65, 429, 678, 690, 689, + /* 1430 */ 688, 716, 316, 717, 425, 431, 316, 564, 316, 431, + /* 1440 */ 717, 590, 376, 673, 186, 64, 429, 673, 186, 429, + /* 1450 */ 273, 672, 19, 470, 715, 714, 41, 371, 378, 431, + /* 1460 */ 684, 678, 431, 9, 678, 684, 669, 673, 186, 563, + /* 1470 */ 673, 92, 717, 38, 39, 63, 648, 391, 383, 432, + /* 1480 */ 40, 391, 392, 129, 715, 714, 717, 279, 3, 270, + /* 1490 */ 420, 367, 613, 678, 705, 417, 316, 534, 688, 430, + /* 1500 */ 316, 404, 4, 691, 717, 553, 717, 716, 156, 284, + /* 1510 */ 678, 690, 689, 688, 441, 69, 325, 425, 716, 630, + /* 1520 */ 316, 717, 716, 642, 125, 79, 715, 714, 703, 27, + /* 1530 */ 26, 85, 517, 77, 672, 715, 714, 520, 447, 41, + /* 1540 */ 717, 716, 715, 714, 678, 549, 9, 678, 717, 669, + /* 1550 */ 511, 329, 700, 506, 520, 354, 38, 39, 504, 702, + /* 1560 */ 83, 432, 684, 40, 265, 716, 447, 286, 266, 226, + /* 1570 */ 141, 3, 420, 556, 715, 714, 678, 716, 417, 696, + /* 1580 */ 716, 688, 430, 515, 686, 422, 691, 717, 715, 714, + /* 1590 */ 498, 429, 716, 678, 690, 689, 688, 716, 716, 425, + /* 1600 */ 515, 480, 335, 439, 431, 253, 715, 714, 715, 714, + /* 1610 */ 119, 479, 673, 194, 250, 260, 672, 717, 480, 220, + /* 1620 */ 439, 41, 717, 715, 714, 10, 152, 678, 716, 9, + /* 1630 */ 678, 161, 669, 1036, 286, 594, 456, 455, 38, 39, + /* 1640 */ 72, 111, 715, 714, 432, 40, 635, 716, 646, 429, + /* 1650 */ 715, 714, 338, 3, 1038, 420, 437, 209, 678, 716, + /* 1660 */ 417, 202, 431, 688, 430, 642, 429, 96, 691, 221, + /* 1670 */ 673, 181, 631, 717, 223, 678, 690, 689, 688, 431, + /* 1680 */ 717, 429, 425, 206, 86, 716, 717, 673, 185, 715, + /* 1690 */ 714, 319, 626, 257, 431, 429, 522, 219, 720, 672, + /* 1700 */ 530, 559, 673, 189, 41, 716, 716, 318, 431, 678, + /* 1710 */ 710, 9, 678, 717, 669, 646, 673, 187, 490, 715, + /* 1720 */ 714, 38, 39, 642, 715, 714, 432, 150, 40, 134, + /* 1730 */ 709, 542, 429, 717, 149, 429, 3, 420, 708, 286, + /* 1740 */ 642, 678, 716, 417, 434, 431, 688, 430, 431, 286, + /* 1750 */ 429, 691, 716, 673, 195, 642, 673, 193, 678, 690, + /* 1760 */ 689, 688, 716, 431, 425, 398, 256, 621, 368, 642, + /* 1770 */ 255, 673, 196, 147, 328, 715, 714, 429, 716, 716, + /* 1780 */ 716, 672, 715, 714, 327, 82, 41, 433, 715, 714, + /* 1790 */ 431, 16, 678, 701, 9, 678, 598, 669, 673, 200, + /* 1800 */ 503, 532, 145, 38, 39, 215, 642, 232, 432, 642, + /* 1810 */ 40, 47, 671, 247, 31, 715, 714, 482, 3, 420, + /* 1820 */ 646, 275, 475, 678, 642, 417, 716, 528, 715, 430, + /* 1830 */ 646, 569, 429, 691, 716, 715, 714, 550, 231, 291, + /* 1840 */ 678, 690, 689, 688, 716, 431, 425, 524, 245, 18, + /* 1850 */ 716, 642, 478, 673, 233, 98, 290, 239, 243, 217, + /* 1860 */ 429, 716, 474, 672, 717, 241, 35, 405, 238, 471, + /* 1870 */ 303, 716, 289, 431, 678, 288, 9, 678, 716, 669, + /* 1880 */ 235, 673, 296, 670, 322, 38, 39, 414, 102, 44, + /* 1890 */ 717, 300, 40, 716, 407, 302, 148, 66, 227, 151, + /* 1900 */ 3, 213, 81, 269, 97, 678, 642, 417, 410, 140, + /* 1910 */ 688, 430, 717, 262, 429, 691, 716, 361, 109, 348, + /* 1920 */ 394, 390, 678, 690, 689, 688, 716, 431, 584, 429, + /* 1930 */ 716, 429, 716, 429, 642, 673, 192, 593, 133, 304, + /* 1940 */ 717, 146, 431, 381, 431, 579, 431, 429, 277, 429, + /* 1950 */ 673, 184, 673, 172, 673, 163, 678, 578, 9, 678, + /* 1960 */ 431, 669, 431, 330, 429, 575, 715, 714, 673, 171, + /* 1970 */ 673, 183, 717, 574, 717, 573, 429, 431, 317, 310, + /* 1980 */ 548, 555, 443, 547, 546, 673, 188, 429, 642, 431, + /* 1990 */ 545, 309, 715, 714, 536, 716, 128, 673, 314, 428, + /* 2000 */ 431, 80, 127, 642, 519, 642, 429, 642, 673, 313, + /* 2010 */ 366, 429, 716, 341, 715, 714, 717, 106, 429, 431, + /* 2020 */ 211, 642, 261, 642, 431, 472, 493, 673, 312, 126, + /* 2030 */ 717, 431, 673, 170, 355, 429, 282, 25, 642, 673, + /* 2040 */ 93, 429, 715, 714, 124, 527, 429, 263, 431, 716, + /* 2050 */ 642, 429, 252, 78, 431, 105, 673, 169, 249, 431, + /* 2060 */ 716, 642, 673, 168, 431, 716, 429, 673, 166, 429, + /* 2070 */ 84, 716, 673, 165, 715, 714, 715, 714, 717, 431, + /* 2080 */ 642, 717, 431, 429, 123, 642, 444, 673, 182, 429, + /* 2090 */ 673, 164, 642, 240, 236, 364, 431, 717, 121, 464, + /* 2100 */ 429, 717, 431, 477, 673, 190, 716, 716, 717, 642, + /* 2110 */ 673, 191, 442, 431, 429, 642, 155, 429, 715, 714, + /* 2120 */ 642, 673, 174, 717, 429, 642, 514, 431, 429, 237, + /* 2130 */ 431, 429, 715, 714, 429, 673, 173, 431, 673, 175, + /* 2140 */ 642, 431, 716, 642, 431, 673, 178, 431, 429, 673, + /* 2150 */ 94, 349, 673, 177, 429, 673, 176, 642, 104, 120, + /* 2160 */ 494, 431, 103, 642, 429, 346, 118, 431, 344, 673, + /* 2170 */ 180, 117, 76, 75, 642, 673, 179, 431, 647, 116, + /* 2180 */ 715, 714, 74, 715, 714, 673, 167, 115, 642, 73, + /* 2190 */ 114, 642, 481, 643, 323, 113, 397, 24, 642, 715, + /* 2200 */ 714, 452, 642, 715, 714, 642, 21, 450, 642, 431, + /* 2210 */ 715, 714, 101, 100, 446, 112, 62, 673, 70, 440, + /* 2220 */ 162, 292, 642, 664, 552, 715, 714, 570, 642, 632, + /* 2230 */ 426, 650, 637, 627, 278, 197, 375, 660, 642, 259, + /* 2240 */ 362, 523, 6, 305, 682, 659, 649, 557, 210, 521, + /* 2250 */ 29, 365, 424, 293, 71, 567, 561, 560, 488, 588, + /* 2260 */ 587, 81, 551, 1151, 1151, 1151, 1151, 1151, 1151, 1151, + /* 2270 */ 642, }; static const YYCODETYPE yy_lookahead[] = { - /* 0 */ 4, 81, 82, 83, 84, 85, 86, 87, 4, 58, - /* 10 */ 5, 15, 72, 73, 74, 75, 76, 77, 78, 79, - /* 20 */ 80, 81, 82, 83, 84, 85, 86, 87, 89, 33, - /* 30 */ 34, 26, 34, 28, 72, 73, 74, 75, 42, 77, + /* 0 */ 4, 110, 111, 4, 81, 82, 83, 84, 85, 86, + /* 10 */ 87, 15, 72, 73, 74, 75, 76, 77, 78, 79, + /* 20 */ 80, 81, 82, 83, 84, 85, 86, 87, 4, 33, + /* 30 */ 34, 194, 195, 196, 72, 73, 74, 75, 42, 77, /* 40 */ 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, - /* 50 */ 45, 55, 96, 48, 98, 59, 93, 104, 62, 63, + /* 50 */ 89, 55, 124, 125, 126, 59, 33, 34, 62, 63, /* 60 */ 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, - /* 70 */ 74, 75, 14, 77, 78, 79, 80, 81, 82, 83, - /* 80 */ 84, 85, 86, 87, 88, 4, 185, 134, 4, 136, - /* 90 */ 137, 111, 96, 35, 4, 104, 15, 101, 104, 103, - /* 100 */ 96, 107, 106, 107, 46, 101, 61, 111, 64, 129, - /* 110 */ 106, 107, 110, 111, 118, 119, 120, 121, 167, 218, - /* 120 */ 219, 123, 118, 42, 83, 84, 85, 86, 87, 104, - /* 130 */ 51, 87, 53, 142, 138, 139, 61, 133, 144, 145, - /* 140 */ 59, 96, 97, 59, 4, 64, 245, 246, 152, 248, - /* 150 */ 154, 155, 156, 109, 110, 111, 112, 113, 114, 115, - /* 160 */ 97, 4, 81, 82, 83, 81, 82, 266, 267, 88, - /* 170 */ 89, 96, 97, 129, 95, 4, 151, 96, 97, 104, - /* 180 */ 96, 91, 101, 4, 103, 104, 128, 106, 107, 4, - /* 190 */ 106, 5, 111, 106, 15, 111, 106, 107, 111, 118, - /* 200 */ 119, 120, 121, 119, 120, 121, 119, 120, 121, 8, - /* 210 */ 4, 10, 26, 12, 28, 134, 61, 136, 137, 61, - /* 220 */ 4, 42, 21, 142, 23, 214, 45, 216, 147, 148, - /* 230 */ 149, 150, 151, 152, 48, 154, 155, 156, 59, 96, - /* 240 */ 161, 97, 41, 64, 177, 44, 106, 107, 104, 48, - /* 250 */ 49, 96, 97, 52, 96, 97, 55, 190, 57, 104, - /* 260 */ 81, 82, 105, 106, 107, 99, 109, 88, 89, 112, - /* 270 */ 113, 114, 101, 86, 87, 96, 97, 106, 107, 212, - /* 280 */ 101, 4, 103, 104, 144, 106, 107, 130, 117, 118, - /* 290 */ 111, 106, 107, 92, 51, 94, 53, 118, 119, 120, - /* 300 */ 121, 177, 96, 118, 135, 124, 125, 126, 177, 140, - /* 310 */ 33, 34, 106, 134, 190, 136, 137, 146, 102, 138, - /* 320 */ 139, 190, 106, 107, 99, 258, 147, 148, 149, 150, - /* 330 */ 99, 152, 131, 154, 155, 156, 212, 152, 95, 62, - /* 340 */ 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, - /* 350 */ 73, 74, 75, 4, 77, 78, 79, 80, 81, 82, - /* 360 */ 83, 84, 85, 86, 87, 4, 177, 166, 4, 194, - /* 370 */ 195, 196, 177, 177, 4, 98, 15, 252, 247, 190, - /* 380 */ 177, 185, 258, 106, 181, 190, 190, 198, 199, 62, - /* 390 */ 63, 64, 65, 190, 269, 68, 69, 70, 71, 72, - /* 400 */ 73, 74, 75, 42, 77, 78, 79, 80, 81, 82, - /* 410 */ 83, 84, 85, 86, 87, 219, 89, 4, 141, 19, - /* 420 */ 59, 232, 233, 109, 24, 64, 112, 113, 114, 29, - /* 430 */ 225, 104, 236, 237, 220, 221, 261, 223, 177, 234, - /* 440 */ 251, 97, 81, 82, 130, 81, 82, 4, 104, 88, - /* 450 */ 89, 190, 4, 258, 4, 106, 107, 96, 97, 198, - /* 460 */ 199, 99, 101, 249, 103, 104, 111, 106, 107, 71, - /* 470 */ 106, 107, 111, 34, 110, 105, 106, 107, 151, 118, - /* 480 */ 119, 120, 121, 119, 120, 220, 221, 123, 223, 125, - /* 490 */ 19, 43, 33, 34, 96, 134, 97, 136, 137, 40, - /* 500 */ 29, 152, 96, 64, 158, 244, 160, 83, 147, 96, - /* 510 */ 149, 150, 251, 152, 101, 154, 155, 156, 97, 106, - /* 520 */ 107, 62, 63, 64, 65, 66, 67, 68, 69, 70, - /* 530 */ 71, 72, 73, 74, 75, 97, 77, 78, 79, 80, - /* 540 */ 81, 82, 83, 84, 85, 86, 87, 9, 100, 106, - /* 550 */ 107, 101, 205, 206, 106, 107, 106, 107, 20, 135, - /* 560 */ 213, 118, 123, 104, 140, 123, 4, 190, 129, 4, - /* 570 */ 96, 33, 34, 64, 65, 198, 133, 68, 69, 70, - /* 580 */ 71, 72, 73, 74, 75, 143, 77, 78, 79, 80, - /* 590 */ 81, 82, 83, 84, 85, 86, 87, 33, 34, 55, - /* 600 */ 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, - /* 610 */ 72, 73, 74, 75, 164, 77, 78, 79, 80, 81, - /* 620 */ 82, 83, 84, 85, 86, 87, 62, 63, 64, 65, - /* 630 */ 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, - /* 640 */ 4, 77, 78, 79, 80, 81, 82, 83, 84, 85, - /* 650 */ 86, 87, 33, 34, 110, 77, 78, 79, 80, 81, - /* 660 */ 82, 83, 84, 85, 86, 87, 177, 177, 106, 107, - /* 670 */ 50, 106, 182, 108, 54, 104, 186, 187, 116, 190, - /* 680 */ 190, 62, 63, 64, 65, 66, 67, 68, 69, 70, - /* 690 */ 71, 72, 73, 74, 75, 12, 77, 78, 79, 80, - /* 700 */ 81, 82, 83, 84, 85, 86, 87, 62, 63, 64, - /* 710 */ 65, 98, 23, 68, 69, 70, 71, 72, 73, 74, - /* 720 */ 75, 96, 77, 78, 79, 80, 81, 82, 83, 84, - /* 730 */ 85, 86, 87, 113, 89, 188, 100, 101, 191, 192, - /* 740 */ 193, 97, 106, 107, 55, 62, 63, 64, 65, 104, - /* 750 */ 98, 68, 69, 70, 71, 72, 73, 74, 75, 30, - /* 760 */ 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, - /* 770 */ 87, 96, 89, 38, 4, 97, 177, 4, 89, 4, - /* 780 */ 23, 161, 104, 104, 4, 170, 171, 172, 173, 190, - /* 790 */ 194, 195, 196, 64, 195, 196, 151, 62, 63, 64, - /* 800 */ 65, 122, 4, 68, 69, 70, 71, 72, 73, 74, - /* 810 */ 75, 179, 77, 78, 79, 80, 81, 82, 83, 84, - /* 820 */ 85, 86, 87, 4, 89, 55, 124, 125, 126, 62, - /* 830 */ 63, 64, 65, 4, 15, 68, 69, 70, 71, 72, - /* 840 */ 73, 74, 75, 177, 77, 78, 79, 80, 81, 82, - /* 850 */ 83, 84, 85, 86, 87, 97, 190, 261, 83, 260, - /* 860 */ 261, 42, 104, 4, 9, 98, 96, 97, 169, 119, - /* 870 */ 120, 101, 0, 174, 55, 20, 106, 107, 59, 106, - /* 880 */ 107, 106, 107, 64, 185, 97, 106, 107, 118, 257, - /* 890 */ 185, 118, 104, 118, 96, 33, 34, 25, 118, 101, - /* 900 */ 81, 82, 97, 133, 106, 107, 4, 88, 138, 139, - /* 910 */ 4, 214, 4, 216, 4, 96, 118, 218, 219, 146, - /* 920 */ 101, 96, 103, 218, 219, 106, 107, 152, 66, 67, - /* 930 */ 111, 133, 124, 125, 126, 106, 107, 118, 119, 120, - /* 940 */ 121, 177, 144, 145, 245, 246, 177, 248, 185, 185, - /* 950 */ 245, 246, 104, 248, 190, 186, 187, 138, 139, 190, - /* 960 */ 101, 89, 198, 199, 97, 106, 107, 97, 81, 82, - /* 970 */ 271, 152, 267, 154, 155, 156, 185, 118, 62, 63, - /* 980 */ 64, 65, 219, 219, 68, 69, 70, 71, 72, 73, - /* 990 */ 74, 75, 97, 77, 78, 79, 80, 81, 82, 83, - /* 1000 */ 84, 85, 86, 87, 158, 146, 119, 120, 106, 107, - /* 1010 */ 219, 101, 106, 107, 106, 251, 106, 107, 272, 273, - /* 1020 */ 62, 63, 64, 65, 118, 117, 68, 69, 70, 71, - /* 1030 */ 72, 73, 74, 75, 97, 77, 78, 79, 80, 81, - /* 1040 */ 82, 83, 84, 85, 86, 87, 144, 62, 63, 64, - /* 1050 */ 65, 4, 146, 68, 69, 70, 71, 72, 73, 74, - /* 1060 */ 75, 177, 77, 78, 79, 80, 81, 82, 83, 84, - /* 1070 */ 85, 86, 87, 163, 190, 159, 191, 192, 193, 195, - /* 1080 */ 196, 97, 97, 62, 63, 64, 65, 97, 104, 68, - /* 1090 */ 69, 70, 71, 72, 73, 74, 75, 104, 77, 78, - /* 1100 */ 79, 80, 81, 82, 83, 84, 85, 86, 87, 185, - /* 1110 */ 172, 173, 13, 62, 63, 64, 65, 159, 97, 68, - /* 1120 */ 69, 70, 71, 72, 73, 74, 75, 177, 77, 78, - /* 1130 */ 79, 80, 81, 82, 83, 84, 85, 86, 87, 97, - /* 1140 */ 190, 185, 104, 219, 260, 261, 104, 97, 97, 62, - /* 1150 */ 63, 64, 65, 106, 107, 68, 69, 70, 71, 72, - /* 1160 */ 73, 74, 75, 116, 77, 78, 79, 80, 81, 82, - /* 1170 */ 83, 84, 85, 86, 87, 219, 4, 138, 139, 62, - /* 1180 */ 63, 64, 65, 25, 97, 68, 69, 70, 71, 72, - /* 1190 */ 73, 74, 75, 243, 77, 78, 79, 80, 81, 82, - /* 1200 */ 83, 84, 85, 86, 87, 185, 13, 185, 197, 96, - /* 1210 */ 13, 62, 63, 64, 65, 98, 205, 68, 69, 70, - /* 1220 */ 71, 72, 73, 74, 75, 97, 77, 78, 79, 80, - /* 1230 */ 81, 82, 83, 84, 85, 86, 87, 55, 89, 219, - /* 1240 */ 4, 219, 62, 63, 64, 65, 30, 89, 68, 69, - /* 1250 */ 70, 71, 72, 73, 74, 75, 144, 77, 78, 79, - /* 1260 */ 80, 81, 82, 83, 84, 85, 86, 87, 99, 89, - /* 1270 */ 99, 89, 104, 101, 62, 63, 64, 65, 106, 107, - /* 1280 */ 68, 69, 70, 71, 72, 73, 74, 75, 191, 77, - /* 1290 */ 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, - /* 1300 */ 4, 62, 63, 64, 65, 4, 83, 68, 69, 70, - /* 1310 */ 71, 72, 73, 74, 75, 177, 77, 78, 79, 80, - /* 1320 */ 81, 82, 83, 84, 85, 86, 87, 4, 190, 4, - /* 1330 */ 96, 191, 235, 201, 162, 201, 198, 199, 15, 63, - /* 1340 */ 64, 65, 106, 107, 68, 69, 70, 71, 72, 73, - /* 1350 */ 74, 75, 4, 77, 78, 79, 80, 81, 82, 83, - /* 1360 */ 84, 85, 86, 87, 177, 42, 177, 97, 177, 4, - /* 1370 */ 232, 233, 177, 186, 187, 235, 97, 190, 177, 190, - /* 1380 */ 185, 190, 59, 104, 252, 190, 252, 64, 152, 251, - /* 1390 */ 97, 190, 135, 198, 199, 177, 209, 104, 211, 198, - /* 1400 */ 199, 212, 106, 4, 81, 82, 96, 106, 190, 177, - /* 1410 */ 4, 88, 191, 117, 219, 97, 198, 199, 117, 96, - /* 1420 */ 97, 15, 190, 177, 101, 100, 103, 232, 233, 106, - /* 1430 */ 107, 106, 107, 232, 111, 4, 190, 177, 4, 97, - /* 1440 */ 4, 118, 119, 120, 121, 17, 251, 258, 42, 101, - /* 1450 */ 190, 97, 251, 4, 106, 107, 235, 97, 198, 199, - /* 1460 */ 177, 38, 244, 4, 104, 59, 101, 276, 96, 251, - /* 1470 */ 64, 106, 107, 190, 4, 152, 4, 154, 155, 156, - /* 1480 */ 132, 198, 199, 118, 6, 4, 191, 81, 82, 243, - /* 1490 */ 38, 96, 96, 4, 88, 97, 96, 177, 38, 100, - /* 1500 */ 101, 181, 96, 97, 15, 106, 107, 101, 276, 103, - /* 1510 */ 190, 251, 106, 107, 254, 232, 4, 111, 4, 129, - /* 1520 */ 4, 96, 115, 177, 118, 119, 120, 121, 64, 4, - /* 1530 */ 235, 42, 101, 103, 251, 101, 190, 106, 107, 98, - /* 1540 */ 106, 107, 106, 107, 198, 199, 4, 252, 59, 118, - /* 1550 */ 101, 177, 118, 64, 4, 106, 107, 12, 152, 4, - /* 1560 */ 154, 155, 156, 4, 190, 106, 107, 118, 98, 123, - /* 1570 */ 81, 82, 128, 101, 142, 4, 106, 88, 106, 107, - /* 1580 */ 71, 177, 101, 89, 4, 96, 15, 106, 107, 139, - /* 1590 */ 101, 132, 103, 157, 190, 106, 107, 251, 71, 177, - /* 1600 */ 111, 4, 198, 199, 153, 133, 89, 118, 119, 120, - /* 1610 */ 121, 141, 190, 42, 22, 101, 91, 101, 106, 107, - /* 1620 */ 106, 107, 106, 107, 177, 177, 4, 146, 181, 47, - /* 1630 */ 59, 106, 107, 91, 118, 64, 4, 190, 190, 127, - /* 1640 */ 39, 152, 104, 154, 155, 156, 39, 158, 106, 107, - /* 1650 */ 91, 177, 81, 82, 161, 251, 106, 107, 4, 88, - /* 1660 */ 212, 106, 107, 177, 190, 106, 107, 96, 97, 15, - /* 1670 */ 123, 96, 101, 118, 103, 177, 190, 106, 107, 165, - /* 1680 */ 177, 96, 111, 95, 198, 199, 106, 107, 190, 118, - /* 1690 */ 119, 120, 121, 190, 4, 177, 42, 143, 103, 97, - /* 1700 */ 97, 198, 199, 106, 107, 95, 258, 177, 190, 177, - /* 1710 */ 236, 237, 93, 59, 164, 37, 198, 199, 64, 36, - /* 1720 */ 190, 141, 190, 152, 189, 154, 155, 156, 106, 107, - /* 1730 */ 198, 199, 252, 4, 238, 81, 82, 251, 106, 107, - /* 1740 */ 4, 204, 88, 146, 204, 177, 177, 4, 273, 177, - /* 1750 */ 96, 15, 275, 176, 251, 101, 90, 103, 190, 190, - /* 1760 */ 106, 107, 190, 177, 177, 111, 198, 199, 146, 251, - /* 1770 */ 198, 199, 118, 119, 120, 121, 190, 190, 42, 4, - /* 1780 */ 275, 176, 4, 251, 152, 198, 199, 176, 49, 177, - /* 1790 */ 7, 177, 176, 181, 11, 59, 106, 107, 177, 104, - /* 1800 */ 64, 4, 190, 177, 190, 4, 152, 181, 154, 155, - /* 1810 */ 156, 190, 198, 199, 4, 32, 190, 81, 82, 251, - /* 1820 */ 178, 177, 4, 251, 88, 181, 178, 177, 183, 100, - /* 1830 */ 60, 181, 96, 15, 190, 106, 107, 101, 251, 103, - /* 1840 */ 190, 4, 106, 107, 180, 184, 177, 111, 221, 106, - /* 1850 */ 107, 56, 162, 138, 118, 119, 120, 121, 177, 190, - /* 1860 */ 42, 118, 177, 177, 243, 251, 181, 198, 199, 151, - /* 1870 */ 177, 190, 148, 177, 181, 190, 190, 59, 227, 198, - /* 1880 */ 199, 106, 107, 190, 106, 107, 190, 228, 152, 177, - /* 1890 */ 154, 155, 156, 118, 198, 199, 118, 229, 177, 81, - /* 1900 */ 82, 4, 190, 106, 107, 177, 88, 106, 107, 177, - /* 1910 */ 100, 190, 230, 149, 96, 118, 106, 107, 190, 101, - /* 1920 */ 251, 103, 190, 237, 106, 107, 198, 199, 177, 111, - /* 1930 */ 198, 199, 251, 177, 133, 177, 118, 119, 120, 121, - /* 1940 */ 177, 190, 4, 106, 107, 177, 190, 251, 190, 198, - /* 1950 */ 199, 4, 147, 190, 198, 199, 198, 199, 190, 4, - /* 1960 */ 87, 198, 199, 177, 177, 231, 198, 199, 4, 177, - /* 1970 */ 152, 150, 154, 155, 156, 252, 190, 190, 4, 251, - /* 1980 */ 177, 177, 190, 251, 198, 199, 177, 203, 177, 152, - /* 1990 */ 198, 199, 181, 190, 190, 64, 259, 96, 87, 190, - /* 2000 */ 177, 190, 251, 106, 107, 177, 158, 251, 255, 251, - /* 2010 */ 177, 177, 177, 190, 251, 118, 177, 177, 190, 251, - /* 2020 */ 177, 198, 199, 190, 190, 190, 241, 177, 203, 190, - /* 2030 */ 190, 198, 199, 190, 177, 177, 177, 251, 198, 199, - /* 2040 */ 190, 198, 199, 251, 106, 107, 177, 190, 190, 190, - /* 2050 */ 99, 177, 99, 106, 107, 198, 199, 198, 199, 190, - /* 2060 */ 241, 106, 107, 177, 190, 118, 177, 198, 199, 223, - /* 2070 */ 106, 107, 198, 199, 251, 4, 190, 177, 200, 190, - /* 2080 */ 106, 107, 118, 177, 251, 4, 123, 198, 199, 4, - /* 2090 */ 190, 251, 118, 200, 251, 208, 190, 139, 198, 199, - /* 2100 */ 177, 177, 177, 165, 198, 199, 177, 31, 251, 200, - /* 2110 */ 251, 122, 202, 190, 190, 190, 177, 177, 163, 190, - /* 2120 */ 251, 198, 199, 198, 199, 251, 177, 198, 199, 190, - /* 2130 */ 190, 177, 200, 177, 208, 200, 177, 198, 199, 190, - /* 2140 */ 251, 200, 200, 200, 190, 177, 190, 198, 199, 190, - /* 2150 */ 177, 251, 198, 199, 198, 199, 177, 251, 190, 241, - /* 2160 */ 177, 99, 177, 190, 203, 203, 198, 199, 180, 190, - /* 2170 */ 177, 198, 199, 190, 251, 190, 251, 106, 107, 203, - /* 2180 */ 251, 100, 177, 190, 180, 177, 99, 106, 107, 177, - /* 2190 */ 251, 106, 107, 177, 99, 190, 177, 264, 190, 27, - /* 2200 */ 251, 241, 190, 158, 99, 251, 190, 251, 227, 190, - /* 2210 */ 265, 215, 62, 99, 99, 250, 96, 215, 180, 251, - /* 2220 */ 99, 241, 227, 152, 251, 241, 180, 99, 217, 60, - /* 2230 */ 99, 217, 99, 99, 217, 217, 99, 152, 241, 99, - /* 2240 */ 268, 18, 241, 268, 99, 99, 99, 241, 270, 16, - /* 2250 */ 224, 226, 261, 261, 201, 256, 201, 242, 206, 210, - /* 2260 */ 240, 202, 227, 242, 242, 175, 224, 239, 191, 191, - /* 2270 */ 191, 191, 262, 222, 216, 207, 263, 253, 211, 207, - /* 2280 */ 207, 274, 198, 55, 198, + /* 70 */ 74, 75, 104, 77, 78, 79, 80, 81, 82, 83, + /* 80 */ 84, 85, 86, 87, 88, 4, 185, 177, 4, 66, + /* 90 */ 67, 4, 96, 4, 97, 93, 15, 101, 261, 103, + /* 100 */ 190, 104, 106, 107, 105, 106, 107, 111, 109, 64, + /* 110 */ 142, 112, 113, 114, 118, 119, 120, 121, 5, 218, + /* 120 */ 219, 96, 4, 42, 83, 84, 85, 86, 87, 130, + /* 130 */ 106, 107, 87, 34, 138, 139, 51, 191, 53, 26, + /* 140 */ 59, 28, 118, 86, 87, 64, 245, 246, 152, 248, + /* 150 */ 154, 155, 123, 157, 109, 110, 111, 112, 113, 114, + /* 160 */ 115, 48, 81, 82, 83, 81, 82, 266, 267, 88, + /* 170 */ 89, 4, 143, 4, 129, 61, 152, 96, 97, 185, + /* 180 */ 95, 235, 101, 96, 103, 104, 276, 106, 107, 252, + /* 190 */ 106, 107, 111, 106, 110, 106, 107, 4, 252, 118, + /* 200 */ 119, 120, 121, 119, 120, 4, 269, 123, 177, 125, + /* 210 */ 96, 97, 218, 219, 4, 134, 15, 136, 137, 101, + /* 220 */ 0, 190, 123, 142, 106, 107, 195, 196, 147, 148, + /* 230 */ 149, 150, 151, 152, 97, 154, 155, 99, 157, 245, + /* 240 */ 246, 152, 248, 42, 4, 25, 161, 77, 78, 79, + /* 250 */ 80, 81, 82, 83, 84, 85, 86, 87, 205, 206, + /* 260 */ 59, 267, 19, 104, 106, 64, 213, 24, 101, 111, + /* 270 */ 101, 19, 29, 106, 107, 106, 107, 119, 120, 121, + /* 280 */ 162, 29, 81, 82, 117, 118, 23, 118, 61, 88, + /* 290 */ 89, 260, 261, 134, 101, 136, 137, 96, 97, 106, + /* 300 */ 107, 225, 101, 4, 103, 104, 96, 106, 107, 89, + /* 310 */ 234, 101, 111, 146, 45, 146, 106, 107, 55, 118, + /* 320 */ 119, 120, 121, 96, 97, 23, 177, 97, 118, 177, + /* 330 */ 99, 104, 33, 34, 104, 134, 96, 136, 137, 190, + /* 340 */ 99, 101, 190, 133, 195, 196, 106, 107, 147, 148, + /* 350 */ 149, 150, 89, 152, 135, 154, 155, 164, 157, 140, + /* 360 */ 4, 62, 63, 64, 65, 66, 67, 68, 69, 70, + /* 370 */ 71, 72, 73, 74, 75, 4, 77, 78, 79, 80, + /* 380 */ 81, 82, 83, 84, 85, 86, 87, 4, 50, 83, + /* 390 */ 4, 177, 54, 124, 125, 126, 182, 98, 15, 247, + /* 400 */ 186, 187, 177, 177, 190, 106, 99, 138, 139, 260, + /* 410 */ 261, 62, 63, 64, 65, 190, 190, 68, 69, 70, + /* 420 */ 71, 72, 73, 74, 75, 42, 77, 78, 79, 80, + /* 430 */ 81, 82, 83, 84, 85, 86, 87, 4, 89, 83, + /* 440 */ 141, 135, 59, 119, 120, 59, 140, 64, 177, 220, + /* 450 */ 221, 113, 223, 104, 109, 9, 7, 112, 113, 114, + /* 460 */ 11, 190, 106, 107, 81, 82, 20, 81, 82, 198, + /* 470 */ 199, 88, 89, 102, 118, 130, 4, 106, 107, 96, + /* 480 */ 97, 32, 96, 258, 101, 104, 103, 104, 107, 106, + /* 490 */ 107, 96, 106, 98, 111, 4, 111, 111, 58, 161, + /* 500 */ 151, 118, 119, 120, 121, 119, 120, 121, 152, 194, + /* 510 */ 195, 196, 172, 173, 33, 34, 97, 134, 96, 136, + /* 520 */ 137, 40, 251, 104, 253, 144, 145, 51, 177, 53, + /* 530 */ 147, 98, 149, 150, 104, 152, 185, 154, 155, 106, + /* 540 */ 157, 190, 104, 62, 63, 64, 65, 66, 67, 68, + /* 550 */ 69, 70, 71, 72, 73, 74, 75, 25, 77, 78, + /* 560 */ 79, 80, 81, 82, 83, 84, 85, 86, 87, 9, + /* 570 */ 219, 95, 100, 101, 141, 4, 261, 4, 106, 107, + /* 580 */ 20, 151, 4, 97, 4, 104, 97, 236, 237, 4, + /* 590 */ 104, 100, 101, 33, 34, 64, 65, 106, 107, 68, + /* 600 */ 69, 70, 71, 72, 73, 74, 75, 167, 77, 78, + /* 610 */ 79, 80, 81, 82, 83, 84, 85, 86, 87, 33, + /* 620 */ 34, 89, 62, 63, 64, 65, 66, 67, 68, 69, + /* 630 */ 70, 71, 72, 73, 74, 75, 96, 77, 78, 79, + /* 640 */ 80, 81, 82, 83, 84, 85, 86, 87, 62, 63, + /* 650 */ 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, + /* 660 */ 74, 75, 4, 77, 78, 79, 80, 81, 82, 83, + /* 670 */ 84, 85, 86, 87, 33, 34, 91, 106, 107, 106, + /* 680 */ 107, 101, 272, 273, 106, 107, 106, 107, 179, 116, + /* 690 */ 188, 106, 107, 191, 192, 193, 97, 158, 127, 160, + /* 700 */ 55, 43, 97, 62, 63, 64, 65, 66, 67, 68, + /* 710 */ 69, 70, 71, 72, 73, 74, 75, 12, 77, 78, + /* 720 */ 79, 80, 81, 82, 83, 84, 85, 86, 87, 62, + /* 730 */ 63, 64, 65, 97, 156, 68, 69, 70, 71, 72, + /* 740 */ 73, 74, 75, 163, 77, 78, 79, 80, 81, 82, + /* 750 */ 83, 84, 85, 86, 87, 110, 89, 97, 100, 170, + /* 760 */ 171, 172, 173, 61, 106, 107, 257, 62, 63, 64, + /* 770 */ 65, 104, 61, 68, 69, 70, 71, 72, 73, 74, + /* 780 */ 75, 96, 77, 78, 79, 80, 81, 82, 83, 84, + /* 790 */ 85, 86, 87, 97, 89, 38, 4, 111, 96, 97, + /* 800 */ 104, 4, 124, 125, 126, 191, 104, 96, 97, 197, + /* 810 */ 177, 4, 81, 82, 181, 129, 4, 205, 151, 62, + /* 820 */ 63, 64, 65, 190, 4, 68, 69, 70, 71, 72, + /* 830 */ 73, 74, 75, 97, 77, 78, 79, 80, 81, 82, + /* 840 */ 83, 84, 85, 86, 87, 4, 89, 55, 4, 235, + /* 850 */ 119, 120, 62, 63, 64, 65, 15, 104, 68, 69, + /* 860 */ 70, 71, 72, 73, 74, 75, 201, 77, 78, 79, + /* 870 */ 80, 81, 82, 83, 84, 85, 86, 87, 190, 104, + /* 880 */ 4, 138, 139, 42, 71, 4, 198, 98, 96, 97, + /* 890 */ 169, 220, 221, 101, 223, 174, 55, 122, 106, 107, + /* 900 */ 59, 97, 177, 106, 107, 64, 185, 100, 104, 96, + /* 910 */ 118, 186, 187, 106, 107, 190, 96, 252, 106, 107, + /* 920 */ 249, 101, 81, 82, 96, 133, 106, 107, 97, 88, + /* 930 */ 138, 139, 4, 177, 209, 5, 211, 96, 118, 218, + /* 940 */ 219, 177, 101, 146, 103, 101, 190, 106, 107, 159, + /* 950 */ 106, 107, 111, 133, 190, 185, 26, 30, 28, 118, + /* 960 */ 119, 120, 121, 177, 144, 145, 245, 246, 177, 248, + /* 970 */ 191, 55, 91, 177, 162, 45, 190, 101, 48, 138, + /* 980 */ 139, 190, 106, 107, 198, 199, 190, 106, 107, 219, + /* 990 */ 146, 64, 271, 152, 118, 154, 155, 97, 157, 98, + /* 1000 */ 62, 63, 64, 65, 104, 89, 68, 69, 70, 71, + /* 1010 */ 72, 73, 74, 75, 235, 77, 78, 79, 80, 81, + /* 1020 */ 82, 83, 84, 85, 86, 87, 4, 236, 237, 4, + /* 1030 */ 244, 191, 192, 193, 106, 107, 98, 251, 34, 243, + /* 1040 */ 276, 97, 62, 63, 64, 65, 118, 201, 68, 69, + /* 1050 */ 70, 71, 72, 73, 74, 75, 96, 77, 78, 79, + /* 1060 */ 80, 81, 82, 83, 84, 85, 86, 87, 64, 62, + /* 1070 */ 63, 64, 65, 13, 146, 68, 69, 70, 71, 72, + /* 1080 */ 73, 74, 75, 177, 77, 78, 79, 80, 81, 82, + /* 1090 */ 83, 84, 85, 86, 87, 104, 190, 13, 252, 62, + /* 1100 */ 63, 64, 65, 104, 97, 68, 69, 70, 71, 72, + /* 1110 */ 73, 74, 75, 91, 77, 78, 79, 80, 81, 82, + /* 1120 */ 83, 84, 85, 86, 87, 96, 13, 123, 106, 107, + /* 1130 */ 185, 106, 107, 129, 97, 62, 63, 64, 65, 159, + /* 1140 */ 30, 68, 69, 70, 71, 72, 73, 74, 75, 243, + /* 1150 */ 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, + /* 1160 */ 87, 185, 4, 97, 219, 62, 63, 64, 65, 144, + /* 1170 */ 97, 68, 69, 70, 71, 72, 73, 74, 75, 177, + /* 1180 */ 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, + /* 1190 */ 87, 97, 190, 185, 144, 219, 99, 62, 63, 64, + /* 1200 */ 65, 98, 83, 68, 69, 70, 71, 72, 73, 74, + /* 1210 */ 75, 99, 77, 78, 79, 80, 81, 82, 83, 84, + /* 1220 */ 85, 86, 87, 185, 89, 97, 4, 219, 62, 63, + /* 1230 */ 64, 65, 104, 104, 68, 69, 70, 71, 72, 73, + /* 1240 */ 74, 75, 96, 77, 78, 79, 80, 81, 82, 83, + /* 1250 */ 84, 85, 86, 87, 4, 89, 97, 219, 4, 101, + /* 1260 */ 62, 63, 64, 65, 106, 107, 68, 69, 70, 71, + /* 1270 */ 72, 73, 74, 75, 4, 77, 78, 79, 80, 81, + /* 1280 */ 82, 83, 84, 85, 86, 87, 4, 62, 63, 64, + /* 1290 */ 65, 133, 4, 68, 69, 70, 71, 72, 73, 74, + /* 1300 */ 75, 177, 77, 78, 79, 80, 81, 82, 83, 84, + /* 1310 */ 85, 86, 87, 4, 190, 97, 185, 135, 158, 96, + /* 1320 */ 17, 191, 104, 101, 15, 63, 64, 65, 106, 107, + /* 1330 */ 68, 69, 70, 71, 72, 73, 74, 75, 38, 77, + /* 1340 */ 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, + /* 1350 */ 219, 42, 4, 214, 132, 216, 106, 107, 177, 96, + /* 1360 */ 106, 107, 177, 4, 177, 235, 185, 243, 59, 6, + /* 1370 */ 185, 190, 118, 64, 97, 190, 106, 190, 108, 198, + /* 1380 */ 199, 104, 4, 198, 199, 198, 199, 133, 106, 101, + /* 1390 */ 81, 82, 97, 97, 106, 107, 4, 88, 177, 117, + /* 1400 */ 219, 97, 152, 97, 219, 96, 97, 15, 104, 97, + /* 1410 */ 101, 190, 103, 232, 233, 106, 107, 232, 177, 232, + /* 1420 */ 111, 214, 177, 216, 4, 96, 177, 118, 119, 120, + /* 1430 */ 121, 190, 251, 4, 42, 190, 251, 14, 251, 190, + /* 1440 */ 4, 97, 38, 198, 199, 96, 177, 198, 199, 177, + /* 1450 */ 97, 59, 96, 165, 106, 107, 64, 38, 35, 190, + /* 1460 */ 4, 152, 190, 154, 155, 106, 157, 198, 199, 46, + /* 1470 */ 198, 199, 4, 81, 82, 96, 117, 232, 233, 4, + /* 1480 */ 88, 232, 233, 115, 106, 107, 4, 129, 96, 97, + /* 1490 */ 15, 64, 144, 101, 177, 103, 251, 103, 106, 107, + /* 1500 */ 251, 232, 12, 111, 4, 177, 4, 190, 98, 177, + /* 1510 */ 118, 119, 120, 121, 186, 187, 244, 42, 190, 141, + /* 1520 */ 251, 4, 190, 251, 123, 142, 106, 107, 177, 71, + /* 1530 */ 71, 128, 139, 153, 59, 106, 107, 101, 118, 64, + /* 1540 */ 4, 190, 106, 107, 152, 116, 154, 155, 4, 157, + /* 1550 */ 89, 128, 177, 89, 118, 22, 81, 82, 47, 91, + /* 1560 */ 39, 4, 106, 88, 177, 190, 146, 177, 181, 237, + /* 1570 */ 104, 96, 15, 117, 106, 107, 101, 190, 103, 177, + /* 1580 */ 190, 106, 107, 101, 177, 177, 111, 4, 106, 107, + /* 1590 */ 39, 177, 190, 118, 119, 120, 121, 190, 190, 42, + /* 1600 */ 118, 101, 212, 101, 190, 161, 106, 107, 106, 107, + /* 1610 */ 123, 103, 198, 199, 95, 177, 59, 4, 118, 181, + /* 1620 */ 118, 64, 4, 106, 107, 96, 143, 152, 190, 154, + /* 1630 */ 155, 96, 157, 158, 177, 118, 97, 97, 81, 82, + /* 1640 */ 95, 93, 106, 107, 4, 88, 177, 190, 258, 177, + /* 1650 */ 106, 107, 37, 96, 97, 15, 36, 252, 101, 190, + /* 1660 */ 103, 273, 190, 106, 107, 251, 177, 189, 111, 212, + /* 1670 */ 198, 199, 177, 4, 204, 118, 119, 120, 121, 190, + /* 1680 */ 4, 177, 42, 238, 204, 190, 4, 198, 199, 106, + /* 1690 */ 107, 275, 177, 177, 190, 177, 152, 181, 176, 59, + /* 1700 */ 164, 118, 198, 199, 64, 190, 190, 275, 190, 152, + /* 1710 */ 176, 154, 155, 4, 157, 258, 198, 199, 100, 106, + /* 1720 */ 107, 81, 82, 251, 106, 107, 4, 90, 88, 177, + /* 1730 */ 176, 118, 177, 4, 178, 177, 96, 15, 49, 177, + /* 1740 */ 251, 101, 190, 103, 176, 190, 106, 107, 190, 177, + /* 1750 */ 177, 111, 190, 198, 199, 251, 198, 199, 118, 119, + /* 1760 */ 120, 121, 190, 190, 42, 177, 177, 177, 60, 251, + /* 1770 */ 181, 198, 199, 178, 212, 106, 107, 177, 190, 190, + /* 1780 */ 190, 59, 106, 107, 212, 180, 64, 183, 106, 107, + /* 1790 */ 190, 104, 152, 184, 154, 155, 64, 157, 198, 199, + /* 1800 */ 118, 132, 56, 81, 82, 87, 251, 254, 4, 251, + /* 1810 */ 88, 252, 221, 177, 158, 106, 107, 181, 96, 15, + /* 1820 */ 258, 177, 146, 101, 251, 103, 190, 118, 106, 107, + /* 1830 */ 258, 177, 177, 111, 190, 106, 107, 177, 138, 227, + /* 1840 */ 118, 119, 120, 121, 190, 190, 42, 118, 177, 151, + /* 1850 */ 190, 251, 181, 198, 199, 8, 228, 10, 177, 12, + /* 1860 */ 177, 190, 181, 59, 4, 177, 149, 148, 21, 181, + /* 1870 */ 23, 190, 229, 190, 152, 230, 154, 155, 190, 157, + /* 1880 */ 177, 198, 199, 231, 181, 81, 82, 203, 41, 150, + /* 1890 */ 4, 44, 88, 190, 147, 48, 49, 96, 259, 52, + /* 1900 */ 96, 87, 55, 177, 57, 101, 251, 103, 203, 241, + /* 1910 */ 106, 107, 4, 177, 177, 111, 190, 177, 99, 177, + /* 1920 */ 223, 139, 118, 119, 120, 121, 190, 190, 200, 177, + /* 1930 */ 190, 177, 190, 177, 251, 198, 199, 241, 99, 92, + /* 1940 */ 4, 94, 190, 123, 190, 200, 190, 177, 200, 177, + /* 1950 */ 198, 199, 198, 199, 198, 199, 152, 208, 154, 155, + /* 1960 */ 190, 157, 190, 31, 177, 202, 106, 107, 198, 199, + /* 1970 */ 198, 199, 4, 122, 4, 200, 177, 190, 131, 203, + /* 1980 */ 200, 208, 177, 200, 200, 198, 199, 177, 251, 190, + /* 1990 */ 200, 203, 106, 107, 241, 190, 99, 198, 199, 177, + /* 2000 */ 190, 180, 99, 251, 118, 251, 177, 251, 198, 199, + /* 2010 */ 203, 177, 190, 166, 106, 107, 4, 180, 177, 190, + /* 2020 */ 241, 251, 264, 251, 190, 165, 118, 198, 199, 99, + /* 2030 */ 4, 190, 198, 199, 27, 177, 177, 158, 251, 198, + /* 2040 */ 199, 177, 106, 107, 99, 227, 177, 177, 190, 190, + /* 2050 */ 251, 177, 177, 215, 190, 62, 198, 199, 177, 190, + /* 2060 */ 190, 251, 198, 199, 190, 190, 177, 198, 199, 177, + /* 2070 */ 96, 190, 198, 199, 106, 107, 106, 107, 4, 190, + /* 2080 */ 251, 4, 190, 177, 99, 251, 118, 198, 199, 177, + /* 2090 */ 198, 199, 251, 177, 177, 265, 190, 4, 99, 163, + /* 2100 */ 177, 4, 190, 133, 198, 199, 190, 190, 4, 251, + /* 2110 */ 198, 199, 100, 190, 177, 251, 250, 177, 106, 107, + /* 2120 */ 251, 198, 199, 4, 177, 251, 215, 190, 177, 177, + /* 2130 */ 190, 177, 106, 107, 177, 198, 199, 190, 198, 199, + /* 2140 */ 251, 190, 190, 251, 190, 198, 199, 190, 177, 198, + /* 2150 */ 199, 241, 198, 199, 177, 198, 199, 251, 180, 99, + /* 2160 */ 227, 190, 180, 251, 177, 241, 99, 190, 60, 198, + /* 2170 */ 199, 99, 217, 217, 251, 198, 199, 190, 152, 99, + /* 2180 */ 106, 107, 217, 106, 107, 198, 199, 99, 251, 217, + /* 2190 */ 99, 251, 118, 100, 241, 99, 177, 268, 251, 106, + /* 2200 */ 107, 18, 251, 106, 107, 251, 268, 241, 251, 190, + /* 2210 */ 106, 107, 99, 99, 241, 99, 270, 198, 199, 16, + /* 2220 */ 224, 226, 251, 261, 105, 106, 107, 206, 251, 152, + /* 2230 */ 255, 201, 240, 242, 201, 210, 202, 261, 251, 242, + /* 2240 */ 242, 227, 224, 175, 191, 191, 191, 191, 262, 152, + /* 2250 */ 256, 263, 216, 222, 239, 207, 207, 207, 274, 198, + /* 2260 */ 198, 55, 211, 277, 277, 277, 277, 277, 277, 277, + /* 2270 */ 251, }; -#define YY_SHIFT_USE_DFLT (-81) +#define YY_SHIFT_USE_DFLT (-110) #define YY_SHIFT_COUNT (435) -#define YY_SHIFT_MIN (-80) -#define YY_SHIFT_MAX (2233) +#define YY_SHIFT_MIN (-109) +#define YY_SHIFT_MAX (2206) static const short yy_shift_ofst[] = { - /* 0 */ 1158, -4, 201, 1182, 819, 1571, 1571, 689, 361, 1489, - /* 10 */ 1654, 1654, 1654, 770, 364, 364, 157, 81, 179, 1406, - /* 20 */ 1323, 1654, 1654, 1654, 1654, 1654, 1654, 1654, 1654, 1654, - /* 30 */ 1654, 1654, 1654, 1654, 1654, 1654, 1654, 1654, 1654, 1654, - /* 40 */ 1654, 1654, 1654, 1654, 1654, 1654, 1654, 1654, 1654, 1654, - /* 50 */ 1654, 1654, 1654, 1654, 1654, 1654, 1736, 1654, 1818, 370, - /* 60 */ 798, 181, 370, 1837, 1837, 1837, 1837, 887, 887, 565, - /* 70 */ 277, 4, 1516, 1514, 1481, 1472, 1449, 1434, 1431, 1365, - /* 80 */ 1348, 448, 1399, 2071, 2071, 2085, 439, 2071, 2081, 1837, - /* 90 */ 565, 1039, 538, 538, 735, 84, 44, 171, 859, 775, - /* 100 */ 906, 773, 910, 636, 1172, 5, 450, 5, 443, 413, - /* 110 */ 185, 1729, 1974, 1955, 1938, 1622, 1801, 1964, 1810, 1797, - /* 120 */ 1690, 1947, 1632, 1897, 1778, 1555, 1550, 1459, 1325, 1775, - /* 130 */ 1047, 1512, 1743, 902, 140, 1470, 1470, 1597, 1580, 1470, - /* 140 */ 1236, 780, 1436, 349, 562, 216, 620, 1559, 1542, 1525, - /* 150 */ 90, 829, 829, 829, 872, 544, 2228, 2228, 2228, 2228, - /* 160 */ 2228, -81, -81, 459, 619, 619, 619, 619, 619, 619, - /* 170 */ 619, 619, 619, 645, 327, 683, 1180, 1149, 1117, 1087, - /* 180 */ 1051, 1021, 985, 958, 916, 767, 1239, 1212, 1276, 509, - /* 190 */ 509, -60, -38, -38, -38, -38, 578, -80, 314, 87, - /* 200 */ 87, 41, 155, 75, 58, 58, 58, -6, 186, 862, - /* 210 */ -47, 808, 1783, 1301, 1296, 206, 908, 424, 400, 25, - /* 220 */ 729, 729, 679, 1360, -2, 855, 729, 442, 346, 855, - /* 230 */ 750, 750, 187, -9, 169, 2233, 2147, 2146, 2145, 2223, - /* 240 */ 2223, 2140, 2137, 2169, 2134, 2169, 2133, 2169, 2131, 2169, - /* 250 */ 2128, 1770, 1718, 2121, 1770, 2150, 2120, 2115, 2114, 2150, - /* 260 */ 1718, 2105, 2045, 2172, 2095, 1770, 2087, 1901, 1770, 2062, - /* 270 */ 1901, 1963, 1963, 1963, 1963, 2076, 1901, 1963, 1989, 1963, - /* 280 */ 2076, 1963, 1963, 1958, 1953, 1951, 1848, 1901, 1911, 1901, - /* 290 */ 1931, 1873, 1821, 1805, 1764, 1724, 1718, 1715, 1795, 1695, - /* 300 */ 1770, 1739, 1739, 1666, 1666, 1666, 1666, -81, -81, -81, - /* 310 */ -81, -81, -81, -81, -81, -81, -81, 564, 79, 158, - /* 320 */ 45, 702, 243, -49, 398, 1293, 1279, 1042, 984, 788, - /* 330 */ 2, 471, -20, 758, 678, 344, 144, -44, 1683, 1678, - /* 340 */ 1619, 1610, 1603, 1602, 1595, 1585, 1554, 1588, 1575, 1547, - /* 350 */ 1493, 1607, 1538, 1601, 1582, 1592, 1517, 1494, 1450, 1451, - /* 360 */ 1527, 1509, 1444, 1432, 1545, 1446, 1441, 1430, 1464, 1390, - /* 370 */ 1407, 1425, 1460, 1400, 1396, 1398, 1395, 1452, 1478, 1372, - /* 380 */ 1423, 1428, 1354, 1342, 1318, 1168, 1257, 1310, 1270, 1234, - /* 390 */ 1168, 1223, 1171, 1169, 1112, 1128, 1050, 1216, 1197, 1113, - /* 400 */ 993, 1193, 1038, 1099, 993, 990, 937, 846, 895, 870, - /* 410 */ 848, 867, 825, 757, 805, 675, 652, 571, 644, 625, - /* 420 */ 613, 571, 438, 474, 421, 399, 406, 355, 362, 231, - /* 430 */ 225, 166, 143, 63, -37, -61, + /* 0 */ 532, -4, 1847, 841, 916, 1557, 1557, 263, 383, 1475, + /* 10 */ 1722, 1640, 1640, 792, 84, 84, -1, 81, 201, 1392, + /* 20 */ 1309, 1640, 1640, 1640, 1640, 1640, 1640, 1640, 1640, 1640, + /* 30 */ 1640, 1640, 1640, 1640, 1640, 1640, 1640, 1640, 1640, 1640, + /* 40 */ 1640, 1640, 1640, 1640, 1640, 1640, 1640, 1640, 1640, 1640, + /* 50 */ 1640, 1640, 1640, 1640, 1640, 1640, 1640, 1640, 1804, 2119, + /* 60 */ 820, 269, 2119, 2026, 2026, 2026, 2026, 731, 731, 1270, + /* 70 */ 299, 210, 1502, 1288, 844, 1158, 1500, 1482, 1436, 876, + /* 80 */ 1222, 658, 491, 2077, 2077, 2097, 1004, 2077, 2093, 2026, + /* 90 */ 1270, 743, 560, 560, 757, 386, 45, 167, 169, 356, + /* 100 */ 1420, 928, 580, 472, 118, 930, 193, 930, 240, 1254, + /* 110 */ 24, 2012, 1968, 1936, 1860, 1676, 1970, 2074, 1618, 1908, + /* 120 */ 812, 1886, 1544, 1729, 1709, 1682, 1536, 1669, 807, 1613, + /* 130 */ 1429, 571, 1583, 1517, 1348, 1025, 433, 433, 797, 1378, + /* 140 */ 433, 1250, 578, 89, 573, 371, 338, 1468, 1022, 881, + /* 150 */ 585, 2104, 2104, 2104, 220, 645, 2206, 2206, 2206, 2206, + /* 160 */ 2206, -110, -110, 481, 641, 641, 641, 641, 641, 641, + /* 170 */ 641, 641, 641, 667, 349, 705, 1166, 1135, 1103, 1073, + /* 180 */ 1037, 1007, 980, 938, 790, 1225, 1198, 1262, 531, 531, + /* 190 */ -60, -38, -38, -38, -38, 170, -77, 345, 158, 158, + /* 200 */ 41, 702, 227, 1423, 1423, 1423, 381, 159, 113, 23, + /* 210 */ 678, 449, 1456, 1359, 87, 1282, 306, 243, 430, 927, + /* 220 */ 927, 775, 1304, 99, 446, 927, 29, 446, 324, 324, + /* 230 */ -32, 219, 539, 57, 2203, 2116, 2114, 2113, 2183, 2183, + /* 240 */ 2096, 2091, 2108, 2088, 2108, 2080, 2108, 2072, 2108, 2067, + /* 250 */ 1708, 1698, 2060, 1708, 1993, 1974, 1999, 1985, 1993, 1698, + /* 260 */ 1945, 1879, 2007, 1930, 1708, 1903, 1801, 1708, 1897, 1801, + /* 270 */ 1820, 1820, 1820, 1820, 1932, 1801, 1820, 1851, 1820, 1932, + /* 280 */ 1820, 1820, 1839, 1782, 1819, 1801, 1814, 1801, 1739, 1747, + /* 290 */ 1717, 1719, 1698, 1700, 1656, 1732, 1718, 1746, 1687, 1708, + /* 300 */ 1689, 1689, 1637, 1637, 1637, 1637, -110, -110, -110, -110, + /* 310 */ -110, -110, -110, -110, -110, -110, 586, 85, 711, 114, + /* 320 */ -72, 476, 440, 813, 1277, 1218, 1128, 900, 804, -109, + /* 330 */ 252, 686, 696, 486, 419, 230, -3, 395, 1620, 1615, + /* 340 */ 1548, 1545, 1540, 1539, 1508, 1535, 1483, 1519, 1529, 1487, + /* 350 */ 1444, 1551, 1466, 1521, 1511, 1533, 1464, 1461, 1393, 1380, + /* 360 */ 1459, 1458, 1403, 1383, 1490, 1401, 1410, 1394, 1427, 1358, + /* 370 */ 1368, 1379, 1419, 1356, 1349, 1353, 1329, 1404, 1363, 1263, + /* 380 */ 1300, 1303, 1344, 1312, 1306, 1296, 1160, 1295, 1129, 1182, + /* 390 */ 1223, 999, 1159, 1146, 1129, 1119, 1112, 1097, 1050, 1094, + /* 400 */ 1066, 1110, 1113, 1029, 999, 1084, 991, 1060, 944, 960, + /* 410 */ 901, 753, 831, 828, 789, 753, 736, 685, 660, 636, + /* 420 */ 540, 605, 599, 489, 438, 422, 302, 385, 307, 241, + /* 430 */ 231, 138, 25, 137, 2, -39, }; -#define YY_REDUCE_USE_DFLT (-100) -#define YY_REDUCE_COUNT (316) -#define YY_REDUCE_MIN (-99) -#define YY_REDUCE_MAX (2090) +#define YY_REDUCE_USE_DFLT (-164) +#define YY_REDUCE_COUNT (315) +#define YY_REDUCE_MIN (-163) +#define YY_REDUCE_MAX (2068) static const short yy_reduce_ofst[] = { - /* 0 */ 615, 1195, 699, -99, 764, 1138, 189, 705, 1283, 1260, - /* 10 */ 1218, 1201, 261, 196, 884, 599, 1187, 1973, 1968, 1956, - /* 20 */ 1954, 1949, 1939, 1929, 1925, 1923, 1906, 1900, 1889, 1874, - /* 30 */ 1869, 1859, 1857, 1843, 1840, 1833, 1823, 1792, 1786, 1768, - /* 40 */ 1763, 1758, 1756, 1751, 1732, 1728, 1696, 1681, 1669, 1614, - /* 50 */ 1587, 1572, 1568, 1532, 1518, 1503, 1486, 1404, 1346, 490, - /* 60 */ 1474, 214, 769, 1448, 1189, 124, 67, 596, 175, 547, - /* 70 */ 1295, 1686, 1811, 1693, 1685, 1650, 1644, 1626, 1612, 1447, - /* 80 */ 1320, 1232, 203, 1621, 1246, 131, 347, 950, 1191, 195, - /* 90 */ 885, 265, 1134, 1132, 125, 377, 1011, 2019, 2016, 1983, - /* 100 */ 1803, 1803, 2012, 2008, 2005, 697, 1993, 11, 1803, 1985, - /* 110 */ 1983, 1979, 1803, 1803, 1803, 1803, 1803, 1803, 1803, 1959, - /* 120 */ 1803, 1803, 1940, 1803, 1803, 1924, 1803, 1803, 1803, 1886, - /* 130 */ 1858, 1850, 1839, 1835, 1834, 1221, 1140, 1828, 1809, 1097, - /* 140 */ 1804, 1803, 1787, 1721, 1712, 1586, 632, 1569, 1530, 1498, - /* 150 */ 1422, 1374, 666, 489, 938, 1022, 1020, 956, 924, 791, - /* 160 */ 763, 746, 205, 1480, 1480, 1480, 1480, 1480, 1480, 1480, - /* 170 */ 1480, 1480, 1480, 1480, 1480, 1480, 1480, 1480, 1480, 1480, - /* 180 */ 1480, 1480, 1480, 1480, 1480, 1480, 1480, 1480, 1480, 1480, - /* 190 */ 1480, 1480, 1480, 1480, 1480, 1480, 1480, 1480, 2067, 2086, - /* 200 */ 2084, 1480, 2007, 2007, 2073, 2072, 2068, 2028, 2058, 2024, - /* 210 */ 2051, 2013, 2010, 2080, 2079, 2078, 2077, 2042, 2090, 2035, - /* 220 */ 2022, 2021, 2059, 2049, 2052, 2055, 2015, 2020, 1999, 2053, - /* 230 */ 1992, 1991, 1480, 2025, 2026, 1978, 1918, 2006, 2001, 1975, - /* 240 */ 1972, 1997, 1918, 2018, 1918, 2017, 1918, 2014, 1918, 2011, - /* 250 */ 1984, 2046, 1995, 1980, 2038, 2002, 1965, 1918, 1918, 1996, - /* 260 */ 1981, 1918, 1945, 1933, 1960, 2004, 1918, 1976, 1988, 1918, - /* 270 */ 1962, 1943, 1942, 1941, 1935, 1926, 1961, 1932, 1910, 1909, - /* 280 */ 1887, 1893, 1878, 1846, 1819, 1785, 1753, 1825, 1737, 1784, - /* 290 */ 1723, 1480, 1734, 1682, 1668, 1659, 1651, 1627, 1661, 1645, - /* 300 */ 1664, 1648, 1642, 1616, 1611, 1605, 1577, 1505, 1477, 1475, - /* 310 */ 1540, 1537, 1496, 1480, 1480, 1480, 1535, + /* 0 */ 589, 1181, 721, 1185, -99, 1249, 1245, -6, 1269, 271, + /* 10 */ 1272, 1187, 786, 351, 149, 31, 725, 2019, 1987, 1977, + /* 20 */ 1971, 1957, 1954, 1951, 1947, 1940, 1937, 1923, 1912, 1906, + /* 30 */ 1892, 1889, 1874, 1869, 1864, 1858, 1841, 1834, 1829, 1810, + /* 40 */ 1799, 1787, 1772, 1770, 1756, 1754, 1752, 1737, 1683, 1655, + /* 50 */ 1600, 1573, 1558, 1555, 1518, 1504, 1489, 1472, 1414, 214, + /* 60 */ 791, 671, 1328, 1572, 1562, 1457, 1390, 315, -163, 502, + /* 70 */ -54, 1332, 1703, 1688, 1681, 1671, 1636, 1589, 1516, 1438, + /* 80 */ 1387, 764, 633, 1124, 906, 152, 53, 796, -90, 225, + /* 90 */ 840, 229, 846, 665, -63, 688, 612, 1952, 1917, 1822, + /* 100 */ 1590, 1590, 1916, 1881, 1875, 1207, 1870, 1139, 1859, 1590, + /* 110 */ 1822, 1805, 1590, 1590, 1590, 1590, 1590, 1590, 1590, 1742, + /* 120 */ 1590, 1590, 1740, 1590, 1590, 1736, 1590, 1590, 1590, 1726, + /* 130 */ 1660, 1654, 1644, 1590, 1588, 1552, 1130, 779, 1515, 1495, + /* 140 */ 614, 1469, 1408, 1407, 1402, 1375, 509, 1351, 1317, 1241, + /* 150 */ 1221, 1002, 756, 226, 340, 1131, 1038, 1008, 976, 945, + /* 160 */ 770, 410, 76, 1405, 1405, 1405, 1405, 1405, 1405, 1405, + /* 170 */ 1405, 1405, 1405, 1405, 1405, 1405, 1405, 1405, 1405, 1405, + /* 180 */ 1405, 1405, 1405, 1405, 1405, 1405, 1405, 1405, 1405, 1405, + /* 190 */ 1405, 1405, 1405, 1405, 1405, 1405, 1405, 2051, 2062, 2061, + /* 200 */ 1405, 1984, 1984, 2050, 2049, 2048, 2015, 2031, 2036, 1994, + /* 210 */ 1988, 1986, 2056, 2055, 2054, 2053, 2018, 2068, 2014, 1998, + /* 220 */ 1997, 2034, 2025, 2021, 2033, 1991, 1992, 2030, 1976, 1962, + /* 230 */ 1995, 1996, 1975, 1405, 1946, 1753, 1973, 1966, 1938, 1929, + /* 240 */ 1953, 1753, 1972, 1753, 1965, 1753, 1956, 1753, 1955, 1924, + /* 250 */ 1982, 1933, 1910, 1978, 1911, 1866, 1753, 1753, 1838, 1818, + /* 260 */ 1753, 1830, 1758, 1779, 1837, 1753, 1807, 1821, 1753, 1788, + /* 270 */ 1790, 1784, 1783, 1780, 1773, 1776, 1775, 1763, 1748, 1749, + /* 280 */ 1745, 1728, 1696, 1697, 1668, 1705, 1639, 1684, 1652, 1645, + /* 290 */ 1643, 1628, 1612, 1591, 1553, 1559, 1405, 1609, 1604, 1605, + /* 300 */ 1595, 1556, 1568, 1554, 1534, 1522, 1432, 1416, 1388, 1480, + /* 310 */ 1470, 1445, 1405, 1405, 1405, 1478, }; static const YYACTIONTYPE yy_default[] = { - /* 0 */ 730, 1038, 1143, 1143, 1027, 1027, 1027, 1143, 1027, 1027, - /* 10 */ 1027, 1027, 1027, 901, 1149, 1149, 1149, 1027, 1027, 1027, - /* 20 */ 1027, 1027, 1027, 1027, 1027, 1027, 1027, 1027, 1027, 1027, - /* 30 */ 1027, 1027, 1027, 1027, 1027, 1027, 1027, 1027, 1027, 1027, - /* 40 */ 1027, 1027, 1027, 1027, 1027, 1027, 1027, 1027, 1027, 1027, - /* 50 */ 1027, 1027, 1027, 1027, 1027, 1027, 1027, 1027, 1016, 1149, + /* 0 */ 730, 1038, 1143, 1026, 1143, 1026, 1026, 1143, 1026, 1026, + /* 10 */ 1026, 1026, 1026, 901, 1149, 1149, 1149, 1026, 1026, 1026, + /* 20 */ 1026, 1026, 1026, 1026, 1026, 1026, 1026, 1026, 1026, 1026, + /* 30 */ 1026, 1026, 1026, 1026, 1026, 1026, 1026, 1026, 1026, 1026, + /* 40 */ 1026, 1026, 1026, 1026, 1026, 1026, 1026, 1026, 1026, 1026, + /* 50 */ 1026, 1026, 1026, 1026, 1026, 1026, 1026, 1026, 978, 1149, /* 60 */ 895, 1149, 1149, 1149, 1149, 1149, 1149, 1149, 1149, 775, /* 70 */ 891, 901, 1149, 1149, 1149, 1149, 1149, 963, 950, 941, /* 80 */ 1149, 1149, 1149, 973, 973, 956, 843, 973, 1149, 1149, - /* 90 */ 1149, 1149, 929, 929, 1028, 1149, 767, 1113, 1118, 1014, - /* 100 */ 1149, 1149, 1149, 1149, 1149, 1149, 1149, 1149, 902, 1149, - /* 110 */ 1014, 1149, 1149, 1149, 1149, 1149, 1149, 1149, 1149, 1149, + /* 90 */ 1149, 1149, 929, 929, 1028, 1149, 767, 1113, 1118, 976, + /* 100 */ 1149, 1149, 1149, 1149, 1149, 1149, 1149, 1149, 1149, 902, + /* 110 */ 976, 1149, 1149, 1149, 1149, 1149, 1149, 1149, 1149, 1149, /* 120 */ 1149, 964, 957, 951, 942, 1149, 1149, 1149, 1149, 1149, - /* 130 */ 1149, 1149, 1149, 1149, 1149, 891, 891, 1149, 1149, 891, - /* 140 */ 1149, 1149, 1149, 1015, 1149, 1149, 764, 1149, 1149, 1149, + /* 130 */ 1149, 1149, 1149, 1149, 1149, 1149, 891, 891, 1149, 1149, + /* 140 */ 891, 1149, 1149, 977, 1149, 1149, 764, 1149, 1149, 1149, /* 150 */ 736, 1059, 1149, 1149, 730, 1143, 1143, 1143, 1143, 1143, - /* 160 */ 1143, 1136, 881, 936, 907, 946, 934, 938, 1039, 1032, - /* 170 */ 1033, 1031, 937, 1028, 1028, 1028, 1028, 1028, 1028, 1028, - /* 180 */ 1028, 1028, 1028, 1028, 1028, 1028, 1028, 1028, 989, 1001, - /* 190 */ 988, 996, 1005, 1000, 997, 991, 990, 992, 1149, 1149, - /* 200 */ 1149, 993, 1149, 1149, 1149, 1149, 1149, 894, 1149, 1149, - /* 210 */ 865, 1149, 1087, 1149, 1149, 777, 1149, 879, 739, 945, - /* 220 */ 919, 919, 810, 834, 799, 929, 919, 909, 1034, 929, - /* 230 */ 1149, 1149, 994, 892, 879, 1127, 910, 910, 910, 1112, - /* 240 */ 1112, 910, 910, 856, 910, 856, 910, 856, 910, 856, - /* 250 */ 910, 761, 945, 910, 761, 847, 969, 910, 910, 847, - /* 260 */ 945, 910, 1094, 1092, 910, 761, 910, 1047, 761, 910, - /* 270 */ 1047, 845, 845, 845, 845, 826, 1047, 845, 810, 845, - /* 280 */ 826, 845, 845, 1149, 910, 910, 1149, 1047, 1053, 1047, - /* 290 */ 1028, 995, 935, 923, 933, 930, 945, 1149, 758, 829, - /* 300 */ 761, 747, 747, 735, 735, 735, 735, 1140, 1140, 1136, - /* 310 */ 812, 812, 897, 1004, 1003, 1002, 786, 1040, 1149, 1149, - /* 320 */ 1149, 1149, 1149, 1149, 1061, 1149, 1149, 1149, 1149, 1149, + /* 160 */ 1143, 1136, 881, 936, 1032, 1033, 907, 946, 1039, 934, + /* 170 */ 938, 937, 1031, 1028, 1028, 1028, 1028, 1028, 1028, 1028, + /* 180 */ 1028, 1028, 1028, 1028, 1028, 1028, 1028, 1001, 1013, 1000, + /* 190 */ 1008, 1009, 1012, 1003, 1017, 1002, 1004, 1149, 1149, 1149, + /* 200 */ 1005, 1149, 1149, 1149, 1149, 1149, 894, 865, 1149, 1149, + /* 210 */ 1149, 1087, 1149, 1149, 777, 1149, 879, 739, 945, 919, + /* 220 */ 919, 810, 834, 799, 929, 919, 909, 929, 1149, 1149, + /* 230 */ 892, 879, 1034, 1006, 1127, 910, 910, 910, 1112, 1112, + /* 240 */ 910, 910, 856, 910, 856, 910, 856, 910, 856, 910, + /* 250 */ 761, 945, 910, 761, 847, 969, 910, 910, 847, 945, + /* 260 */ 910, 1094, 1092, 910, 761, 910, 1047, 761, 910, 1047, + /* 270 */ 845, 845, 845, 845, 826, 1047, 845, 810, 845, 826, + /* 280 */ 845, 845, 910, 1149, 910, 1047, 1053, 1047, 935, 923, + /* 290 */ 933, 930, 945, 1149, 1149, 1028, 1007, 758, 829, 761, + /* 300 */ 747, 747, 735, 735, 735, 735, 1140, 1140, 1136, 812, + /* 310 */ 812, 897, 1016, 1015, 1014, 786, 1040, 1149, 1149, 1149, + /* 320 */ 1149, 1149, 1149, 1061, 1149, 1149, 1149, 1149, 1149, 1149, /* 330 */ 1149, 1149, 1149, 1149, 1149, 1149, 1149, 1149, 1149, 731, /* 340 */ 1149, 1149, 1149, 1149, 1149, 1130, 1149, 1149, 1149, 1149, /* 350 */ 1149, 1149, 1091, 1090, 1149, 1149, 1149, 1149, 1149, 1149, /* 360 */ 1149, 1149, 1149, 1149, 1079, 1149, 1149, 1149, 1149, 1149, /* 370 */ 1149, 1149, 1149, 1149, 1149, 1149, 1149, 1149, 1149, 1149, - /* 380 */ 1149, 1149, 1149, 1149, 1149, 868, 870, 1149, 1149, 1149, - /* 390 */ 869, 1149, 1149, 1149, 1149, 1149, 1149, 1149, 1149, 1149, - /* 400 */ 931, 1149, 924, 1149, 1037, 1149, 1018, 1026, 1149, 1149, - /* 410 */ 1149, 1149, 1149, 1017, 1149, 1149, 1149, 1145, 1149, 1149, - /* 420 */ 1149, 1144, 1149, 1149, 1149, 1149, 1149, 1029, 981, 1149, - /* 430 */ 980, 979, 770, 1149, 745, 1149, 727, 732, 1129, 1126, + /* 380 */ 1149, 1149, 1149, 1149, 1149, 980, 1027, 1149, 868, 870, + /* 390 */ 1149, 1037, 1149, 1149, 869, 1149, 1149, 1149, 1149, 1149, + /* 400 */ 1149, 1149, 1149, 1149, 931, 1149, 924, 1149, 1149, 1149, + /* 410 */ 1149, 1145, 1149, 1149, 1149, 1144, 1149, 1149, 1149, 1149, + /* 420 */ 1149, 1149, 1149, 1149, 1149, 1149, 979, 1029, 993, 1149, + /* 430 */ 992, 991, 770, 1149, 745, 1149, 727, 732, 1129, 1126, /* 440 */ 1128, 1123, 1124, 1122, 1125, 1121, 1119, 1120, 1117, 1115, /* 450 */ 1114, 1116, 1111, 1107, 1067, 1065, 1063, 1072, 1071, 1070, /* 460 */ 1069, 1068, 1064, 1062, 1066, 1060, 960, 948, 939, 863, @@ -854,16 +852,16 @@ static const YYACTIONTYPE yy_default[] = { /* 560 */ 817, 816, 823, 822, 821, 820, 819, 815, 818, 814, /* 570 */ 813, 805, 798, 797, 811, 796, 828, 827, 824, 795, /* 580 */ 851, 850, 849, 846, 794, 793, 792, 791, 790, 789, - /* 590 */ 987, 986, 1007, 978, 866, 873, 872, 871, 875, 876, - /* 600 */ 886, 884, 883, 882, 918, 917, 916, 915, 914, 913, - /* 610 */ 906, 904, 900, 899, 905, 903, 921, 922, 920, 898, - /* 620 */ 890, 888, 889, 887, 975, 972, 974, 971, 908, 896, - /* 630 */ 893, 880, 926, 925, 1030, 1019, 1009, 1020, 911, 1008, - /* 640 */ 1006, 1029, 1026, 1021, 1103, 1025, 1013, 1012, 1011, 1148, - /* 650 */ 1146, 1147, 1050, 1052, 1055, 1054, 1051, 928, 927, 1049, - /* 660 */ 1048, 1010, 985, 782, 780, 781, 1075, 1074, 1077, 1076, - /* 670 */ 1073, 784, 783, 779, 778, 999, 998, 983, 1022, 1023, - /* 680 */ 982, 1024, 984, 771, 874, 867, 977, 976, 809, 808, + /* 590 */ 999, 998, 1030, 1021, 982, 981, 1020, 1018, 1029, 1019, + /* 600 */ 990, 866, 873, 872, 871, 875, 876, 886, 884, 883, + /* 610 */ 882, 918, 917, 916, 915, 914, 913, 906, 904, 900, + /* 620 */ 899, 911, 905, 903, 921, 922, 920, 898, 890, 888, + /* 630 */ 889, 887, 975, 972, 974, 971, 908, 896, 893, 880, + /* 640 */ 926, 925, 1027, 1148, 1146, 1147, 1050, 1052, 1055, 1054, + /* 650 */ 1051, 928, 927, 1049, 1048, 1022, 997, 782, 780, 781, + /* 660 */ 1075, 1074, 1077, 1076, 1073, 784, 783, 779, 778, 995, + /* 670 */ 874, 867, 989, 988, 1103, 1024, 1025, 987, 983, 1023, + /* 680 */ 1011, 1010, 996, 986, 771, 984, 994, 985, 809, 808, /* 690 */ 807, 806, 878, 877, 788, 802, 787, 785, 765, 760, /* 700 */ 759, 754, 752, 749, 751, 748, 753, 750, 746, 744, /* 710 */ 743, 742, 741, 740, 774, 773, 772, 770, 738, 737, @@ -1130,8 +1128,8 @@ static const char *const yyTokenName[] = { "DISTINCT", "ID_ALIAS", "FROM", "USING", "JOIN", "ID_JOIN_OPTS", "ID_IDX", "ORDER", "GROUP", "HAVING", "LIMIT", "WHERE", - "ID_COL", "INTO", "VARIABLE", "CASE", - "ID_FN", "ID_ERR_MSG", "WHEN", "THEN", + "ID_COL", "INTO", "CASE", "ID_FN", + "ID_ERR_MSG", "VARIABLE", "WHEN", "THEN", "ELSE", "INDEX", "ID_IDX_NEW", "ID_PRAGMA", "ID_TRIG_NEW", "ID_TRIG", "ALTER", "ADD", "error", "cmd", "input", "cmdlist", @@ -1155,8 +1153,8 @@ static const char *const yyTokenName[] = { "joinconstr_opt", "dbnm", "indexed_opt", "inscollist", "sortlist", "delete_stmt", "update_stmt", "setlist", "insert_stmt", "insert_cmd", "inscollist_opt", "exprx", - "not_opt", "likeop", "case_operand", "case_exprlist", - "case_else", "uniqueflag", "idxlist_single", "collate", + "not_opt", "case_operand", "case_exprlist", "case_else", + "likeop", "uniqueflag", "idxlist_single", "collate", "nmnum", "number", "trigger_time", "trigger_event", "foreach_clause", "when_clause", "trigger_cmd_list", "trigger_cmd", "database_kw_opt", "key_opt", "kwcolumn_opt", "create_vtab", @@ -1420,58 +1418,58 @@ static const char *const yyRuleName[] = { /* 248 */ "inscollist ::=", /* 249 */ "inscollist ::= inscollist COMMA ID_COL", /* 250 */ "inscollist ::= ID_COL", - /* 251 */ "exprx ::= term", - /* 252 */ "exprx ::= CTIME_KW", - /* 253 */ "exprx ::= LP expr RP", - /* 254 */ "exprx ::= id", - /* 255 */ "exprx ::= JOIN_KW", - /* 256 */ "exprx ::= nm DOT nm", - /* 257 */ "exprx ::= nm DOT nm DOT nm", - /* 258 */ "exprx ::= VARIABLE", - /* 259 */ "exprx ::= expr COLLATE ids", - /* 260 */ "exprx ::= CAST LP expr AS typetoken RP", - /* 261 */ "exprx ::= ID LP distinct exprlist RP", - /* 262 */ "exprx ::= ID LP STAR RP", - /* 263 */ "exprx ::= expr AND expr", - /* 264 */ "exprx ::= expr OR expr", - /* 265 */ "exprx ::= expr LT|GT|GE|LE expr", - /* 266 */ "exprx ::= expr EQ|NE expr", - /* 267 */ "exprx ::= expr BITAND|BITOR|LSHIFT|RSHIFT expr", - /* 268 */ "exprx ::= expr PLUS|MINUS expr", - /* 269 */ "exprx ::= expr STAR|SLASH|REM expr", - /* 270 */ "exprx ::= expr CONCAT expr", - /* 271 */ "exprx ::= expr not_opt likeop expr", - /* 272 */ "exprx ::= expr not_opt likeop expr ESCAPE expr", - /* 273 */ "exprx ::= expr ISNULL|NOTNULL", - /* 274 */ "exprx ::= expr NOT NULL", - /* 275 */ "exprx ::= expr IS not_opt expr", - /* 276 */ "exprx ::= NOT expr", - /* 277 */ "exprx ::= BITNOT expr", - /* 278 */ "exprx ::= MINUS expr", - /* 279 */ "exprx ::= PLUS expr", - /* 280 */ "exprx ::= expr not_opt BETWEEN expr AND expr", - /* 281 */ "exprx ::= expr not_opt IN LP exprlist RP", - /* 282 */ "exprx ::= LP select RP", - /* 283 */ "exprx ::= expr not_opt IN LP select RP", - /* 284 */ "exprx ::= expr not_opt IN nm dbnm", - /* 285 */ "exprx ::= EXISTS LP select RP", - /* 286 */ "exprx ::= CASE case_operand case_exprlist case_else END", - /* 287 */ "exprx ::= RAISE LP IGNORE RP", - /* 288 */ "exprx ::= RAISE LP raisetype COMMA nm RP", - /* 289 */ "exprx ::= nm DOT", - /* 290 */ "exprx ::= nm DOT nm DOT", - /* 291 */ "exprx ::= expr not_opt BETWEEN expr AND", - /* 292 */ "exprx ::= CASE case_operand case_exprlist case_else", - /* 293 */ "exprx ::= expr not_opt IN LP exprlist", - /* 294 */ "exprx ::= expr not_opt IN ID_DB", - /* 295 */ "exprx ::= expr not_opt IN nm DOT ID_TAB", - /* 296 */ "exprx ::= ID_DB|ID_TAB|ID_COL|ID_FN", - /* 297 */ "exprx ::= nm DOT ID_TAB|ID_COL", - /* 298 */ "exprx ::= nm DOT nm DOT ID_COL", - /* 299 */ "exprx ::= expr COLLATE ID_COLLATE", - /* 300 */ "exprx ::= RAISE LP raisetype COMMA ID_ERR_MSG RP", - /* 301 */ "expr ::= exprx", - /* 302 */ "expr ::=", + /* 251 */ "exprx ::= nm DOT", + /* 252 */ "exprx ::= nm DOT nm DOT", + /* 253 */ "exprx ::= expr not_opt BETWEEN expr AND", + /* 254 */ "exprx ::= CASE case_operand case_exprlist case_else", + /* 255 */ "exprx ::= expr not_opt IN LP exprlist", + /* 256 */ "exprx ::= expr not_opt IN ID_DB", + /* 257 */ "exprx ::= expr not_opt IN nm DOT ID_TAB", + /* 258 */ "exprx ::= ID_DB|ID_TAB|ID_COL|ID_FN", + /* 259 */ "exprx ::= nm DOT ID_TAB|ID_COL", + /* 260 */ "exprx ::= nm DOT nm DOT ID_COL", + /* 261 */ "exprx ::= expr COLLATE ID_COLLATE", + /* 262 */ "exprx ::= RAISE LP raisetype COMMA ID_ERR_MSG RP", + /* 263 */ "exprx ::= term", + /* 264 */ "exprx ::= CTIME_KW", + /* 265 */ "exprx ::= LP nexprlist RP", + /* 266 */ "exprx ::= id", + /* 267 */ "exprx ::= JOIN_KW", + /* 268 */ "exprx ::= nm DOT nm", + /* 269 */ "exprx ::= nm DOT nm DOT nm", + /* 270 */ "exprx ::= VARIABLE", + /* 271 */ "exprx ::= expr COLLATE ids", + /* 272 */ "exprx ::= CAST LP expr AS typetoken RP", + /* 273 */ "exprx ::= ID LP distinct exprlist RP", + /* 274 */ "exprx ::= ID LP STAR RP", + /* 275 */ "exprx ::= expr AND expr", + /* 276 */ "exprx ::= expr OR expr", + /* 277 */ "exprx ::= expr LT|GT|GE|LE expr", + /* 278 */ "exprx ::= expr EQ|NE expr", + /* 279 */ "exprx ::= expr BITAND|BITOR|LSHIFT|RSHIFT expr", + /* 280 */ "exprx ::= expr PLUS|MINUS expr", + /* 281 */ "exprx ::= expr STAR|SLASH|REM expr", + /* 282 */ "exprx ::= expr CONCAT expr", + /* 283 */ "exprx ::= expr not_opt likeop expr", + /* 284 */ "exprx ::= expr not_opt likeop expr ESCAPE expr", + /* 285 */ "exprx ::= expr ISNULL|NOTNULL", + /* 286 */ "exprx ::= expr NOT NULL", + /* 287 */ "exprx ::= expr IS not_opt expr", + /* 288 */ "exprx ::= NOT expr", + /* 289 */ "exprx ::= BITNOT expr", + /* 290 */ "exprx ::= MINUS expr", + /* 291 */ "exprx ::= PLUS expr", + /* 292 */ "exprx ::= expr not_opt BETWEEN expr AND expr", + /* 293 */ "exprx ::= expr not_opt IN LP exprlist RP", + /* 294 */ "exprx ::= LP select RP", + /* 295 */ "exprx ::= expr not_opt IN LP select RP", + /* 296 */ "exprx ::= expr not_opt IN nm dbnm", + /* 297 */ "exprx ::= EXISTS LP select RP", + /* 298 */ "exprx ::= CASE case_operand case_exprlist case_else END", + /* 299 */ "exprx ::= RAISE LP IGNORE RP", + /* 300 */ "exprx ::= RAISE LP raisetype COMMA nm RP", + /* 301 */ "expr ::=", + /* 302 */ "expr ::= exprx", /* 303 */ "not_opt ::=", /* 304 */ "not_opt ::= NOT", /* 305 */ "likeop ::= LIKE_KW|MATCH", @@ -1788,8 +1786,8 @@ delete (yypminor->yy4); case 227: /* where_opt */ case 229: /* having_opt */ case 251: /* exprx */ - case 254: /* case_operand */ - case 256: /* case_else */ + case 253: /* case_operand */ + case 255: /* case_else */ { delete (yypminor->yy490); } @@ -1879,7 +1877,7 @@ delete (yypminor->yy373); case 228: /* groupby_opt */ case 232: /* nexprlist */ case 233: /* exprlist */ - case 255: /* case_exprlist */ + case 254: /* case_exprlist */ { delete (yypminor->yy13); } @@ -1942,7 +1940,7 @@ delete (yypminor->yy381); delete (yypminor->yy250); } break; - case 253: /* likeop */ + case 256: /* likeop */ { delete (yypminor->yy374); } @@ -2477,6 +2475,18 @@ static const struct { { 243, 0 }, { 243, 3 }, { 243, 1 }, + { 251, 2 }, + { 251, 4 }, + { 251, 5 }, + { 251, 4 }, + { 251, 5 }, + { 251, 4 }, + { 251, 6 }, + { 251, 1 }, + { 251, 3 }, + { 251, 5 }, + { 251, 3 }, + { 251, 6 }, { 251, 1 }, { 251, 1 }, { 251, 3 }, @@ -2515,29 +2525,17 @@ static const struct { { 251, 5 }, { 251, 4 }, { 251, 6 }, - { 251, 2 }, - { 251, 4 }, - { 251, 5 }, - { 251, 4 }, - { 251, 5 }, - { 251, 4 }, - { 251, 6 }, - { 251, 1 }, - { 251, 3 }, - { 251, 5 }, - { 251, 3 }, - { 251, 6 }, - { 199, 1 }, { 199, 0 }, + { 199, 1 }, { 252, 0 }, { 252, 1 }, + { 256, 1 }, + { 254, 5 }, + { 254, 4 }, + { 255, 2 }, + { 255, 0 }, { 253, 1 }, - { 255, 5 }, - { 255, 4 }, - { 256, 2 }, - { 256, 0 }, - { 254, 1 }, - { 254, 0 }, + { 253, 0 }, { 233, 1 }, { 233, 0 }, { 232, 3 }, @@ -3382,7 +3380,7 @@ static void yy_reduce( case 179: /* singlesrc ::= ID_DB|ID_TAB */ yytestcase(yyruleno==179); case 180: /* singlesrc ::= nm DOT ID_VIEW */ yytestcase(yyruleno==180); case 181: /* singlesrc ::= ID_DB|ID_VIEW */ yytestcase(yyruleno==181); - case 297: /* exprx ::= nm DOT ID_TAB|ID_COL */ yytestcase(yyruleno==297); + case 259: /* exprx ::= nm DOT ID_TAB|ID_COL */ yytestcase(yyruleno==259); case 318: /* cmd ::= CREATE uniqueflag INDEX ifnotexists nm DOT ID_IDX_NEW */ yytestcase(yyruleno==318); case 319: /* cmd ::= CREATE uniqueflag INDEX ifnotexists ID_DB|ID_IDX_NEW */ yytestcase(yyruleno==319); case 332: /* cmd ::= DROP INDEX ifexists nm DOT ID_IDX */ yytestcase(yyruleno==332); @@ -3818,7 +3816,7 @@ static void yy_reduce( break; case 209: /* having_opt ::= HAVING expr */ case 221: /* where_opt ::= WHERE expr */ yytestcase(yyruleno==221); - case 301: /* expr ::= exprx */ yytestcase(yyruleno==301); + case 302: /* expr ::= exprx */ yytestcase(yyruleno==302); case 308: /* case_else ::= ELSE expr */ yytestcase(yyruleno==308); case 310: /* case_operand ::= exprx */ yytestcase(yyruleno==310); case 370: /* when_clause ::= WHEN expr */ yytestcase(yyruleno==370); @@ -4112,7 +4110,76 @@ static void yy_reduce( { yy_destructor(yypParser,243,&yymsp[-2].minor); } break; - case 251: /* exprx ::= term */ + case 251: /* exprx ::= nm DOT */ +{ + yygotominor.yy490 = new SqliteExpr(); + yygotominor.yy490->initId(*(yymsp[-1].minor.yy211), QString::null, QString::null); + delete yymsp[-1].minor.yy211; + objectForTokens = yygotominor.yy490; + parserContext->minorErrorBeforeNextToken("Syntax error "); + } + break; + case 252: /* exprx ::= nm DOT nm DOT */ +{ + yygotominor.yy490 = new SqliteExpr(); + yygotominor.yy490->initId(*(yymsp[-3].minor.yy211), *(yymsp[-1].minor.yy211), QString::null); + delete yymsp[-3].minor.yy211; + delete yymsp[-1].minor.yy211; + objectForTokens = yygotominor.yy490; + parserContext->minorErrorBeforeNextToken("Syntax error "); + } + break; + case 253: /* exprx ::= expr not_opt BETWEEN expr AND */ +{ + yygotominor.yy490 = new SqliteExpr(); + delete yymsp[-3].minor.yy237; + delete yymsp[-4].minor.yy490; + delete yymsp[-1].minor.yy490; + objectForTokens = yygotominor.yy490; + parserContext->minorErrorBeforeNextToken("Syntax error "); + } + break; + case 254: /* exprx ::= CASE case_operand case_exprlist case_else */ +{ + yygotominor.yy490 = new SqliteExpr(); + delete yymsp[-1].minor.yy13; + delete yymsp[-2].minor.yy490; + delete yymsp[0].minor.yy490; + objectForTokens = yygotominor.yy490; + parserContext->minorErrorBeforeNextToken("Syntax error "); + } + break; + case 255: /* exprx ::= expr not_opt IN LP exprlist */ +{ + yygotominor.yy490 = new SqliteExpr(); + delete yymsp[-3].minor.yy237; + delete yymsp[0].minor.yy13; + delete yymsp[-4].minor.yy490; + objectForTokens = yygotominor.yy490; + parserContext->minorErrorBeforeNextToken("Syntax error "); + } + break; + case 256: /* exprx ::= expr not_opt IN ID_DB */ +{ yy_destructor(yypParser,199,&yymsp[-3].minor); +} + break; + case 257: /* exprx ::= expr not_opt IN nm DOT ID_TAB */ + case 258: /* exprx ::= ID_DB|ID_TAB|ID_COL|ID_FN */ yytestcase(yyruleno==258); +{ yy_destructor(yypParser,199,&yymsp[-5].minor); + yy_destructor(yypParser,177,&yymsp[-2].minor); +} + break; + case 260: /* exprx ::= nm DOT nm DOT ID_COL */ +{ yy_destructor(yypParser,177,&yymsp[-4].minor); + yy_destructor(yypParser,177,&yymsp[-2].minor); +} + break; + case 261: /* exprx ::= expr COLLATE ID_COLLATE */ + case 262: /* exprx ::= RAISE LP raisetype COMMA ID_ERR_MSG RP */ yytestcase(yyruleno==262); +{ yy_destructor(yypParser,199,&yymsp[-2].minor); +} + break; + case 263: /* exprx ::= term */ { yygotominor.yy490 = new SqliteExpr(); yygotominor.yy490->initLiteral(*(yymsp[0].minor.yy21)); @@ -4120,21 +4187,22 @@ static void yy_reduce( objectForTokens = yygotominor.yy490; } break; - case 252: /* exprx ::= CTIME_KW */ + case 264: /* exprx ::= CTIME_KW */ { yygotominor.yy490 = new SqliteExpr(); yygotominor.yy490->initCTime(yymsp[0].minor.yy0->value); objectForTokens = yygotominor.yy490; } break; - case 253: /* exprx ::= LP expr RP */ + case 265: /* exprx ::= LP nexprlist RP */ { yygotominor.yy490 = new SqliteExpr(); - yygotominor.yy490->initSubExpr(yymsp[-1].minor.yy490); + yygotominor.yy490->initRowValue(*(yymsp[-1].minor.yy13)); + delete yymsp[-1].minor.yy13; objectForTokens = yygotominor.yy490; } break; - case 254: /* exprx ::= id */ + case 266: /* exprx ::= id */ { yygotominor.yy490 = new SqliteExpr(); yygotominor.yy490->initId(*(yymsp[0].minor.yy211)); @@ -4142,14 +4210,14 @@ static void yy_reduce( objectForTokens = yygotominor.yy490; } break; - case 255: /* exprx ::= JOIN_KW */ + case 267: /* exprx ::= JOIN_KW */ { yygotominor.yy490 = new SqliteExpr(); yygotominor.yy490->initId(yymsp[0].minor.yy0->value); objectForTokens = yygotominor.yy490; } break; - case 256: /* exprx ::= nm DOT nm */ + case 268: /* exprx ::= nm DOT nm */ { yygotominor.yy490 = new SqliteExpr(); yygotominor.yy490->initId(*(yymsp[-2].minor.yy211), *(yymsp[0].minor.yy211)); @@ -4158,7 +4226,7 @@ static void yy_reduce( objectForTokens = yygotominor.yy490; } break; - case 257: /* exprx ::= nm DOT nm DOT nm */ + case 269: /* exprx ::= nm DOT nm DOT nm */ { yygotominor.yy490 = new SqliteExpr(); yygotominor.yy490->initId(*(yymsp[-4].minor.yy211), *(yymsp[-2].minor.yy211), *(yymsp[0].minor.yy211)); @@ -4168,14 +4236,14 @@ static void yy_reduce( objectForTokens = yygotominor.yy490; } break; - case 258: /* exprx ::= VARIABLE */ + case 270: /* exprx ::= VARIABLE */ { yygotominor.yy490 = new SqliteExpr(); yygotominor.yy490->initBindParam(yymsp[0].minor.yy0->value); objectForTokens = yygotominor.yy490; } break; - case 259: /* exprx ::= expr COLLATE ids */ + case 271: /* exprx ::= expr COLLATE ids */ { yygotominor.yy490 = new SqliteExpr(); yygotominor.yy490->initCollate(yymsp[-2].minor.yy490, *(yymsp[0].minor.yy211)); @@ -4183,14 +4251,14 @@ static void yy_reduce( objectForTokens = yygotominor.yy490; } break; - case 260: /* exprx ::= CAST LP expr AS typetoken RP */ + case 272: /* exprx ::= CAST LP expr AS typetoken RP */ { yygotominor.yy490 = new SqliteExpr(); yygotominor.yy490->initCast(yymsp[-3].minor.yy490, yymsp[-1].minor.yy299); objectForTokens = yygotominor.yy490; } break; - case 261: /* exprx ::= ID LP distinct exprlist RP */ + case 273: /* exprx ::= ID LP distinct exprlist RP */ { yygotominor.yy490 = new SqliteExpr(); yygotominor.yy490->initFunction(yymsp[-4].minor.yy0->value, *(yymsp[-2].minor.yy376), *(yymsp[-1].minor.yy13)); @@ -4199,28 +4267,28 @@ static void yy_reduce( objectForTokens = yygotominor.yy490; } break; - case 262: /* exprx ::= ID LP STAR RP */ + case 274: /* exprx ::= ID LP STAR RP */ { yygotominor.yy490 = new SqliteExpr(); yygotominor.yy490->initFunction(yymsp[-3].minor.yy0->value, true); objectForTokens = yygotominor.yy490; } break; - case 263: /* exprx ::= expr AND expr */ - case 264: /* exprx ::= expr OR expr */ yytestcase(yyruleno==264); - case 265: /* exprx ::= expr LT|GT|GE|LE expr */ yytestcase(yyruleno==265); - case 266: /* exprx ::= expr EQ|NE expr */ yytestcase(yyruleno==266); - case 267: /* exprx ::= expr BITAND|BITOR|LSHIFT|RSHIFT expr */ yytestcase(yyruleno==267); - case 268: /* exprx ::= expr PLUS|MINUS expr */ yytestcase(yyruleno==268); - case 269: /* exprx ::= expr STAR|SLASH|REM expr */ yytestcase(yyruleno==269); - case 270: /* exprx ::= expr CONCAT expr */ yytestcase(yyruleno==270); + case 275: /* exprx ::= expr AND expr */ + case 276: /* exprx ::= expr OR expr */ yytestcase(yyruleno==276); + case 277: /* exprx ::= expr LT|GT|GE|LE expr */ yytestcase(yyruleno==277); + case 278: /* exprx ::= expr EQ|NE expr */ yytestcase(yyruleno==278); + case 279: /* exprx ::= expr BITAND|BITOR|LSHIFT|RSHIFT expr */ yytestcase(yyruleno==279); + case 280: /* exprx ::= expr PLUS|MINUS expr */ yytestcase(yyruleno==280); + case 281: /* exprx ::= expr STAR|SLASH|REM expr */ yytestcase(yyruleno==281); + case 282: /* exprx ::= expr CONCAT expr */ yytestcase(yyruleno==282); { yygotominor.yy490 = new SqliteExpr(); yygotominor.yy490->initBinOp(yymsp[-2].minor.yy490, yymsp[-1].minor.yy0->value, yymsp[0].minor.yy490); objectForTokens = yygotominor.yy490; } break; - case 271: /* exprx ::= expr not_opt likeop expr */ + case 283: /* exprx ::= expr not_opt likeop expr */ { yygotominor.yy490 = new SqliteExpr(); yygotominor.yy490->initLike(yymsp[-3].minor.yy490, *(yymsp[-2].minor.yy237), *(yymsp[-1].minor.yy374), yymsp[0].minor.yy490); @@ -4229,7 +4297,7 @@ static void yy_reduce( objectForTokens = yygotominor.yy490; } break; - case 272: /* exprx ::= expr not_opt likeop expr ESCAPE expr */ + case 284: /* exprx ::= expr not_opt likeop expr ESCAPE expr */ { yygotominor.yy490 = new SqliteExpr(); yygotominor.yy490->initLike(yymsp[-5].minor.yy490, *(yymsp[-4].minor.yy237), *(yymsp[-3].minor.yy374), yymsp[-2].minor.yy490, yymsp[0].minor.yy490); @@ -4238,21 +4306,21 @@ static void yy_reduce( objectForTokens = yygotominor.yy490; } break; - case 273: /* exprx ::= expr ISNULL|NOTNULL */ + case 285: /* exprx ::= expr ISNULL|NOTNULL */ { yygotominor.yy490 = new SqliteExpr(); yygotominor.yy490->initNull(yymsp[-1].minor.yy490, yymsp[0].minor.yy0->value); objectForTokens = yygotominor.yy490; } break; - case 274: /* exprx ::= expr NOT NULL */ + case 286: /* exprx ::= expr NOT NULL */ { yygotominor.yy490 = new SqliteExpr(); yygotominor.yy490->initNull(yymsp[-2].minor.yy490, "NOT NULL"); objectForTokens = yygotominor.yy490; } break; - case 275: /* exprx ::= expr IS not_opt expr */ + case 287: /* exprx ::= expr IS not_opt expr */ { yygotominor.yy490 = new SqliteExpr(); yygotominor.yy490->initIs(yymsp[-3].minor.yy490, *(yymsp[-1].minor.yy237), yymsp[0].minor.yy490); @@ -4260,21 +4328,21 @@ static void yy_reduce( objectForTokens = yygotominor.yy490; } break; - case 276: /* exprx ::= NOT expr */ + case 288: /* exprx ::= NOT expr */ { yygotominor.yy490 = new SqliteExpr(); yygotominor.yy490->initUnaryOp(yymsp[0].minor.yy490, yymsp[-1].minor.yy0->value); } break; - case 277: /* exprx ::= BITNOT expr */ - case 279: /* exprx ::= PLUS expr */ yytestcase(yyruleno==279); + case 289: /* exprx ::= BITNOT expr */ + case 291: /* exprx ::= PLUS expr */ yytestcase(yyruleno==291); { yygotominor.yy490 = new SqliteExpr(); yygotominor.yy490->initUnaryOp(yymsp[0].minor.yy490, yymsp[-1].minor.yy0->value); objectForTokens = yygotominor.yy490; } break; - case 278: /* exprx ::= MINUS expr */ + case 290: /* exprx ::= MINUS expr */ { yygotominor.yy490 = new SqliteExpr(); if (yymsp[0].minor.yy490->mode == SqliteExpr::Mode::LITERAL_VALUE && @@ -4291,7 +4359,7 @@ static void yy_reduce( objectForTokens = yygotominor.yy490; } break; - case 280: /* exprx ::= expr not_opt BETWEEN expr AND expr */ + case 292: /* exprx ::= expr not_opt BETWEEN expr AND expr */ { yygotominor.yy490 = new SqliteExpr(); yygotominor.yy490->initBetween(yymsp[-5].minor.yy490, *(yymsp[-4].minor.yy237), yymsp[-2].minor.yy490, yymsp[0].minor.yy490); @@ -4299,7 +4367,7 @@ static void yy_reduce( objectForTokens = yygotominor.yy490; } break; - case 281: /* exprx ::= expr not_opt IN LP exprlist RP */ + case 293: /* exprx ::= expr not_opt IN LP exprlist RP */ { yygotominor.yy490 = new SqliteExpr(); yygotominor.yy490->initIn(yymsp[-5].minor.yy490, *(yymsp[-4].minor.yy237), *(yymsp[-1].minor.yy13)); @@ -4308,14 +4376,14 @@ static void yy_reduce( objectForTokens = yygotominor.yy490; } break; - case 282: /* exprx ::= LP select RP */ + case 294: /* exprx ::= LP select RP */ { yygotominor.yy490 = new SqliteExpr(); yygotominor.yy490->initSubSelect(yymsp[-1].minor.yy123); objectForTokens = yygotominor.yy490; } break; - case 283: /* exprx ::= expr not_opt IN LP select RP */ + case 295: /* exprx ::= expr not_opt IN LP select RP */ { yygotominor.yy490 = new SqliteExpr(); yygotominor.yy490->initIn(yymsp[-5].minor.yy490, *(yymsp[-4].minor.yy237), yymsp[-1].minor.yy123); @@ -4323,7 +4391,7 @@ static void yy_reduce( objectForTokens = yygotominor.yy490; } break; - case 284: /* exprx ::= expr not_opt IN nm dbnm */ + case 296: /* exprx ::= expr not_opt IN nm dbnm */ { yygotominor.yy490 = new SqliteExpr(); yygotominor.yy490->initIn(yymsp[-4].minor.yy490, *(yymsp[-3].minor.yy237), *(yymsp[-1].minor.yy211), *(yymsp[0].minor.yy211)); @@ -4332,14 +4400,14 @@ static void yy_reduce( objectForTokens = yygotominor.yy490; } break; - case 285: /* exprx ::= EXISTS LP select RP */ + case 297: /* exprx ::= EXISTS LP select RP */ { yygotominor.yy490 = new SqliteExpr(); yygotominor.yy490->initExists(yymsp[-1].minor.yy123); objectForTokens = yygotominor.yy490; } break; - case 286: /* exprx ::= CASE case_operand case_exprlist case_else END */ + case 298: /* exprx ::= CASE case_operand case_exprlist case_else END */ { yygotominor.yy490 = new SqliteExpr(); yygotominor.yy490->initCase(yymsp[-3].minor.yy490, *(yymsp[-2].minor.yy13), yymsp[-1].minor.yy490); @@ -4347,14 +4415,14 @@ static void yy_reduce( objectForTokens = yygotominor.yy490; } break; - case 287: /* exprx ::= RAISE LP IGNORE RP */ + case 299: /* exprx ::= RAISE LP IGNORE RP */ { yygotominor.yy490 = new SqliteExpr(); yygotominor.yy490->initRaise(yymsp[-1].minor.yy0->value); objectForTokens = yygotominor.yy490; } break; - case 288: /* exprx ::= RAISE LP raisetype COMMA nm RP */ + case 300: /* exprx ::= RAISE LP raisetype COMMA nm RP */ { yygotominor.yy490 = new SqliteExpr(); yygotominor.yy490->initRaise(yymsp[-3].minor.yy0->value, *(yymsp[-1].minor.yy211)); @@ -4362,80 +4430,11 @@ static void yy_reduce( objectForTokens = yygotominor.yy490; } break; - case 289: /* exprx ::= nm DOT */ + case 301: /* expr ::= */ { yygotominor.yy490 = new SqliteExpr(); - yygotominor.yy490->initId(*(yymsp[-1].minor.yy211), QString::null, QString::null); - delete yymsp[-1].minor.yy211; objectForTokens = yygotominor.yy490; - parserContext->minorErrorBeforeNextToken("Syntax error"); - } - break; - case 290: /* exprx ::= nm DOT nm DOT */ -{ - yygotominor.yy490 = new SqliteExpr(); - yygotominor.yy490->initId(*(yymsp[-3].minor.yy211), *(yymsp[-1].minor.yy211), QString::null); - delete yymsp[-3].minor.yy211; - delete yymsp[-1].minor.yy211; - objectForTokens = yygotominor.yy490; - parserContext->minorErrorBeforeNextToken("Syntax error"); - } - break; - case 291: /* exprx ::= expr not_opt BETWEEN expr AND */ -{ - yygotominor.yy490 = new SqliteExpr(); - delete yymsp[-3].minor.yy237; - delete yymsp[-4].minor.yy490; - delete yymsp[-1].minor.yy490; - objectForTokens = yygotominor.yy490; - parserContext->minorErrorBeforeNextToken("Syntax error"); - } - break; - case 292: /* exprx ::= CASE case_operand case_exprlist case_else */ -{ - yygotominor.yy490 = new SqliteExpr(); - delete yymsp[-1].minor.yy13; - delete yymsp[-2].minor.yy490; - delete yymsp[0].minor.yy490; - objectForTokens = yygotominor.yy490; - parserContext->minorErrorBeforeNextToken("Syntax error"); - } - break; - case 293: /* exprx ::= expr not_opt IN LP exprlist */ -{ - yygotominor.yy490 = new SqliteExpr(); - delete yymsp[-3].minor.yy237; - delete yymsp[0].minor.yy13; - delete yymsp[-4].minor.yy490; - objectForTokens = yygotominor.yy490; - parserContext->minorErrorBeforeNextToken("Syntax error"); - } - break; - case 294: /* exprx ::= expr not_opt IN ID_DB */ -{ yy_destructor(yypParser,199,&yymsp[-3].minor); -} - break; - case 295: /* exprx ::= expr not_opt IN nm DOT ID_TAB */ - case 296: /* exprx ::= ID_DB|ID_TAB|ID_COL|ID_FN */ yytestcase(yyruleno==296); -{ yy_destructor(yypParser,199,&yymsp[-5].minor); - yy_destructor(yypParser,177,&yymsp[-2].minor); -} - break; - case 298: /* exprx ::= nm DOT nm DOT ID_COL */ -{ yy_destructor(yypParser,177,&yymsp[-4].minor); - yy_destructor(yypParser,177,&yymsp[-2].minor); -} - break; - case 299: /* exprx ::= expr COLLATE ID_COLLATE */ - case 300: /* exprx ::= RAISE LP raisetype COMMA ID_ERR_MSG RP */ yytestcase(yyruleno==300); -{ yy_destructor(yypParser,199,&yymsp[-2].minor); -} - break; - case 302: /* expr ::= */ -{ - yygotominor.yy490 = new SqliteExpr(); - objectForTokens = yygotominor.yy490; - parserContext->minorErrorAfterLastToken("Syntax error"); + parserContext->minorErrorAfterLastToken("Syntax error "); } break; case 305: /* likeop ::= LIKE_KW|MATCH */ diff --git a/SQLiteStudio3/coreSQLiteStudio/parser/sqlite3_parse.h b/SQLiteStudio3/coreSQLiteStudio/parser/sqlite3_parse.h index d18c81c..92a40ca 100644 --- a/SQLiteStudio3/coreSQLiteStudio/parser/sqlite3_parse.h +++ b/SQLiteStudio3/coreSQLiteStudio/parser/sqlite3_parse.h @@ -151,10 +151,10 @@ #define TK3_WHERE 151 #define TK3_ID_COL 152 #define TK3_INTO 153 -#define TK3_VARIABLE 154 -#define TK3_CASE 155 -#define TK3_ID_FN 156 -#define TK3_ID_ERR_MSG 157 +#define TK3_CASE 154 +#define TK3_ID_FN 155 +#define TK3_ID_ERR_MSG 156 +#define TK3_VARIABLE 157 #define TK3_WHEN 158 #define TK3_THEN 159 #define TK3_ELSE 160 diff --git a/SQLiteStudio3/coreSQLiteStudio/parser/sqlite3_parse.y b/SQLiteStudio3/coreSQLiteStudio/parser/sqlite3_parse.y index 932e965..0dc9154 100644 --- a/SQLiteStudio3/coreSQLiteStudio/parser/sqlite3_parse.y +++ b/SQLiteStudio3/coreSQLiteStudio/parser/sqlite3_parse.y @@ -1455,6 +1455,70 @@ inscollist ::= ID_COL. {} %type exprx {SqliteExpr*} %destructor exprx {delete $$;} + +exprx(X) ::= nm(N1) DOT. { + X = new SqliteExpr(); + X->initId(*(N1), QString::null, QString::null); + delete N1; + objectForTokens = X; + parserContext->minorErrorBeforeNextToken("Syntax error "); + } +exprx(X) ::= nm(N1) DOT nm(N2) DOT. { + X = new SqliteExpr(); + X->initId(*(N1), *(N2), QString::null); + delete N1; + delete N2; + objectForTokens = X; + parserContext->minorErrorBeforeNextToken("Syntax error "); + } +exprx(X) ::= expr(E1) not_opt(N) BETWEEN + expr(E2) AND. { + X = new SqliteExpr(); + delete N; + delete E1; + delete E2; + objectForTokens = X; + parserContext->minorErrorBeforeNextToken("Syntax error "); + } +exprx(X) ::= CASE case_operand(O) + case_exprlist(L) + case_else(E). { + X = new SqliteExpr(); + delete L; + delete O; + delete E; + objectForTokens = X; + parserContext->minorErrorBeforeNextToken("Syntax error "); + } +exprx(X) ::= expr(E) not_opt(N) IN LP + exprlist(L). [IN] { + X = new SqliteExpr(); + delete N; + delete L; + delete E; + objectForTokens = X; + parserContext->minorErrorBeforeNextToken("Syntax error "); + } +/* +This introduces premature reduce for LP-expr and causes bug #2755 +exprx(X) ::= LP expr(E). { + X = new SqliteExpr(); + X->initSubExpr(E); + objectForTokens = X; + parserContext->minorErrorBeforeNextToken("Syntax error "); + } +*/ +exprx ::= expr not_opt IN ID_DB. [IN] {} +exprx ::= expr not_opt IN nm DOT + ID_TAB. [IN] {} +exprx ::= ID_DB|ID_TAB|ID_COL|ID_FN. {} +exprx ::= nm DOT ID_TAB|ID_COL. {} +exprx ::= nm DOT nm DOT ID_COL. {} +exprx ::= expr COLLATE ID_COLLATE. {} +exprx ::= RAISE LP raisetype COMMA + ID_ERR_MSG RP. {} + + exprx(X) ::= term(T). { X = new SqliteExpr(); X->initLiteral(*(T)); @@ -1466,11 +1530,19 @@ exprx(X) ::= CTIME_KW(K). { X->initCTime(K->value); objectForTokens = X; } +exprx(X) ::= LP nexprlist(L) RP. { + X = new SqliteExpr(); + X->initRowValue(*(L)); + delete L; + objectForTokens = X; + } +/* exprx(X) ::= LP expr(E) RP. { X = new SqliteExpr(); X->initSubExpr(E); objectForTokens = X; } +*/ exprx(X) ::= id(N). { X = new SqliteExpr(); X->initId(*(N)); @@ -1697,77 +1769,15 @@ exprx(X) ::= RAISE LP raisetype(R) COMMA delete N; objectForTokens = X; } -exprx(X) ::= nm(N1) DOT. { - X = new SqliteExpr(); - X->initId(*(N1), QString::null, QString::null); - delete N1; - objectForTokens = X; - parserContext->minorErrorBeforeNextToken("Syntax error"); - } -exprx(X) ::= nm(N1) DOT nm(N2) DOT. { - X = new SqliteExpr(); - X->initId(*(N1), *(N2), QString::null); - delete N1; - delete N2; - objectForTokens = X; - parserContext->minorErrorBeforeNextToken("Syntax error"); - } -exprx(X) ::= expr(E1) not_opt(N) BETWEEN - expr(E2) AND. { - X = new SqliteExpr(); - delete N; - delete E1; - delete E2; - objectForTokens = X; - parserContext->minorErrorBeforeNextToken("Syntax error"); - } -exprx(X) ::= CASE case_operand(O) - case_exprlist(L) - case_else(E). { - X = new SqliteExpr(); - delete L; - delete O; - delete E; - objectForTokens = X; - parserContext->minorErrorBeforeNextToken("Syntax error"); - } -exprx(X) ::= expr(E) not_opt(N) IN LP - exprlist(L). [IN] { - X = new SqliteExpr(); - delete N; - delete L; - delete E; - objectForTokens = X; - parserContext->minorErrorBeforeNextToken("Syntax error"); - } -/* -This introduces premature reduce for LP-expr and causes bug #2755 -exprx(X) ::= LP expr(E). { - X = new SqliteExpr(); - X->initSubExpr(E); - objectForTokens = X; - parserContext->minorErrorBeforeNextToken("Syntax error"); - } -*/ - -exprx ::= expr not_opt IN ID_DB. [IN] {} -exprx ::= expr not_opt IN nm DOT - ID_TAB. [IN] {} -exprx ::= ID_DB|ID_TAB|ID_COL|ID_FN. {} -exprx ::= nm DOT ID_TAB|ID_COL. {} -exprx ::= nm DOT nm DOT ID_COL. {} -exprx ::= expr COLLATE ID_COLLATE. {} -exprx ::= RAISE LP raisetype COMMA - ID_ERR_MSG RP. {} %type expr {SqliteExpr*} %destructor expr {delete $$;} -expr(X) ::= exprx(E). {X = E;} expr(X) ::= . { X = new SqliteExpr(); objectForTokens = X; - parserContext->minorErrorAfterLastToken("Syntax error"); + parserContext->minorErrorAfterLastToken("Syntax error "); } +expr(X) ::= exprx(E). {X = E;} %type not_opt {bool*} %destructor not_opt {delete $$;} diff --git a/SQLiteStudio3/coreSQLiteStudio/parser/statementtokenbuilder.cpp b/SQLiteStudio3/coreSQLiteStudio/parser/statementtokenbuilder.cpp index a97b765..a0a0e3a 100644 --- a/SQLiteStudio3/coreSQLiteStudio/parser/statementtokenbuilder.cpp +++ b/SQLiteStudio3/coreSQLiteStudio/parser/statementtokenbuilder.cpp @@ -72,7 +72,7 @@ StatementTokenBuilder& StatementTokenBuilder::withComment(const QString& value) return with(Token::COMMENT, value); } -StatementTokenBuilder& StatementTokenBuilder::withFloat(double value) +StatementTokenBuilder& StatementTokenBuilder::withFloat(const QVariant& value) { return with(Token::FLOAT, doubleToString(value)); } @@ -163,7 +163,7 @@ StatementTokenBuilder& StatementTokenBuilder::withLiteralValue(const QVariant& v value.toDouble(&ok); if (ok) { - withFloat(value.toDouble()); + withFloat(value); return *this; } } diff --git a/SQLiteStudio3/coreSQLiteStudio/parser/statementtokenbuilder.h b/SQLiteStudio3/coreSQLiteStudio/parser/statementtokenbuilder.h index 3d748ad..14856e7 100644 --- a/SQLiteStudio3/coreSQLiteStudio/parser/statementtokenbuilder.h +++ b/SQLiteStudio3/coreSQLiteStudio/parser/statementtokenbuilder.h @@ -131,7 +131,7 @@ class StatementTokenBuilder * @param value Value for the token. * @return Reference to the builder for the further building. */ - StatementTokenBuilder& withFloat(double value); + StatementTokenBuilder& withFloat(const QVariant &value); /** * @brief Add integer numer token. diff --git a/SQLiteStudio3/coreSQLiteStudio/parser/token.cpp b/SQLiteStudio3/coreSQLiteStudio/parser/token.cpp index f2102c3..5396edd 100644 --- a/SQLiteStudio3/coreSQLiteStudio/parser/token.cpp +++ b/SQLiteStudio3/coreSQLiteStudio/parser/token.cpp @@ -490,6 +490,16 @@ TokenList TokenList::filter(Token::Type type) const return filtered; } +TokenList TokenList::filterOut(Token::Type type) const +{ + TokenList filtered; + foreach (TokenPtr token, *this) + if (token->type != type) + filtered << token; + + return filtered; +} + TokenList TokenList::filterWhiteSpaces(bool includeComments) const { TokenList filtered; diff --git a/SQLiteStudio3/coreSQLiteStudio/parser/token.h b/SQLiteStudio3/coreSQLiteStudio/parser/token.h index aecc7ec..aeb505c 100644 --- a/SQLiteStudio3/coreSQLiteStudio/parser/token.h +++ b/SQLiteStudio3/coreSQLiteStudio/parser/token.h @@ -626,6 +626,7 @@ class API_EXPORT TokenList : public QList * @return List of tokens from this list matching given \p type. */ TokenList filter(Token::Type type) const; + TokenList filterOut(Token::Type type) const; /** * @brief Creates list of tokens from this list, letting through only tokens that are not a whitespace. diff --git a/SQLiteStudio3/coreSQLiteStudio/plugins/dbpluginsqlite3.cpp b/SQLiteStudio3/coreSQLiteStudio/plugins/dbpluginsqlite3.cpp index 0f16098..7228752 100644 --- a/SQLiteStudio3/coreSQLiteStudio/plugins/dbpluginsqlite3.cpp +++ b/SQLiteStudio3/coreSQLiteStudio/plugins/dbpluginsqlite3.cpp @@ -38,7 +38,7 @@ QList DbPluginSqlite3::getOptionsList() const QString DbPluginSqlite3::generateDbName(const QVariant& baseValue) { QFileInfo file(baseValue.toString()); - return file.baseName(); + return file.completeBaseName(); } bool DbPluginSqlite3::checkIfDbServedByPlugin(Db* db) const diff --git a/SQLiteStudio3/coreSQLiteStudio/plugins/dbpluginstdfilebase.cpp b/SQLiteStudio3/coreSQLiteStudio/plugins/dbpluginstdfilebase.cpp new file mode 100644 index 0000000..b890c26 --- /dev/null +++ b/SQLiteStudio3/coreSQLiteStudio/plugins/dbpluginstdfilebase.cpp @@ -0,0 +1,33 @@ +#include "dbpluginstdfilebase.h" +#include "common/unused.h" +#include "db/sqlquery.h" +#include + +Db *DbPluginStdFileBase::getInstance(const QString &name, const QString &path, const QHash &options, QString *errorMessage) +{ + UNUSED(errorMessage); + + Db* db = newInstance(name, path, options); + + if (!db->openForProbing()) + { + delete db; + return nullptr; + } + + SqlQueryPtr results = db->exec("SELECT * FROM sqlite_master"); + if (results->isError()) + { + delete db; + return nullptr; + } + + db->closeQuiet(); + return db; +} + +QString DbPluginStdFileBase::generateDbName(const QVariant &baseValue) +{ + QFileInfo file(baseValue.toString()); + return file.completeBaseName(); +} diff --git a/SQLiteStudio3/coreSQLiteStudio/plugins/dbpluginstdfilebase.h b/SQLiteStudio3/coreSQLiteStudio/plugins/dbpluginstdfilebase.h new file mode 100644 index 0000000..6ea1c47 --- /dev/null +++ b/SQLiteStudio3/coreSQLiteStudio/plugins/dbpluginstdfilebase.h @@ -0,0 +1,16 @@ +#ifndef DBPLUGINSTDFILEBASE_H +#define DBPLUGINSTDFILEBASE_H + +#include "dbplugin.h" + +class API_EXPORT DbPluginStdFileBase : public DbPlugin +{ + public: + Db *getInstance(const QString &name, const QString &path, const QHash &options, QString *errorMessage); + QString generateDbName(const QVariant &baseValue); + + protected: + virtual Db *newInstance(const QString &name, const QString &path, const QHash &options) = 0; +}; + +#endif // DBPLUGINSTDFILEBASE_H diff --git a/SQLiteStudio3/coreSQLiteStudio/plugins/uiconfiguredplugin.h b/SQLiteStudio3/coreSQLiteStudio/plugins/uiconfiguredplugin.h index c9af8e0..1426117 100644 --- a/SQLiteStudio3/coreSQLiteStudio/plugins/uiconfiguredplugin.h +++ b/SQLiteStudio3/coreSQLiteStudio/plugins/uiconfiguredplugin.h @@ -39,7 +39,7 @@ class API_EXPORT UiConfiguredPlugin * * This is called just after the config dialog was open and all its contents are already initialized. * This is a good moment to connect to plugin's CfgMain configuration object to listen for changes, - * so all uncommited (yet) configuration changes can be reflected by this plugin. + * so all uncommitted (yet) configuration changes can be reflected by this plugin. */ virtual void configDialogOpen() = 0; diff --git a/SQLiteStudio3/coreSQLiteStudio/querygenerator.cpp b/SQLiteStudio3/coreSQLiteStudio/querygenerator.cpp index 4e2d9b6..c10e8f7 100644 --- a/SQLiteStudio3/coreSQLiteStudio/querygenerator.cpp +++ b/SQLiteStudio3/coreSQLiteStudio/querygenerator.cpp @@ -87,7 +87,10 @@ QString QueryGenerator::generateUpdateOfTable(Db* db, const QString& database, c // If no values were given, we simply use column names as values everywhere if (values.isEmpty()) - return tplWithWhere.arg(target, commonColumnStr, commonColumnStr); + { + QString conditionStr = commonUpdateCols.join(" AND "); + return tplWithWhere.arg(target, commonColumnStr, conditionStr); + } // If values were given, then they will be used in WHERE clause QStringList valueCols = values.keys(); @@ -126,7 +129,7 @@ QString QueryGenerator::generateDeleteFromTable(Db* db, const QString& database, conditionCols << conditionColTpl.arg(wrapObjIfNeeded(col, dialect), wrapString(col)); // Put it to comma spearated string - QString conditionStr = conditionCols.join(", "); + QString conditionStr = conditionCols.join(" AND "); return tplWithWhere.arg(target, conditionStr); } diff --git a/SQLiteStudio3/coreSQLiteStudio/schemaresolver.cpp b/SQLiteStudio3/coreSQLiteStudio/schemaresolver.cpp index 0044c3e..48fe541 100644 --- a/SQLiteStudio3/coreSQLiteStudio/schemaresolver.cpp +++ b/SQLiteStudio3/coreSQLiteStudio/schemaresolver.cpp @@ -1,5 +1,6 @@ #include "schemaresolver.h" #include "db/db.h" +#include "db/sqlresultsrow.h" #include "parser/parsererror.h" #include "parser/ast/sqlitecreatetable.h" #include "parser/ast/sqlitecreateindex.h" @@ -303,6 +304,67 @@ QString SchemaResolver::getObjectDdl(const QString &database, const QString &nam return cache.object(key, true)->toString(); // Get the DDL + QString resStr = getObjectDdlWithSimpleName(dbName, lowerName, targetTable, type); + if (resStr.isNull()) + resStr = getObjectDdlWithDifficultName(dbName, lowerName, targetTable, type); + + // If the DDL doesn't have semicolon at the end (usually the case), add it. + if (!resStr.trimmed().endsWith(";")) + resStr += ";"; + + if (useCache) + cache.insert(key, new QVariant(resStr)); + + // Return the DDL + return resStr; +} + +QString SchemaResolver::getObjectDdlWithDifficultName(const QString &dbName, const QString &lowerName, QString targetTable, SchemaResolver::ObjectType type) +{ + // + // Slower, but works with Russian names, etc, because "string lower" is done only at Qt level, not at SQLite level. + // + QString typeStr = objectTypeToString(type); + SqlQueryPtr queryResults; + if (type != ANY) + { + queryResults = db->exec(QString( + "SELECT name, sql FROM %1.%4 WHERE type = '%3';").arg(dbName, typeStr, targetTable), + dbFlags + ); + + } + else + { + queryResults = db->exec(QString( + "SELECT name, sql FROM %1.%3;").arg(dbName, targetTable), + dbFlags + ); + } + + // Validate query results + if (queryResults->isError()) + { + qDebug() << "Could not get object's DDL:" << dbName << "." << lowerName << ", details:" << queryResults->getErrorText(); + return QString::null; + } + + // The DDL string + SqlResultsRowPtr row; + while (queryResults->hasNext()) + { + row = queryResults->next(); + if (row->value("name").toString().toLower() != lowerName) + continue; + + return row->value("sql").toString(); + } + return QString(); +} + +QString SchemaResolver::getObjectDdlWithSimpleName(const QString &dbName, const QString &lowerName, QString targetTable, SchemaResolver::ObjectType type) +{ + QString typeStr = objectTypeToString(type); QVariant results; SqlQueryPtr queryResults; if (type != ANY) @@ -324,23 +386,13 @@ QString SchemaResolver::getObjectDdl(const QString &database, const QString &nam // Validate query results if (queryResults->isError()) { - qDebug() << "Could not get object's DDL:" << dbName << "." << name << ", details:" << queryResults->getErrorText(); + qDebug() << "Could not get object's DDL:" << dbName << "." << lowerName << ", details:" << queryResults->getErrorText(); return QString::null; } // The DDL string results = queryResults->getSingleCell(); - QString resStr = results.toString(); - - // If the DDL doesn't have semicolon at the end (usually the case), add it. - if (!resStr.trimmed().endsWith(";")) - resStr += ";"; - - if (useCache) - cache.insert(key, new QVariant(resStr)); - - // Return the DDL - return resStr; + return results.toString(); } QStringList SchemaResolver::getColumnsFromDdlUsingPragma(const QString& ddl) diff --git a/SQLiteStudio3/coreSQLiteStudio/schemaresolver.h b/SQLiteStudio3/coreSQLiteStudio/schemaresolver.h index 336b0f2..676d0f5 100644 --- a/SQLiteStudio3/coreSQLiteStudio/schemaresolver.h +++ b/SQLiteStudio3/coreSQLiteStudio/schemaresolver.h @@ -200,6 +200,8 @@ class API_EXPORT SchemaResolver bool isFilteredOut(const QString& value, const QString& type); void filterSystemIndexes(QStringList& indexes); QList getParsedTriggersForTableOrView(const QString& database, const QString& tableOrView, bool includeContentReferences, bool table); + QString getObjectDdlWithDifficultName(const QString& dbName, const QString& lowerName, QString targetTable, ObjectType type); + QString getObjectDdlWithSimpleName(const QString& dbName, const QString& lowerName, QString targetTable, ObjectType type); template StrHash> getAllParsedObjectsForType(const QString& database, const QString& type); diff --git a/SQLiteStudio3/coreSQLiteStudio/selectresolver.cpp b/SQLiteStudio3/coreSQLiteStudio/selectresolver.cpp index 02489ee..1b7e33d 100644 --- a/SQLiteStudio3/coreSQLiteStudio/selectresolver.cpp +++ b/SQLiteStudio3/coreSQLiteStudio/selectresolver.cpp @@ -250,17 +250,36 @@ void SelectResolver::markGroupedColumns() void SelectResolver::fixColumnNames() { QSet existingDisplayNames; + QSet existingAliasNames; QString originalName; + QString originalAlias; + QString alias; int i; QMutableListIterator it(currentCoreResults); while (it.hasNext()) { + // Display name originalName = it.next().displayName; for (i = 1; existingDisplayNames.contains(it.value().displayName); i++) it.value().displayName = originalName + ":" + QString::number(i); existingDisplayNames << it.value().displayName; + + // Alias + // Handled both alias duplicates and name duplicates. + // If name is duplicated, also create alias for it. + // This is important, because in case of duplicated name/alias, the result column is actually + // made unique with sequenced number - not only for display, but also for data origin. + alias = it.value().alias.isNull() ? it.value().column : it.value().alias; + originalAlias = alias; + for (i = 1; existingAliasNames.contains(alias); i++) + alias = originalAlias + ":" + QString::number(i); + + if (alias != originalAlias) + it.value().alias = alias; + + existingAliasNames << alias; } } @@ -630,7 +649,7 @@ QStringList SelectResolver::getTableColumns(const QString &database, const QStri Table dbTable; dbTable.database = database; dbTable.table = table; - dbTable.alias = alias; + dbTable.tableAlias = alias; if (tableColumnsCache.contains(dbTable)) return tableColumnsCache.value(dbTable); @@ -650,7 +669,8 @@ void SelectResolver::applySubSelectAlias(QList& columns, { while (it.hasNext()) { - it.next().tableAlias = alias; + it.next().pushTableAlias(); + it.value().tableAlias = alias; it.value().flags &= ~FROM_ANONYMOUS_SELECT; // remove anonymous flag } } @@ -695,44 +715,64 @@ bool SelectResolver::parseOriginalQuery() return true; } +SelectResolver::Table::Table() +{ +} + +SelectResolver::Table::Table(const SelectResolver::Table &other) : + database(other.database), originalDatabase(other.originalDatabase), table(other.table), + tableAlias(other.tableAlias), oldTableAliases(other.oldTableAliases), flags(other.flags) +{ +} + int SelectResolver::Table::operator ==(const SelectResolver::Table &other) { - return table == other.table && database == other.database && alias == other.alias; + return ::operator==(*this, other); +} + +void SelectResolver::Table::pushTableAlias() +{ + if (!tableAlias.isNull()) + oldTableAliases += tableAlias; } int operator==(const SelectResolver::Table& t1, const SelectResolver::Table& t2) { - return t1.table == t2.table && t1.database == t2.database && t1.alias == t2.alias; + return t1.table.compare(t2.table, Qt::CaseInsensitive) == 0 && + t1.database.compare(t2.database, Qt::CaseInsensitive) == 0 && + t1.tableAlias.compare(t2.tableAlias, Qt::CaseInsensitive) == 0 && + t1.oldTableAliases.size() == t2.oldTableAliases.size() && + t1.oldTableAliases.join(",").compare(t2.oldTableAliases.join(","), Qt::CaseInsensitive) == 0; } uint qHash(const SelectResolver::Table& table) { - return qHash(table.database + "." + table.table + "." + table.alias); + return qHash(table.database.toLower() + "." + table.table.toLower() + "/" + table.tableAlias.toLower() + "/" + + table.oldTableAliases.join(",")); } int SelectResolver::Column::operator ==(const SelectResolver::Column &other) { - return table == other.table && database == other.database && column == other.column && tableAlias == other.tableAlias; + return ::operator==(*this, other); } SelectResolver::Table SelectResolver::Column::getTable() const { - Table resTable; - resTable.table = table; - resTable.database = database; - resTable.originalDatabase = originalDatabase; - resTable.alias = tableAlias; - resTable.flags = flags; - return resTable; + return Table(*this); } int operator ==(const SelectResolver::Column &c1, const SelectResolver::Column &c2) { - return c1.table == c2.table && c1.database == c2.database && c1.column == c2.column && c1.tableAlias == c2.tableAlias; + return c1.column.compare(c2.column, Qt::CaseInsensitive) == 0 && + c1.table.compare(c2.table, Qt::CaseInsensitive) == 0 && + c1.database.compare(c2.database, Qt::CaseInsensitive) == 0 && + c1.tableAlias.compare(c2.tableAlias, Qt::CaseInsensitive) == 0 && + c1.oldTableAliases.size() == c2.oldTableAliases.size() && + c1.oldTableAliases.join(",").compare(c2.oldTableAliases.join(","), Qt::CaseInsensitive) == 0; } - uint qHash(const SelectResolver::Column &column) { - return qHash(column.database + "." + column.table + "." + column.column + "/" + column.tableAlias); + return qHash(column.database.toLower() + "." + column.table.toLower() + "." + column.column.toLower() + "/" + + column.tableAlias.toLower() + "/" + column.oldTableAliases.join(",")); } diff --git a/SQLiteStudio3/coreSQLiteStudio/selectresolver.h b/SQLiteStudio3/coreSQLiteStudio/selectresolver.h index 1edfcb9..7640fc6 100644 --- a/SQLiteStudio3/coreSQLiteStudio/selectresolver.h +++ b/SQLiteStudio3/coreSQLiteStudio/selectresolver.h @@ -8,6 +8,7 @@ #include #include #include +#include class Db; class SchemaResolver; @@ -64,6 +65,9 @@ class API_EXPORT SelectResolver */ struct API_EXPORT Table { + Table(); + Table(const Table& other); + /** * @brief Database name. * @@ -72,16 +76,18 @@ class API_EXPORT SelectResolver QString database; QString originalDatabase; QString table; - QString alias; + QString tableAlias; + QStringList oldTableAliases; int flags = 0; int operator==(const Table& other); + void pushTableAlias(); }; /** * @brief Result column resolved by the resolver. */ - struct API_EXPORT Column + struct API_EXPORT Column : public Table { enum Type { @@ -91,15 +97,6 @@ class API_EXPORT SelectResolver Type type; - /** - * @brief Database name. - * - * Either sqlite name, like "main", or "temp", or an attach name. - */ - QString database; - QString originalDatabase; - QString table; - /** * @brief Column name or expression. * @@ -107,7 +104,6 @@ class API_EXPORT SelectResolver */ QString column; QString alias; - QString tableAlias; QString displayName; bool aliasDefinedInSubQuery = false; int flags = 0; diff --git a/SQLiteStudio3/coreSQLiteStudio/services/config.cpp b/SQLiteStudio3/coreSQLiteStudio/services/config.cpp index 1fef317..60a80d5 100644 --- a/SQLiteStudio3/coreSQLiteStudio/services/config.cpp +++ b/SQLiteStudio3/coreSQLiteStudio/services/config.cpp @@ -3,7 +3,18 @@ CFG_DEFINE(Core) static const QString DB_FILE_NAME = QStringLiteral("settings3"); +static QString MASTER_CONFIG_FILE = QString(); Config::~Config() { } + +void Config::setMasterConfigFile(const QString &path) +{ + MASTER_CONFIG_FILE = path; +} + +QString Config::getMasterConfigFile() +{ + return MASTER_CONFIG_FILE; +} diff --git a/SQLiteStudio3/coreSQLiteStudio/services/config.h b/SQLiteStudio3/coreSQLiteStudio/services/config.h index c7bebf3..1e4c410 100644 --- a/SQLiteStudio3/coreSQLiteStudio/services/config.h +++ b/SQLiteStudio3/coreSQLiteStudio/services/config.h @@ -14,7 +14,7 @@ #include #include -const int SQLITESTUDIO_CONFIG_VERSION = 1; +const int SQLITESTUDIO_CONFIG_VERSION = 2; CFG_CATEGORIES(Core, CFG_CATEGORY(General, @@ -104,6 +104,9 @@ class API_EXPORT Config : public QObject typedef QSharedPointer ReportHistoryEntryPtr; + static void setMasterConfigFile(const QString& path); + static QString getMasterConfigFile(); + virtual void init() = 0; virtual void cleanUp() = 0; virtual const QString& getConfigDir() const = 0; @@ -166,7 +169,7 @@ class API_EXPORT Config : public QObject signals: void massSaveBegins(); - void massSaveCommited(); + void massSaveCommitted(); void sqlHistoryRefreshNeeded(); void ddlHistoryRefreshNeeded(); void reportsHistoryRefreshNeeded(); diff --git a/SQLiteStudio3/coreSQLiteStudio/services/impl/configimpl.cpp b/SQLiteStudio3/coreSQLiteStudio/services/impl/configimpl.cpp index 5aed863..cf8b115 100644 --- a/SQLiteStudio3/coreSQLiteStudio/services/impl/configimpl.cpp +++ b/SQLiteStudio3/coreSQLiteStudio/services/impl/configimpl.cpp @@ -28,6 +28,8 @@ void ConfigImpl::init() { initDbFile(); initTables(); + updateConfigDb(); + mergeMasterConfig(); sqlite3Version = db->exec("SELECT sqlite_version()")->getSingleCell().toString(); @@ -72,7 +74,7 @@ void ConfigImpl::commitMassSave() return; db->exec("COMMIT;"); - emit massSaveCommited(); + emit massSaveCommitted(); massSaving = false; } @@ -791,6 +793,73 @@ void ConfigImpl::asyncClearReportHistory() emit reportsHistoryRefreshNeeded(); } +void ConfigImpl::mergeMasterConfig() +{ + QString masterConfigFile = Config::getMasterConfigFile(); + if (masterConfigFile.isEmpty()) + return; + + qInfo() << "Updating settings from master configuration file: " << masterConfigFile; + + Db* masterDb = new DbSqlite3("SQLiteStudio master settings", masterConfigFile, {{DB_PURE_INIT, true}}); + if (!masterDb->open()) + { + safe_delete(masterDb); + qWarning() << "Could not open master config database:" << masterConfigFile; + return; + } + + SqlQueryPtr results = masterDb->exec("SELECT [group], key, value FROM settings"); + if (results->isError()) + { + qWarning() << "Could not query master config database:" << masterConfigFile << ", error details:" << results->getErrorText(); + safe_delete(masterDb); + return; + } + + static_qstring(insertSql, "INSERT OR IGNORE INTO settings ([group], key, value) VALUES (?, ?, ?)"); + db->begin(); + SqlResultsRowPtr row; + while (results->hasNext()) + { + row = results->next(); + if (row->value("group") == "General" && row->value("key") == "Session") + continue; // Don't copy session + + db->exec(insertSql, row->valueList()); + } + db->commit(); + + masterDb->close(); + safe_delete(masterDb); +} + +void ConfigImpl::updateConfigDb() +{ + SqlQueryPtr result = db->exec("SELECT version FROM version LIMIT 1"); + int dbVersion = result->getSingleCell().toInt(); + if (dbVersion >= SQLITESTUDIO_CONFIG_VERSION) + return; + + db->begin(); + switch (dbVersion) + { + case 1: + { + // 1->2 + db->exec("UPDATE settings SET [key] = 'DataUncommittedError' WHERE [key] = 'DataUncommitedError'"); + db->exec("UPDATE settings SET [key] = 'DataUncommitted' WHERE [key] = 'DataUncommited'"); + } + // Add cases here for next versions, + // without a "break" instruction, + // in order to update from certain + // version to latest at once. + } + + db->exec("UPDATE version SET version = ?", {SQLITESTUDIO_CONFIG_VERSION}); + db->commit(); +} + void ConfigImpl::refreshSqlHistory() { if (sqlHistoryModel) diff --git a/SQLiteStudio3/coreSQLiteStudio/services/impl/configimpl.h b/SQLiteStudio3/coreSQLiteStudio/services/impl/configimpl.h index bd31f0b..08bcec7 100644 --- a/SQLiteStudio3/coreSQLiteStudio/services/impl/configimpl.h +++ b/SQLiteStudio3/coreSQLiteStudio/services/impl/configimpl.h @@ -111,6 +111,9 @@ class API_EXPORT ConfigImpl : public Config void asyncDeleteReport(int id); void asyncClearReportHistory(); + void mergeMasterConfig(); + void updateConfigDb(); + static Config* instance; static qint64 sqlHistoryId; diff --git a/SQLiteStudio3/coreSQLiteStudio/services/impl/functionmanagerimpl.cpp b/SQLiteStudio3/coreSQLiteStudio/services/impl/functionmanagerimpl.cpp index da732bd..826b34b 100644 --- a/SQLiteStudio3/coreSQLiteStudio/services/impl/functionmanagerimpl.cpp +++ b/SQLiteStudio3/coreSQLiteStudio/services/impl/functionmanagerimpl.cpp @@ -9,12 +9,14 @@ #include "services/dbmanager.h" #include "db/queryexecutor.h" #include "db/sqlquery.h" +#include "services/importmanager.h" #include #include #include #include #include #include +#include FunctionManagerImpl::FunctionManagerImpl() { @@ -269,6 +271,10 @@ void FunctionManagerImpl::initNativeFunctions() registerNativeFunction("sha3_256", {"data"}, FunctionManagerImpl::nativeSha3_256); registerNativeFunction("sha3_384", {"data"}, FunctionManagerImpl::nativeSha3_384); registerNativeFunction("sha3_512", {"data"}, FunctionManagerImpl::nativeSha3_512); + registerNativeFunction("import", {"file", "format", "table", "charset", "options"}, FunctionManagerImpl::nativeImport); + registerNativeFunction("import_formats", {}, FunctionManagerImpl::nativeImportFormats); + registerNativeFunction("import_options", {"format"}, FunctionManagerImpl::nativeImportOptions); + registerNativeFunction("charsets", {}, FunctionManagerImpl::nativeCharsets); } void FunctionManagerImpl::refreshFunctionsByKey() @@ -654,6 +660,107 @@ QVariant FunctionManagerImpl::nativeSha3_512(const QList& args, Db* db return nativeCryptographicFunction(args, db, ok, QCryptographicHash::Sha3_512); } +QVariant FunctionManagerImpl::nativeImport(const QList &args, Db *db, bool &ok) +{ + if (args.size() < 3) + { + ok = false; + return 0; + } + + ImportManager::StandardImportConfig stdConfig; + stdConfig.inputFileName = args[0].toString(); + stdConfig.ignoreErrors = true; + stdConfig.skipTransaction = true; + if (args.size() > 3) + stdConfig.codec = args[3].toString(); + + if (args.size() > 4) + { + // Parsing plugin options + int idx; + QString option; + QString value; + CfgEntry* cfg; + QStringList lines = args[4].toString().split(QRegExp("[\r\n]+")); + for (const QString& line : lines) + { + idx = line.indexOf("="); + if (idx == -1) + { + qDebug() << "Invalid options entry for import() function call:" << line; + continue; + } + option = line.left(idx).trimmed(); + cfg = CfgMain::getEntryByPath(option); + if (!cfg) + { + qDebug() << "Invalid option name for import() function call:" << option; + continue; + } + value = line.mid(idx + 1); + cfg->set(value); + } + } + + QString format = args[1].toString(); + QString table = args[2].toString(); + + IMPORT_MANAGER->configure(format, stdConfig); + IMPORT_MANAGER->importToTable(db, table, false); + return 1; +} + +QVariant FunctionManagerImpl::nativeImportFormats(const QList &args, Db *db, bool &ok) +{ + UNUSED(args); + UNUSED(db); + UNUSED(ok); + QStringList formats; + QList importPlugins = PLUGINS->getLoadedPlugins(); + for (ImportPlugin* plugin : importPlugins) + formats << plugin->getDataSourceTypeName(); + + return formats.join(" "); +} + +QVariant FunctionManagerImpl::nativeImportOptions(const QList &args, Db *db, bool &ok) +{ + UNUSED(db); + if (args.size() != 1) + { + qDebug() << "Missing 'type' parameter to import_options() function call."; + ok = false; + return QVariant(); + } + + QString type = args[0].toString(); + + QList importPlugins = PLUGINS->getLoadedPlugins(); + ImportPlugin* thePlugin = findFirst(importPlugins, [type](ImportPlugin* plugin) -> bool {return plugin->getDataSourceTypeName() == type;}); + if (!thePlugin) + { + ok = false; + qDebug() << "No import plugin handling format (in call to import_options()):" << type; + return QVariant(); + } + + static_qstring(tpl, "%1=%2"); + QStringList opts; + for (CfgEntry* entry : thePlugin->getConfig()->getEntries()) + opts << tpl.arg(entry->getFullKey(), entry->get().toString()); + + return opts.join("\n"); +} + +QVariant FunctionManagerImpl::nativeCharsets(const QList &args, Db *db, bool &ok) +{ + UNUSED(args); + UNUSED(db); + UNUSED(ok); + return textCodecNames().join(" "); +} + QStringList FunctionManagerImpl::getArgMarkers(int argCount) { QStringList argMarkers; diff --git a/SQLiteStudio3/coreSQLiteStudio/services/impl/functionmanagerimpl.h b/SQLiteStudio3/coreSQLiteStudio/services/impl/functionmanagerimpl.h index d8734e6..0e5e103 100644 --- a/SQLiteStudio3/coreSQLiteStudio/services/impl/functionmanagerimpl.h +++ b/SQLiteStudio3/coreSQLiteStudio/services/impl/functionmanagerimpl.h @@ -83,6 +83,10 @@ class API_EXPORT FunctionManagerImpl : public FunctionManager static QVariant nativeSha3_256(const QList& args, Db* db, bool& ok); static QVariant nativeSha3_384(const QList& args, Db* db, bool& ok); static QVariant nativeSha3_512(const QList& args, Db* db, bool& ok); + static QVariant nativeImport(const QList& args, Db* db, bool& ok); + static QVariant nativeImportFormats(const QList& args, Db* db, bool& ok); + static QVariant nativeImportOptions(const QList& args, Db* db, bool& ok); + static QVariant nativeCharsets(const QList& args, Db* db, bool& ok); QList functions; QHash functionsByKey; diff --git a/SQLiteStudio3/coreSQLiteStudio/services/importmanager.cpp b/SQLiteStudio3/coreSQLiteStudio/services/importmanager.cpp index 53803e5..b9aa947 100644 --- a/SQLiteStudio3/coreSQLiteStudio/services/importmanager.cpp +++ b/SQLiteStudio3/coreSQLiteStudio/services/importmanager.cpp @@ -38,7 +38,7 @@ void ImportManager::configure(const QString& dataSourceType, const ImportManager importConfig = config; } -void ImportManager::importToTable(Db* db, const QString& table) +void ImportManager::importToTable(Db* db, const QString& table, bool async) { this->db = db; this->table = table; @@ -71,7 +71,10 @@ void ImportManager::importToTable(Db* db, const QString& table) connect(worker, SIGNAL(createdTable(Db*,QString)), this, SLOT(handleTableCreated(Db*,QString))); connect(this, SIGNAL(orderWorkerToInterrupt()), worker, SLOT(interrupt())); - QThreadPool::globalInstance()->start(worker); + if (async) + QThreadPool::globalInstance()->start(worker); + else + worker->run(); } void ImportManager::interrupt() diff --git a/SQLiteStudio3/coreSQLiteStudio/services/importmanager.h b/SQLiteStudio3/coreSQLiteStudio/services/importmanager.h index 2401e78..5c6a73e 100644 --- a/SQLiteStudio3/coreSQLiteStudio/services/importmanager.h +++ b/SQLiteStudio3/coreSQLiteStudio/services/importmanager.h @@ -38,6 +38,7 @@ class API_EXPORT ImportManager : public PluginServiceBase QString inputFileName; bool ignoreErrors = false; + bool skipTransaction = false; }; enum StandardConfigFlag @@ -54,7 +55,7 @@ class API_EXPORT ImportManager : public PluginServiceBase ImportPlugin* getPluginForDataSourceType(const QString& dataSourceType) const; void configure(const QString& dataSourceType, const StandardImportConfig& config); - void importToTable(Db* db, const QString& table); + void importToTable(Db* db, const QString& table, bool async = true); static bool isAnyPluginAvailable(); diff --git a/SQLiteStudio3/coreSQLiteStudio/sqlitestudio.cpp b/SQLiteStudio3/coreSQLiteStudio/sqlitestudio.cpp index efb5bb4..1e7863b 100644 --- a/SQLiteStudio3/coreSQLiteStudio/sqlitestudio.cpp +++ b/SQLiteStudio3/coreSQLiteStudio/sqlitestudio.cpp @@ -39,7 +39,7 @@ DEFINE_SINGLETON(SQLiteStudio) -static const int sqlitestudioVersion = 30100; +static const int sqlitestudioVersion = 30101; SQLiteStudio::SQLiteStudio() { @@ -260,7 +260,7 @@ void SQLiteStudio::init(const QStringList& cmdListArguments, bool guiAvailable) QThreadPool::globalInstance()->setMaxThreadCount(10); - Q_INIT_RESOURCE(coresqlitestudio); + Q_INIT_RESOURCE(coreSQLiteStudio); CfgLazyInitializer::init(); @@ -369,7 +369,7 @@ void SQLiteStudio::cleanUp() safe_delete(env); NotifyManager::destroy(); } - Q_CLEANUP_RESOURCE(coresqlitestudio); + Q_CLEANUP_RESOURCE(coreSQLiteStudio); } void SQLiteStudio::updateCodeFormatter() diff --git a/SQLiteStudio3/coreSQLiteStudio/tablemodifier.cpp b/SQLiteStudio3/coreSQLiteStudio/tablemodifier.cpp index a0f6262..9c14f63 100644 --- a/SQLiteStudio3/coreSQLiteStudio/tablemodifier.cpp +++ b/SQLiteStudio3/coreSQLiteStudio/tablemodifier.cpp @@ -620,10 +620,10 @@ bool TableModifier::isTableAliasUsedForColumn(const TokenPtr &token, const StrHa } SelectResolver::Table table = resolvedTables.value(token->value, Qt::CaseInsensitive); - if (table.alias.isNull()) + if (table.tableAlias.isNull()) return false; - if (table.alias.compare(token->value), Qt::CaseInsensitive != 0) + if (table.tableAlias.compare(token->value), Qt::CaseInsensitive != 0) return false; // If the table token is mentioned in FROM clause, it's not a subject for aliased usage, cuase it defines alias, not uses it. diff --git a/SQLiteStudio3/coreSQLiteStudio/translations/coreSQLiteStudio_de.ts b/SQLiteStudio3/coreSQLiteStudio/translations/coreSQLiteStudio_de.ts index 0c60582..7467fa1 100644 --- a/SQLiteStudio3/coreSQLiteStudio/translations/coreSQLiteStudio_de.ts +++ b/SQLiteStudio3/coreSQLiteStudio/translations/coreSQLiteStudio_de.ts @@ -1,6 +1,6 @@ - + AbstractDb @@ -26,37 +26,37 @@ ChainExecutor - + The database for executing queries was not defined. chain executor Es wurde keine Datenbank zur Ausführung von Abfragen festgelegt. - + The database for executing queries was not open. chain executor Die Datenbank ist zur Ausführung von Abfragen nicht geöffnet worden. - + Could not disable foreign keys in the database. Details: %1 chain executor Fremdschlüssel konnten nicht deaktiviert werden für die Datenbank. Details: %1 - + Could not start a database transaction. Details: %1 chain executor Es kann keine Datenbanktransaktion gestartet werden. Details: %1 - + Interrupted chain executor Abgebrochen - + Could not commit a database transaction. Details: %1 chain executor Die Datenbanktransaktion kann nicht 'committet' werden. Details: %1 @@ -245,17 +245,17 @@ Tabellen, Indizes, Trigger und Views die in Datenbank %3 kopiert wurden, werden DbVersionConverter - + Target file exists, but could not be overwritten. Die Zieldatei existiert zwar, konnte aber nicht überschrieben werden. - + Could not find proper database plugin to create target database. Es konnte kein geeignetes Datenbankplugin gefunden werden, um die Zieldatenbank zu erzeugen. - + Error while converting database: %1 Fehler beim Konvertieren der Datenbank: %1 @@ -343,23 +343,23 @@ Tabellen, Indizes, Trigger und Views die in Datenbank %3 kopiert wurden, werden Fehler beim Ermitteln der Spaltenbreite für den Export der Abfrageergebnisse: %1 - - + + Could not parse %1 in order to export it. It will be excluded from the export output. %1 konnte zum Exportieren nicht korrekt verarbeitet werden. Diese Daten werden nicht exportiert. - + Error while reading data to export from table %1: %2 Fehler beim Lesen der zu exportierenden Daten aus der Tabelle %1: %2 - + Error while counting data to export from table %1: %2 Fehler beim Ermitteln der zu exportierenden Daten aus der Tabelle %1: %2 - + Error while counting data column width to export from table %1: %2 Fehler beim Ermitteln der Spaltenbreite für den Export aus Tabelle %1: %2 @@ -367,44 +367,44 @@ Tabellen, Indizes, Trigger und Views die in Datenbank %3 kopiert wurden, werden FunctionManagerImpl - + Invalid number of arguments to function '%1'. Expected %2, but got %3. Falsche Anzahl an Parametern für Funktion '%1'. Erwartet wurden %2, angegeben wurden jedoch %3. - + No such function registered in SQLiteStudio: %1(%2) Diese Funktion ist in SQLiteStudio nicht verfügbar: %1(%2) - + Function %1(%2) was registered with language %3, but the plugin supporting that language is not currently loaded. Auch hier ist sicherlich eine Überarbeitung nötig, wenn der Kontext der Meldung bekannt ist. Die Funktion %1(%2) wurde für die Sprache %3 erstellt, jedoch ist das Plugin, welches diese Sprache unterstützt, derzeit nicht geladen. - + Invalid regular expression pattern: %1 Ungültiges Muster für die regulären Ausdrücke: %1 - - + + Could not open file %1 for reading: %2 Datei %1 kann nicht für Lesezugriffe geöffnet werden: %2 - + Could not open file %1 for writting: %2 Datei %1 kann nicht für Schreibzugriffe geöffnet werden: %2 - + Error while writting to file %1: %2 Fehler beim Schreiben in Datei %1: %2 - + Unsupported scripting language: %1 Nicht unterstützte Skriptsprache: %1 @@ -420,7 +420,7 @@ Tabellen, Indizes, Trigger und Views die in Datenbank %3 kopiert wurden, werden ImportManager - + Imported data to the table '%1' successfully. Die Daten wurden erfolgreich in Tabelle %1 importiert. @@ -438,41 +438,41 @@ Tabellen, Indizes, Trigger und Views die in Datenbank %3 kopiert wurden, werden Es kann keine Transaktion zum Import der Daten gestartet werden: %1 - + Could not commit transaction for imported data: %1 Die Transaktion für die importierten Daten kann nicht 'committet' werden: %1 - + Table '%1' has less columns than there are columns in the data to be imported. Excessive data columns will be ignored. Die Tabelle %1 hat weniger Spalten als die zu importierenden Daten liefern. Überschüssige Spalten werden daher ignoriert. - + Table '%1' has more columns than there are columns in the data to be imported. Some columns in the table will be left empty. Die Tabelle %1 hat mehr Spalten als die zu importierenden Daten liefern. Einige Tabellenspalten werden deshalb leer bleiben. - + Could not create table to import to: %1 Die Tabelle, in die importiert werden soll, kann nicht erstellt werden: %1 - - - + + + Error while importing data: %1 Fehler beim Import der Daten: %1 - - + + Interrupted. import process status update Abgebrochen. - + Could not import data row number %1. The row was ignored. Problem details: %2 Datenzeile %1 konnte nicht importiert werden. Die Zeile wurde ignoriert. Problembeschreibung: %2 @@ -839,9 +839,14 @@ Problembeschreibung: %2 SQLite %1 unterstützt keine current date' oder 'time' Klauseln in Ausdrücken. - + + SQLite %1 does not support row value clauses in expressions. + + + - + + SQLite %1 does not support '%2' clause in expressions. SQLite %1 unterstützt keine '%2' Klausel Ausdrücken. @@ -859,13 +864,13 @@ Problembeschreibung: %2 - + Parser stack overflow Stacküberlauf bei Verarbeitung - + Syntax error Syntaxfehler @@ -920,17 +925,17 @@ Problembeschreibung: %2 Der Implementationscode darf nicht leer sein. - + Could not resolve data source for column: %1 Die Datenquelle für Spalte %1 kann nicht aufgelöst werden. - + Could not resolve table for column '%1'. - + Could not initialize configuration file. Any configuration changes and queries history will be lost after application restart. Tried to initialize the file at following localizations: %1. Ich hoffe, dass ich "to initialize" hier richtig mit "erstellt" übersetzt habe. Die Konfigurationsdatei kann nicht erstellt werden. Alle Änderungen an der Konfiguration sowie die Abfragehistorie sind nach einem Programmneustart verloren. Es wurde versucht die Konfigurationsdatei in folgendem Verzeichnis zu erstellen: %1 @@ -1034,29 +1039,29 @@ The view will remain as it is. QueryExecutor - + Execution interrupted. Ausführung abgebrochen. - + Database is not open. Die Datenbank ist nicht geöffnet. - + Only one query can be executed simultaneously. Es kann nur eine Abfrage gleichzeitig ausgeführt werden. - - + + An error occured while executing the count(*) query, thus data paging will be disabled. Error details from the database: %1 Hier muss ggf. noch das 'data paging' korrekt übersetzt werden. Beim Ausführen der count(*) Abfrage ist ein Fehler aufgetreten, daher wird das data paging abgeschaltet. Problemdetails der Datenbank: %1 - + SQLiteStudio was unable to extract metadata from the query. Results won't be editable. SQLiteStudio konnte keine Metadaten aus der Abfrage extrahieren. Die Ergebnismenge kann daher nicht editiert werden. diff --git a/SQLiteStudio3/coreSQLiteStudio/translations/coreSQLiteStudio_es.ts b/SQLiteStudio3/coreSQLiteStudio/translations/coreSQLiteStudio_es.ts index 6cab7b8..007c39b 100644 --- a/SQLiteStudio3/coreSQLiteStudio/translations/coreSQLiteStudio_es.ts +++ b/SQLiteStudio3/coreSQLiteStudio/translations/coreSQLiteStudio_es.ts @@ -1,6 +1,6 @@ - + AbstractDb @@ -26,37 +26,37 @@ ChainExecutor - + The database for executing queries was not defined. chain executor - + The database for executing queries was not open. chain executor - + Could not disable foreign keys in the database. Details: %1 chain executor - + Could not start a database transaction. Details: %1 chain executor - + Interrupted chain executor - + Could not commit a database transaction. Details: %1 chain executor @@ -243,17 +243,17 @@ Tables, indexes, triggers and views copied to database %3 will remain. DbVersionConverter - + Target file exists, but could not be overwritten. - + Could not find proper database plugin to create target database. - + Error while converting database: %1 @@ -341,23 +341,23 @@ Tables, indexes, triggers and views copied to database %3 will remain. - - + + Could not parse %1 in order to export it. It will be excluded from the export output. - + Error while reading data to export from table %1: %2 - + Error while counting data to export from table %1: %2 - + Error while counting data column width to export from table %1: %2 @@ -365,43 +365,43 @@ Tables, indexes, triggers and views copied to database %3 will remain. FunctionManagerImpl - + Invalid number of arguments to function '%1'. Expected %2, but got %3. - + No such function registered in SQLiteStudio: %1(%2) - + Function %1(%2) was registered with language %3, but the plugin supporting that language is not currently loaded. - + Invalid regular expression pattern: %1 - - + + Could not open file %1 for reading: %2 - + Could not open file %1 for writting: %2 - + Error while writting to file %1: %2 - + Unsupported scripting language: %1 @@ -417,7 +417,7 @@ Tables, indexes, triggers and views copied to database %3 will remain. ImportManager - + Imported data to the table '%1' successfully. @@ -435,41 +435,41 @@ Tables, indexes, triggers and views copied to database %3 will remain. - + Could not commit transaction for imported data: %1 - + Table '%1' has less columns than there are columns in the data to be imported. Excessive data columns will be ignored. - + Table '%1' has more columns than there are columns in the data to be imported. Some columns in the table will be left empty. - + Could not create table to import to: %1 - - - + + + Error while importing data: %1 - - + + Interrupted. import process status update - + Could not import data row number %1. The row was ignored. Problem details: %2 @@ -833,9 +833,14 @@ Error details: %2 - + + SQLite %1 does not support row value clauses in expressions. + + + - + + SQLite %1 does not support '%2' clause in expressions. @@ -852,13 +857,13 @@ Error details: %2 - + Parser stack overflow - + Syntax error @@ -913,17 +918,17 @@ Error details: %2 - + Could not resolve data source for column: %1 - + Could not resolve table for column '%1'. - + Could not initialize configuration file. Any configuration changes and queries history will be lost after application restart. Tried to initialize the file at following localizations: %1. @@ -1026,28 +1031,28 @@ The view will remain as it is. QueryExecutor - + Execution interrupted. - + Database is not open. - + Only one query can be executed simultaneously. - - + + An error occured while executing the count(*) query, thus data paging will be disabled. Error details from the database: %1 - + SQLiteStudio was unable to extract metadata from the query. Results won't be editable. diff --git a/SQLiteStudio3/coreSQLiteStudio/translations/coreSQLiteStudio_fr.qm b/SQLiteStudio3/coreSQLiteStudio/translations/coreSQLiteStudio_fr.qm index 668a42a..fccc28a 100644 Binary files a/SQLiteStudio3/coreSQLiteStudio/translations/coreSQLiteStudio_fr.qm and b/SQLiteStudio3/coreSQLiteStudio/translations/coreSQLiteStudio_fr.qm differ diff --git a/SQLiteStudio3/coreSQLiteStudio/translations/coreSQLiteStudio_fr.ts b/SQLiteStudio3/coreSQLiteStudio/translations/coreSQLiteStudio_fr.ts index 6f86594..bac1096 100644 --- a/SQLiteStudio3/coreSQLiteStudio/translations/coreSQLiteStudio_fr.ts +++ b/SQLiteStudio3/coreSQLiteStudio/translations/coreSQLiteStudio_fr.ts @@ -7,12 +7,12 @@ Cannot execute query on closed database. - Impossible d’exécuter la requête sur une base de données fermée. + Impossible d’exécuter la requête sur une base de données fermée. Error attaching database %1: %2 - Erreur base de données attachée %1:%2 + Erreur base de données attachée %1 : %2 @@ -26,34 +26,40 @@ ChainExecutor - + The database for executing queries was not defined. chain executor - La base de données pour exécuter des requêtes n’était pas définie. + La base de données pour exécuter des requêtes n’était pas définie. - + The database for executing queries was not open. chain executor - La base de données pour exécuter des requêtes n’est pas ouverte. + La base de données pour exécuter des requêtes n’est pas ouverte. - + + Could not disable foreign keys in the database. Details: %1 + chain executor + + + + Could not start a database transaction. Details: %1 chain executor - Impossible d’initialiser une transaction de la base de données:%1 + Impossible d’initialiser une transaction de la base de données : %1 - + Interrupted chain executor Interruption - + Could not commit a database transaction. Details: %1 chain executor - Impossible d’enregistrer la transaction de la base de données:%1 + Impossible d’enregistrer la transaction de la base de données : %1 @@ -76,7 +82,7 @@ New index name - Nouveau nom d’index + Nouveau nom d’index @@ -116,7 +122,7 @@ Error message - Message d’erreur + Message d’erreur @@ -126,7 +132,7 @@ Any word - N’importe quel mot + N’importe quel mot @@ -144,33 +150,33 @@ Could not add database %1: %2 - Impossible d’ajouter une base de données %1: %2 + Impossible d’ajouter une base de données %1 : %2 Database %1 could not be updated, because of an error: %2 - La base de données %1 ne peut ëtre mise à jour à cause de l’erreur: %2 + La base de données %1 ne peut ëtre mise à jour à cause de l’erreur : %2 - - + + Database file doesn't exist. - Le fichier de la base de données n’existe pas. + Le fichier de la base de données n’existe pas. - - - + + + No supporting plugin loaded. Aucun plugin supporté chargé. - + Database could not be initialized. La base de données ne peut être initialisée. - + No suitable database driver plugin found. Aucun pilote de base de données approprié trouvé. @@ -181,12 +187,12 @@ Error while creating table in target database: %1 - Erreur lors de la creation de la table de la base de données: %1 + Erreur lors de la creation de la table de la base de données : %1 Could not parse table. - Impossible d’analyser la table. + Impossible d’analyser la table. @@ -196,54 +202,61 @@ Error while copying data for table %1: %2 - Erreur lors de la copie des données vers la table %1: %2 + Erreur lors de la copie des données vers la table %1 : %2 Error while copying data to table %1: %2 - Erreur lors de la copie des données de la table %1: %2 + Erreur lors de la copie des données de la table %1 : %2 Error while dropping source view %1: %2 Tables, indexes, triggers and views copied to database %3 will remain. - Erreur à la création de la vue %1: %2 + Erreur à la création de la vue %1 : %2 Tables, index, déclencheurs et vues copiés de la base de données %3 seront maintenus. Error while creating view in target database: %1 - Erreur lors de la création de la vue de la base de données:%1 + Erreur lors de la création de la vue de la base de données : %1 Error while creating index in target database: %1 - Erreur lors de la création de l’index de la base de données:%1 + Erreur lors de la création de l’index de la base de données : %1 Error while creating trigger in target database: %1 - Erreur lors de la création du déclencheur de la base de données:%1 + Erreur lors de la création du déclencheur de la base de données : %1 + + + + + + Could not parse object '%1' in order to move or copy it. + DbVersionConverter - + Target file exists, but could not be overwritten. Le fichier cible existe, mais ne peut être remplacé. - + Could not find proper database plugin to create target database. Impossible de trouver le plugin correct pour créer la base de données cible. - + Error while converting database: %1 - Erreur lors de la conversion de la base de données: %1 + Erreur lors de la conversion de la base de données : %1 @@ -264,7 +277,7 @@ Tables, index, déclencheurs et vues copiés de la base de données %3 seront ma Date of execution ddl history header - Date d’exécution + Date d’exécution @@ -278,22 +291,22 @@ Tables, index, déclencheurs et vues copiés de la base de données %3 seront ma Export plugin %1 doesn't support exporing query results. - Plugin d’export %1 ne supporte pas l’exportation de la requête. + Plugin d’export %1 ne supporte pas l’exportation de la requête. Export plugin %1 doesn't support exporing tables. - Plugin d’export %1 ne supporte pas l’exportation de la table. + Plugin d’export %1 ne supporte pas l’exportation de la table. Export plugin %1 doesn't support exporing databases. - Plugin d’export %1 ne supporte pas l’exportation de la base de données. + Plugin d’export %1 ne supporte pas l’exportation de la base de données. Export format '%1' is not supported. Supported formats are: %2. - Format d’export « %1 » n’est pas supporté. Les formats supportés sont: %2. + Format d’export « %1 » n’est pas supporté. Les formats supportés sont : %2. @@ -303,7 +316,7 @@ Tables, index, déclencheurs et vues copiés de la base de données %3 seront ma Export to the file '%1' was successful. - Export vers le fichier ’%1’ avec succès. + Export vers le fichier « %1 » avec succès. @@ -313,85 +326,85 @@ Tables, index, déclencheurs et vues copiés de la base de données %3 seront ma Could not export to file %1. File cannot be open for writting. - Impossible d’exporter vers le fichier %1. Le fichier ne peut être ouvert en écriture. + Impossible d’exporter vers le fichier %1. Le fichier ne peut être ouvert en écriture. ExportWorker - + Error while exporting query results: %1 - Erreur lors de l’exportation des résultats de la requête:%1 + Erreur lors de l’exportation des résultats de la requête : %1 - + Error while counting data column width to export from query results: %1 - Erreur lors de la totalisation des données de colonne issu de la requête: %1 + Erreur lors de la totalisation des données de colonne issu de la requête : %1 - - + + Could not parse %1 in order to export it. It will be excluded from the export output. - Impossible d’analyser %1 afin de l’exporter. Celle-ci sera excluse de l’exportation. + Impossible d’analyser %1 afin de l’exporter. Celle-ci sera excluse de l’exportation. - + Error while reading data to export from table %1: %2 - Erreur lors de la lecture des données à exporter de la table %1: %2 + Erreur lors de la lecture des données à exporter de la table %1 : %2 - + Error while counting data to export from table %1: %2 - Erreur lors du comptage des données à exporter de la table %1: %2 + Erreur lors du comptage des données à exporter de la table %1 : %2 - + Error while counting data column width to export from table %1: %2 - Erreur lors de la totalisation des données à exporter de la table %1: %2 + Erreur lors de la totalisation des données à exporter de la table %1 : %2 FunctionManagerImpl - + Invalid number of arguments to function '%1'. Expected %2, but got %3. - Nombre de paramètres invalide de la fonction %1. Attendu %2, obtenu %3. + Nombre de paramètres invalide de la fonction « %1 ». Attendu %2, obtenu %3. - + No such function registered in SQLiteStudio: %1(%2) - Fonction inconnue avec SQLiteStudio: %1(%2) + Fonction inconnue avec SQLiteStudio : %1(%2) - + Function %1(%2) was registered with language %3, but the plugin supporting that language is not currently loaded. - La fonction %1(%2) est référencée avec le langage %3, mais le plugin supportant ce langage n’est actuellement pas chargé. + La fonction %1(%2) est référencée avec le langage %3, mais le plugin supportant ce langage n’est actuellement pas chargé. - + Invalid regular expression pattern: %1 - Expression invalide: %1 + Expression invalide : %1 - - + + Could not open file %1 for reading: %2 - Impossible d’ouvrir en lecture le ficher %1:%2 + Impossible d’ouvrir en lecture le ficher %1 : %2 - + Could not open file %1 for writting: %2 - Impossible d’ouvrir en écriture le ficher %1:%2 + Impossible d’ouvrir en écriture le ficher %1 : %2 - + Error while writting to file %1: %2 - Erreur lors de l’écriture du fichier %1:%2 + Erreur lors de l’écriture du fichier %1 : %2 - + Unsupported scripting language: %1 - Langage script non supporté: %1 + Langage script non supporté : %1 @@ -399,15 +412,15 @@ Tables, index, déclencheurs et vues copiés de la base de données %3 seront ma Could not initialize text codec for exporting. Using default codec: %1 - Impossible d’initialiser le paramètre texte por l’export. Utulisation du paramètre par défaut: %1 + Impossible d’initialiser le paramètre texte por l’export. Utulisation du paramètre par défaut : %1 ImportManager - + Imported data to the table '%1' successfully. - Importation des données de la table « %1 » réussie. + Importation des données de la table « %1 » réussie. @@ -415,49 +428,49 @@ Tables, index, déclencheurs et vues copiés de la base de données %3 seront ma No columns provided by the import plugin. - Aucune colonne fournie par le plugin d’importation. + Aucune colonne fournie par le plugin d’importation. Could not start transaction in order to import a data: %1 - Impossible d’initialiser la transaction d’import de données: %1 + Impossible d’initialiser la transaction d’import de données : %1 - + Could not commit transaction for imported data: %1 - Impossible d’enregistrer la transaction d’import de données: %1 + Impossible d’enregistrer la transaction d’import de données : %1 - + Table '%1' has less columns than there are columns in the data to be imported. Excessive data columns will be ignored. - La table « %1 » a moins de colonnes que de données à importer. Les colonnes supplèmentaires seront ignorées. + La table « %1 » a moins de colonnes que de données à importer. Les colonnes supplèmentaires seront ignorées. - + Table '%1' has more columns than there are columns in the data to be imported. Some columns in the table will be left empty. - La table « %1 » a plus de colonnes que de colonnes de données à importer. Certaines colonnes de la table seront vides. + La table « %1 » a plus de colonnes que de colonnes de données à importer. Certaines colonnes de la table seront vides. - + Could not create table to import to: %1 - Impossible de créer la table d’import: %1 + Impossible de créer la table d’import : %1 - - - + + + Error while importing data: %1 - Erreur lors de l’import des données: %1 + Erreur lors de l’import des données : %1 - - + + Interrupted. import process status update Transaction interrompue. - + Could not import data row number %1. The row was ignored. Problem details: %2 @@ -472,12 +485,12 @@ Tables, index, déclencheurs et vues copiés de la base de données %3 seront ma Cannot load plugin %1, because its dependency was not loaded: %2. - Chargement impossible du plugin %1, les dépendances n’ont pa été chargées: %2. + Chargement impossible du plugin %1, les dépendances n’ont pa été chargées : %2. Cannot load plugin %1. Error details: %2 - Chargement impossible du plugin %1, Détails de l’erreur: %2 + Chargement impossible du plugin %1, Détails de l’erreur : %2 @@ -485,16 +498,16 @@ Tables, index, déclencheurs et vues copiés de la base de données %3 seront ma Chargement impossible du plugin %1 (erreur à initialisation du plugin). - + min: %1 plugin dependency version - min %1 + min : %1 - + max: %1 plugin dependency version - max %1 + max : %1 @@ -511,7 +524,7 @@ Tables, index, déclencheurs et vues copiés de la base de données %3 seront ma Constant value: - Valeur constante: + Valeur constante : @@ -553,7 +566,7 @@ Tables, index, déclencheurs et vues copiés de la base de données %3 seront ma Method of using words - Méthode d’utilisation des mots + Méthode d’utilisation des mots @@ -571,7 +584,7 @@ Tables, index, déclencheurs et vues copiés de la base de données %3 seront ma Table '%1' populated successfully. - Table « %1 » remplie avec succès. + Table « %1 » remplie avec succès. @@ -628,7 +641,7 @@ Tables, index, déclencheurs et vues copiés de la base de données %3 seront ma Use characters from common sets: - Utilisez des caractères de la table standard: + Utilisez des caractères de la table standard : @@ -668,7 +681,7 @@ Tables, index, déclencheurs et vues copiés de la base de données %3 seront ma Includes all above and all others. - Inclus ci dessus et tous les autres. + Inclus ci-dessus et tous les autres. @@ -678,7 +691,7 @@ Tables, index, déclencheurs et vues copiés de la base de données %3 seront ma Use characters from my custom set: - Utilisez les catactères de ma table personalisée: + Utilisez les catactères de ma table personalisée : @@ -704,7 +717,7 @@ Tables, index, déclencheurs et vues copiés de la base de données %3 seront ma Initialization code (optional) - Code d’initialisation (optionel) + Code d’initialisation (optionel) @@ -735,12 +748,12 @@ Tables, index, déclencheurs et vues copiés de la base de données %3 seront ma Start value: - Valeur de départ: + Valeur de départ : Step: - Incrément: + Incrément : @@ -748,17 +761,17 @@ Tables, index, déclencheurs et vues copiés de la base de données %3 seront ma Could not start transaction in order to perform table populating. Error details: %1 - Impossible d’initialiser la transaction pour remplir la table.Détails de l’erreur %1 + Impossible d’initialiser la transaction pour remplir la table.Détails de l’erreur %1 Error while populating table: %1 - Erreur lors du remplissage de la table: %1 + Erreur lors du remplissage de la table : %1 Could not commit transaction after table populating. Error details: %1 - Impossible d’enregistrer la transaction après le remplissage de la table. Erreur %1 + Impossible d’enregistrer la transaction après le remplissage de la table. Erreur %1 @@ -767,7 +780,7 @@ Tables, index, déclencheurs et vues copiés de la base de données %3 seront ma Could not open database: %1 - Impossible d’ouvrir la base de données: %1 + Impossible d’ouvrir la base de données : %1 @@ -778,7 +791,7 @@ Tables, index, déclencheurs et vues copiés de la base de données %3 seront ma Could not close database: %1 - Impossible de clore la base de bonnées: %1 + Impossible de clore la base de bonnées : %1 @@ -789,18 +802,18 @@ Tables, index, déclencheurs et vues copiés de la base de données %3 seront ma SQLite %1 does not support '%2' statement. - SQLite %1 ne supporte pas l’instruction « %2 ». + SQLite %1 ne supporte pas l’instruction « %2 ». SQLite %1 does not support '%2' statement, but the regular table can be created instead if you proceed. - SQLite %1 ne supporte pas l’instruction « %2 », mais la table normale peut être créée à la place si vous confirmez. + SQLite %1 ne supporte pas l’instruction « %2 », mais la table normale peut être créée à la place si vous confirmez. Could not parse statement: %1 Error details: %2 - Impossible d’analyser l’instruction: %1 + Impossible d’analyser l’instruction : %1 Détails erreur: %2 @@ -809,29 +822,34 @@ Détails erreur: %2 SQLite %1 does not support the '%2' clause. Cannot convert '%3' statement with that clause. - SQLite %1 ne supporte pas la clause « %2 ». Impossible de convertir l’instruction « %3 » avec cette clause. + SQLite %1 ne supporte pas la clause « %2 ». Impossible de convertir l’instruction « %3 » avec cette clause. SQLite %1 does not support the '%2' clause in the '%3' statement. - SQLite %1 ne supporte pas la clause « %2 » de l’instruction « %3 ». + SQLite %1 ne supporte pas la clause « %2 » de l’instruction « %3 ». SQLite %1 does not support current date or time clauses in expressions. - SQLite %1 ne supporte pas la clause date ou l’heure actuelle dans l’expression. + SQLite %1 ne supporte pas la clause date ou l’heure actuelle dans l’expression. + + + + SQLite %1 does not support row value clauses in expressions. + - - + + SQLite %1 does not support '%2' clause in expressions. - SQLite %1 ne supporte pas la clause « %2 » dans l’expression. + SQLite %1 ne supporte pas la clause « %2 » dans l’expression. - + Could not attach database %1: %2 - Impossible d’attacher la base de données %1: %2 + Impossible d’attacher la base de données %1 : %2 @@ -841,20 +859,20 @@ Détails erreur: %2 - + Parser stack overflow Analyse dépassement pile - + Syntax error Erreur de syntaxe Could not open dictionary file %1 for reading. - Impossible d’ouvrir en lecture le fichier dictionnaire %1. + Impossible d’ouvrir en lecture le fichier dictionnaire %1. @@ -879,39 +897,44 @@ Détails erreur: %2 Could not find plugin to support scripting language: %1 - Impossible de trouver le plugin supportant le script: %1 + Impossible de trouver le plugin supportant le script : %1 Error while executing populating initial code: %1 - Erreur à l’initialisation du code de remplissage: %1 + Erreur à l’initialisation du code de remplissage : %1 Error while executing populating code: %1 - Erreur à l’exécution du code de remplissage: %1 + Erreur à l’exécution du code de remplissage : %1 Select implementation language. - Sélectionnez l’application langage. + Sélectionnez l’application langage. Implementation code cannot be empty. - L’application de code ne peut être vide. + L’application de code ne peut être vide. - + Could not resolve data source for column: %1 - Impossible de résoudre la source de données pour la colonnes: %1 + Impossible de résoudre la source de données pour la colonnes : %1 + + + + Could not resolve table for column '%1'. + - + Could not initialize configuration file. Any configuration changes and queries history will be lost after application restart. Tried to initialize the file at following localizations: %1. - Impossible d’initialiser le fichier de configuration. + Impossible d’initialiser le fichier de configuration. Aucune modification et les requêtes seront perdues après redémarrage. - Essayez d’initialiser le fichier avec cette localisation: %1. + Essayez d’initialiser le fichier avec cette localisation : %1. @@ -956,39 +979,39 @@ Détails erreur: %2 Peuplement de la table - + Table %1 is referencing table %2, but the foreign key definition will not be updated for new table definition due to problems while parsing DDL of the table %3. - La table %1 référence la table %2, mais la clé étrangère ne pourra être mise à jour pour la nouvelle table à cause de problèmes lors de l’analyse DDL de la table %3. + La table %1 référence la table %2, mais la clef étrangère ne pourra être mise à jour pour la nouvelle table à cause de problèmes lors de l’analyse DDL de la table %3. - + All columns indexed by the index %1 are gone. The index will not be recreated after table modification. - Toutes les colonnes indéxées par l’indexe %1 sont faites. L’indexe ne sera pas recréé après la modification de la table. + Toutes les colonnes indéxées par l’index %1 sont traitées. L’index ne sera pas recréé après la modification de la table. - + There is problem with proper processing trigger %1. It may be not fully updated afterwards and will need your attention. - + Cannot not update trigger %1 according to table %2 modification. - Impossible de mettre à jour le déclencheur%1 selon la modification de la table %2. + Impossible de mettre à jour le déclencheur %1 selon la modification de la table %2. - - - + + + There is a problem with updating an %1 statement within %2 trigger. One of the %1 substatements which might be referring to table %3 cannot be properly modified. Manual update of the trigger may be necessary. - + All columns covered by the trigger %1 are gone. The trigger will not be recreated after table modification. Toutes les colonnes couvertes par le déclencheur %1 sont faites. Le déclencheur ne sera pas recréé après la modification de la table. - + Cannot not update view %1 according to table %2 modifications. The view will remain as it is. Impossible de mettre à jour les modifications de la vue %1 issue de la table %2 @@ -996,51 +1019,51 @@ La vue restera telque. There is a problem with updating an %1 statement within %2 trigger. One of the SELECT substatements which might be referring to table %3 cannot be properly modified. Manual update of the trigger may be necessary. - Il y a un problème à la mise à jour l’instruction %1 avec le déclencheur %2. Une partie de l’instruction SELECT référençant la table %3 ne ppermet pas sa modification. La mise à jour manuelle du déclencheur est nécessaire. + Il y a un problème à la mise à jour l’instruction %1 avec le déclencheur %2. Une partie de l’instruction SELECT référençant la table %3 ne ppermet pas sa modification. La mise à jour manuelle du déclencheur est nécessaire. Could not parse DDL of the view to be created. Details: %1 - Impossible d’analyser le DDL de création de vue. Détails: %1 + Impossible d’analyser le DDL de création de vue. Détails : %1 Parsed query is not CREATE VIEW. It's: %1 - L’expression CREATE VIEW est fausse. C’est: %1 + L’expression CREATE VIEW est fausse. C’est : %1 SQLiteStudio was unable to resolve columns returned by the new view, therefore it won't be able to tell which triggers might fail during the recreation process. - SQLiteStudio ne peut résoudre les colonnes résultant de la nouvelle vue, d’où le déclencheur en cause ne pourra être indiqué pendant le process. + SQLiteStudio ne peut résoudre les colonnes résultant de la nouvelle vue, d’où le déclencheur en cause ne pourra être indiqué pendant le process. QueryExecutor - + Execution interrupted. Exécution interrompue. - + Database is not open. - La base de données n’est ouverte. + La base de données n’est ouverte. - + Only one query can be executed simultaneously. Une seule requête peut être exécutée à la fois. - - + + An error occured while executing the count(*) query, thus data paging will be disabled. Error details from the database: %1 - Une erreur s’est produite à l’exécution de la requête count(*), la recherche des données est arrêtée. Erreur de la base de données:%1 + Une erreur s’est produite à l’exécution de la requête count(*), la recherche des données est arrêtée. Erreur de la base de données : %1 - + SQLiteStudio was unable to extract metadata from the query. Results won't be editable. - SQLiteStudio ne peut extraire des métadonnées d’une requête. Les résultats ne peut être affichés. + SQLiteStudio ne peut extraire des métadonnées d’une requête. Les résultats ne peut être affichés. @@ -1053,7 +1076,7 @@ La vue restera telque. Error from %1: %2 - Erreur de %1: %2 + Erreur de %1 : %2 @@ -1068,7 +1091,7 @@ La vue restera telque. Execution date sql history header - Date d’exécution + Date d’exécution @@ -1094,18 +1117,18 @@ La vue restera telque. An error occurred while checking for updates: %1. - Une erreur est apparue lors du contrôle pour la mise à jour:%1. + Une erreur est apparue lors du contrôle pour la mise à jour : %1. Could not check available updates, because server responded with invalid message format. It is safe to ignore this warning. - Impossible de vérifier la mise à jour, car le serveur a répondu avec un message invalide. Il est possible d’ignorer le warning. + Impossible de vérifier la mise à jour, car le serveur a répondu avec un message invalide. Il est possible d’ignorer le warning. An error occurred while reading updates metadata: %1. - Erreur lors de la lecture de mise des méta données: %1. + Erreur lors de la lecture de mise des méta données : %1. @@ -1120,22 +1143,22 @@ La vue restera telque. There was no updates to download. Updating aborted. - Il n’y a aucune mise à jour à télécharger. Mise à jour abandonnée. + Il n’y a aucune mise à jour à télécharger. Mise à jour abandonnée. Downloading: %1 - Téléchargement: %1 + Téléchargement : %1 Could not determinate file name from update URL: %1. Updating aborted. - Impossible de déterminer le fichier de mise à jour URL: %1.Mise à jour abandonnée. + Impossible de déterminer le fichier de mise à jour URL : %1.Mise à jour abandonnée. Failed to open file '%1' for writting: %2. Updating aborted. - Erreur à l’ouverture du fichier « %1 » pour l’écriture: %2. Mise à jour abandonnée. + Erreur à l’ouverture du fichier « %1 » pour l’écriture : %2. Mise à jour abandonnée. @@ -1145,29 +1168,29 @@ La vue restera telque. Could not copy current application directory into %1 directory. - Impossible de copier le répertoire de l’application courante dans %1. + Impossible de copier le répertoire de l’application courante dans %1. Could not create directory %1. - Impossible de créer le répertoire: %1. + Impossible de créer le répertoire : %1. Could not rename directory %1 to %2. Details: %3 - Impossible de renommer le répertoire %1 en %2. Détails: %3 + Impossible de renommer le répertoire %1 en %2. Détails : %3 Cannot not rename directory %1 to %2. Details: %3 - Impossible de renommer le répertoire %1 en %2.Détails: %3 + Impossible de renommer le répertoire %1 en %2.Détails : %3 Could not move directory %1 to %2 and also failed to restore original directory, so the original SQLiteStudio directory is now located at: %3 - Impossible de déplacer le répertoire %1 vers %2 d’où l’impossibilité de restaurer le répertoire original. SQLiteStudio est maintenant localisé: %3 + Impossible de déplacer le répertoire %1 vers %2 d’où l’impossibilité de restaurer le répertoire original. SQLiteStudio est maintenant localisé : %3 @@ -1177,17 +1200,17 @@ Details: %3 Could not unpack component %1 into %2 directory. - Impossible d’extraire le composant %1 dans le répertoire %2. + Impossible d’extraire le composant %1 dans le répertoire %2. Could not find permissions elevator application to run update as a root. Looked for: %1 - Impossible d’élever les autorisations pour lancer la mise à jour en tantque root. Bloqué: %1 + Impossible d’élever les autorisations pour lancer la mise à jour en tantque root. Bloqué : %1 Could not execute final updating steps as root: %1 - Impossible de finaliser la mis à jour en tant que root: %1 + Impossible de finaliser la mis à jour en tant que root : %1 @@ -1195,7 +1218,7 @@ Details: %3 Could not execute final updating steps as admin: %1 - Impossible de finaliser la mis à jour en tant que admin: %1 + Impossible de finaliser la mis à jour en tant que admin : %1 @@ -1215,17 +1238,17 @@ Details: %3 Could not execute final updating steps as administrator. - Impossible de finaliser la mis à jour en tant qu’administrateur. + Impossible de finaliser la mis à jour en tant qu’administrateur. Could not execute final updating steps as administrator. Updater startup timed out. - Impossible de finaliser la mis à jour en tant qu’administrateur. Délai d’attente de lancement dépassé. + Impossible de finaliser la mis à jour en tant qu’administrateur. Délai d’attente de lancement dépassé. Could not execute final updating steps as administrator. Updater operation timed out. - Impossible de finaliser la mis à jour en tant qu’administrateur. Délai d’attente d’opération dépassé. + Impossible de finaliser la mis à jour en tant qu’administrateur. Délai d’attente d’opération dépassé. @@ -1240,32 +1263,32 @@ Details: %3 Package not in tar.gz format, cannot install: %1 - Installation impossible un paquet n’est pas au format tar.zg: %1 + Installation impossible un paquet n’est pas au format tar.zg : %1 Package %1 cannot be installed, because cannot move it to directory: %2 - Le paquet %1 ne peut être installé, celui-ci ne pouvant déplacé dans le répertoire: %2 + Le paquet %1 ne peut être installé, celui-ci ne pouvant déplacé dans le répertoire : %2 Package %1 cannot be installed, because cannot unpack it: %2 - Le paquet %1 ne peut être installé, celui-ci ne pouvant décompressé: %2 + Le paquet %1 ne peut être installé, celui-ci ne pouvant décompressé : %2 Package not in zip format, cannot install: %1 - Installation impossible, un paquet est manquant: %1 + Installation impossible, un paquet est manquant : %1 Package %1 cannot be installed, because cannot unzip it to directory %2: %3 - Le paquet %1 ne peut être installé, celui-ci ne pouvant décompressé dans le répertoire %2: %3 + Le paquet %1 ne peut être installé, celui-ci ne pouvant décompressé dans le répertoire %2 : %3 Package %1 cannot be installed, because cannot unzip it to directory: %2 - Le paquet %1 ne peut être installé, celui-ci ne pouvant décompressé dans le répertoire: %2 + Le paquet %1 ne peut être installé, celui-ci ne pouvant décompressé dans le répertoire : %2 @@ -1282,13 +1305,13 @@ Details: %3 Error executing update command: %1 Error message: %2 - Erreur d’exécution de la commande de mise à jour: %1 -Message d’erreur: %2 + Erreur d’exécution de la commande de mise à jour : %1 +Message d’erreur : %2 An error occurred while downloading updates: %1. Updating aborted. - Erreur lors du téléchargement de la mise à jour: %1. Mise à jour abandonnée. + Erreur lors du téléchargement de la mise à jour : %1. Mise à jour abandonnée. diff --git a/SQLiteStudio3/coreSQLiteStudio/translations/coreSQLiteStudio_it.ts b/SQLiteStudio3/coreSQLiteStudio/translations/coreSQLiteStudio_it.ts index 9b031de..beed03d 100644 --- a/SQLiteStudio3/coreSQLiteStudio/translations/coreSQLiteStudio_it.ts +++ b/SQLiteStudio3/coreSQLiteStudio/translations/coreSQLiteStudio_it.ts @@ -1,6 +1,6 @@ - + AbstractDb @@ -26,37 +26,37 @@ ChainExecutor - + The database for executing queries was not defined. chain executor - + The database for executing queries was not open. chain executor - + Could not disable foreign keys in the database. Details: %1 chain executor - + Could not start a database transaction. Details: %1 chain executor - + Interrupted chain executor - + Could not commit a database transaction. Details: %1 chain executor @@ -243,17 +243,17 @@ Tables, indexes, triggers and views copied to database %3 will remain. DbVersionConverter - + Target file exists, but could not be overwritten. - + Could not find proper database plugin to create target database. - + Error while converting database: %1 @@ -341,23 +341,23 @@ Tables, indexes, triggers and views copied to database %3 will remain. - - + + Could not parse %1 in order to export it. It will be excluded from the export output. - + Error while reading data to export from table %1: %2 - + Error while counting data to export from table %1: %2 - + Error while counting data column width to export from table %1: %2 @@ -365,43 +365,43 @@ Tables, indexes, triggers and views copied to database %3 will remain. FunctionManagerImpl - + Invalid number of arguments to function '%1'. Expected %2, but got %3. - + No such function registered in SQLiteStudio: %1(%2) - + Function %1(%2) was registered with language %3, but the plugin supporting that language is not currently loaded. - + Invalid regular expression pattern: %1 - - + + Could not open file %1 for reading: %2 - + Could not open file %1 for writting: %2 - + Error while writting to file %1: %2 - + Unsupported scripting language: %1 @@ -417,7 +417,7 @@ Tables, indexes, triggers and views copied to database %3 will remain. ImportManager - + Imported data to the table '%1' successfully. @@ -435,41 +435,41 @@ Tables, indexes, triggers and views copied to database %3 will remain. - + Could not commit transaction for imported data: %1 - + Table '%1' has less columns than there are columns in the data to be imported. Excessive data columns will be ignored. - + Table '%1' has more columns than there are columns in the data to be imported. Some columns in the table will be left empty. - + Could not create table to import to: %1 - - - + + + Error while importing data: %1 - - + + Interrupted. import process status update - + Could not import data row number %1. The row was ignored. Problem details: %2 @@ -833,9 +833,14 @@ Error details: %2 - + + SQLite %1 does not support row value clauses in expressions. + + + - + + SQLite %1 does not support '%2' clause in expressions. @@ -852,13 +857,13 @@ Error details: %2 - + Parser stack overflow - + Syntax error @@ -913,17 +918,17 @@ Error details: %2 - + Could not resolve data source for column: %1 - + Could not resolve table for column '%1'. - + Could not initialize configuration file. Any configuration changes and queries history will be lost after application restart. Tried to initialize the file at following localizations: %1. @@ -1026,28 +1031,28 @@ The view will remain as it is. QueryExecutor - + Execution interrupted. - + Database is not open. - + Only one query can be executed simultaneously. - - + + An error occured while executing the count(*) query, thus data paging will be disabled. Error details from the database: %1 - + SQLiteStudio was unable to extract metadata from the query. Results won't be editable. diff --git a/SQLiteStudio3/coreSQLiteStudio/translations/coreSQLiteStudio_pl.qm b/SQLiteStudio3/coreSQLiteStudio/translations/coreSQLiteStudio_pl.qm index 6859097..76565a1 100644 Binary files a/SQLiteStudio3/coreSQLiteStudio/translations/coreSQLiteStudio_pl.qm and b/SQLiteStudio3/coreSQLiteStudio/translations/coreSQLiteStudio_pl.qm differ diff --git a/SQLiteStudio3/coreSQLiteStudio/translations/coreSQLiteStudio_pl.ts b/SQLiteStudio3/coreSQLiteStudio/translations/coreSQLiteStudio_pl.ts index c3e000c..843aebe 100644 --- a/SQLiteStudio3/coreSQLiteStudio/translations/coreSQLiteStudio_pl.ts +++ b/SQLiteStudio3/coreSQLiteStudio/translations/coreSQLiteStudio_pl.ts @@ -1,6 +1,6 @@ - + AbstractDb @@ -26,37 +26,37 @@ ChainExecutor - + The database for executing queries was not defined. chain executor Nie zdefiniowano bazy danych do wykonywania zapytań. - + The database for executing queries was not open. chain executor Baza danych do wykonywania zapytań nie jest otwarta. - + Could not disable foreign keys in the database. Details: %1 chain executor Nie udało się wyłączyć kluczy obcych w bazie. Szczegóły: %1 - + Could not start a database transaction. Details: %1 chain executor Nie udało się rozpocząć transakcji bazy danych. Szczegóły: %1 - + Interrupted chain executor Przerwane - + Could not commit a database transaction. Details: %1 chain executor Nie udało się zatwierdzić transakcji bazy danych. Szczegóły: %1 @@ -244,17 +244,17 @@ Tabele, indeksy, wyzwalacze i widoki skopiowane do bazy danych %3 pozostaną na DbVersionConverter - + Target file exists, but could not be overwritten. Plik docelowy istnieje, ale nie może być nadpisany. - + Could not find proper database plugin to create target database. Nie znaleziono odpowiedniej wtyczki bazy danych, aby utworzyć docelową bazę danych. - + Error while converting database: %1 Błąd podczas konwersji bazy danych: %1 @@ -350,23 +350,23 @@ Tabele, indeksy, wyzwalacze i widoki skopiowane do bazy danych %3 pozostaną na Błąd podczas liczenia szerokości kolumn danych do eksportu wyników zapytania: %1 - - + + Could not parse %1 in order to export it. It will be excluded from the export output. Nie udało się przeanalizować %1 w celu wyeksportowania. Element ten zostanie pominięty w wynikach eksportu. - + Error while reading data to export from table %1: %2 Błąd podczas odczytu danych do eksportu z tabeli %1: %2 - + Error while counting data to export from table %1: %2 Błąd podczas liczenia danych do eksportu z tabeli %1: %2 - + Error while counting data column width to export from table %1: %2 Błąd podczas obliczania szerokości kolumn danych do eksportu z tabeli %1: %2 @@ -374,43 +374,43 @@ Tabele, indeksy, wyzwalacze i widoki skopiowane do bazy danych %3 pozostaną na FunctionManagerImpl - + Invalid number of arguments to function '%1'. Expected %2, but got %3. Niepoprawna liczba argumentów do funkcji '%1'. Oczekiwano %2, a jest %3. - + No such function registered in SQLiteStudio: %1(%2) Nie znaleziono funkcji zarejestrowanej w SQLiteStudio: %1 (%2) - + Function %1(%2) was registered with language %3, but the plugin supporting that language is not currently loaded. Funkcja %1 (%2) została zarejestrowana dla języka %3, ale wtyczka obsługująca ten język nie jest aktualnie załadowana. - + Invalid regular expression pattern: %1 Niepoprawne wyrażenie regularne: %1 - - + + Could not open file %1 for reading: %2 Nie udało się otworzyć pliku %1 do odczytu: %2 - + Could not open file %1 for writting: %2 Nie udało się otworzyć pliku %2 do zapisu: %2 - + Error while writting to file %1: %2 Błąd podczas zapisu do pliku %1: %2 - + Unsupported scripting language: %1 Nieobsługiwany język skryptowy: %1 @@ -426,7 +426,7 @@ Tabele, indeksy, wyzwalacze i widoki skopiowane do bazy danych %3 pozostaną na ImportManager - + Imported data to the table '%1' successfully. Pomyślnie zaimportowano dane do tabeli '%1'. @@ -444,41 +444,41 @@ Tabele, indeksy, wyzwalacze i widoki skopiowane do bazy danych %3 pozostaną na Nie udało się wystartować transakcji w celu zaimportowania danych: %1 - + Could not commit transaction for imported data: %1 Nie udało się zatwierdzić transakcji w celu zaimportowania danych: %1 - + Table '%1' has less columns than there are columns in the data to be imported. Excessive data columns will be ignored. Tabela '%1' ma mniej kolumn, niż jest kolumn w danych do importu. Nadmiarowe kolumny zostaną zignorowane. - + Table '%1' has more columns than there are columns in the data to be imported. Some columns in the table will be left empty. Tabela '%1' ma więcej kolumn, niż jest kolumn w danych do importu. Część kolumn w tabeli będzie pozostawiona pusta. - + Could not create table to import to: %1 Nie udało się stworzyć tabeli do zaimportowania: %1 - - - + + + Error while importing data: %1 Błąd podczas importowania danych: %1 - - + + Interrupted. import process status update Przerwano. - + Could not import data row number %1. The row was ignored. Problem details: %2 Nie udało się zaimportować wiersza danych numer %1. Wiersz ten został zignorowany. Szczegóły problemu: %2 @@ -830,9 +830,14 @@ Szczegóły błędu: %2 SQLite %1 nie obsługuje aktualnej daty lub klauzul czasowu w wyrażeniach. - + + SQLite %1 does not support row value clauses in expressions. + SQLite %1 nie obsługuje klauzuli wartości wierszowej w wyrażeniach. + + - + + SQLite %1 does not support '%2' clause in expressions. SQLite %1 nie obsługuje klauzuli '%2' w wyrażeniach. @@ -849,13 +854,13 @@ Szczegóły błędu: %2 - + Parser stack overflow Przeciążenie stosu analizatora. - + Syntax error Błąd składni @@ -910,17 +915,17 @@ Szczegóły błędu: %2 Kod implementacji nie może być pusty. - + Could not resolve data source for column: %1 Nie znaleziono źródła danych dla kolumny: %1 - + Could not resolve table for column '%1'. Nie można ustalić tabeli lub kolumny '%1'. - + Could not initialize configuration file. Any configuration changes and queries history will be lost after application restart. Tried to initialize the file at following localizations: %1. Nie udało się zainicjalizować pliku konfiguracyjnego. Jakiekolwiek zmiany w konfiguracji i historia zapytań będą utracone po zrestartowaniu aplikacji. Próbowano zainicjalizować plik konfiguracyjny w następujących lokalizacjach: %1. @@ -1052,28 +1057,28 @@ Widok pozostanie nienaruszony. QueryExecutor - + Execution interrupted. Wykonywanie przerwane. - + Database is not open. Baza danych nie jest otwarta. - + Only one query can be executed simultaneously. Tylko jedno zapytanie może być wykonywane w danym momencie. - - + + An error occured while executing the count(*) query, thus data paging will be disabled. Error details from the database: %1 Wystąpił błąd podczas wykonywania zapytania count(*), przez co stronicowanie danych będzie wyłączone. Szczegóły błędy z bazy danych: %1 - + SQLiteStudio was unable to extract metadata from the query. Results won't be editable. SQLiteStudio nie mogło uzyskać metadanych z zapytania. Nie będzie można edytować wyników zapytania. diff --git a/SQLiteStudio3/coreSQLiteStudio/translations/coreSQLiteStudio_pt_BR.qm b/SQLiteStudio3/coreSQLiteStudio/translations/coreSQLiteStudio_pt_BR.qm index c02994c..8d72a0b 100644 Binary files a/SQLiteStudio3/coreSQLiteStudio/translations/coreSQLiteStudio_pt_BR.qm and b/SQLiteStudio3/coreSQLiteStudio/translations/coreSQLiteStudio_pt_BR.qm differ diff --git a/SQLiteStudio3/coreSQLiteStudio/translations/coreSQLiteStudio_pt_BR.ts b/SQLiteStudio3/coreSQLiteStudio/translations/coreSQLiteStudio_pt_BR.ts index 8637f5e..82a5283 100644 --- a/SQLiteStudio3/coreSQLiteStudio/translations/coreSQLiteStudio_pt_BR.ts +++ b/SQLiteStudio3/coreSQLiteStudio/translations/coreSQLiteStudio_pt_BR.ts @@ -1,18 +1,18 @@ - + AbstractDb Cannot execute query on closed database. - + Não é possível executar query em banco de dados fechado. Error attaching database %1: %2 - + @@ -20,46 +20,46 @@ Invalid login or password - + login ou senha inválido ChainExecutor - + The database for executing queries was not defined. chain executor - + Não foi especificado banco de dados para execução das consultas. - + The database for executing queries was not open. chain executor - + O banco de dados para execução das consultas não foi aberto. - + Could not disable foreign keys in the database. Details: %1 chain executor - + Não foi possível desativar as chaves estrangeiras do banco de dados. Detalhes: %1 - + Could not start a database transaction. Details: %1 chain executor - + Não foi possível iniciar a transação do banco de dados. Detalhes: %1 - + Interrupted chain executor - + Interrompido - + Could not commit a database transaction. Details: %1 chain executor - + Não foi possível efetuar commit no banco de dados. Detalhes: %1 @@ -187,29 +187,29 @@ Error while creating table in target database: %1 - + Erro ao criar tabela no banco de dados: %1 Could not parse table. - + Não foi possível analisar a tabela. Database %1 could not be attached to database %2, so the data of table %3 will be copied with SQLiteStudio as a mediator. This method can be slow for huge tables, so please be patient. - + Banco de dados %1 não pôde ser ligado ao banco de dados %2, de modo que os dados da tabela %3 vão ser copiados com o SQLiteStudio como um mediador. Este metodo pode ser lento para grande tabelas, por favor seja paciente. Error while copying data for table %1: %2 - + Erro ao copiar data para tabela %1:%2 Error while copying data to table %1: %2 - + Erro ao copiar data para tabela %1:%2 @@ -243,17 +243,17 @@ Tables, indexes, triggers and views copied to database %3 will remain. DbVersionConverter - + Target file exists, but could not be overwritten. - + Could not find proper database plugin to create target database. - + Error while converting database: %1 @@ -341,23 +341,23 @@ Tables, indexes, triggers and views copied to database %3 will remain. - - + + Could not parse %1 in order to export it. It will be excluded from the export output. - + Error while reading data to export from table %1: %2 - + Error while counting data to export from table %1: %2 - + Error while counting data column width to export from table %1: %2 @@ -365,43 +365,43 @@ Tables, indexes, triggers and views copied to database %3 will remain. FunctionManagerImpl - + Invalid number of arguments to function '%1'. Expected %2, but got %3. - + No such function registered in SQLiteStudio: %1(%2) - + Function %1(%2) was registered with language %3, but the plugin supporting that language is not currently loaded. - + Invalid regular expression pattern: %1 - - + + Could not open file %1 for reading: %2 - + Could not open file %1 for writting: %2 - + Error while writting to file %1: %2 - + Unsupported scripting language: %1 @@ -417,7 +417,7 @@ Tables, indexes, triggers and views copied to database %3 will remain. ImportManager - + Imported data to the table '%1' successfully. @@ -435,41 +435,41 @@ Tables, indexes, triggers and views copied to database %3 will remain. - + Could not commit transaction for imported data: %1 - + Table '%1' has less columns than there are columns in the data to be imported. Excessive data columns will be ignored. - + Table '%1' has more columns than there are columns in the data to be imported. Some columns in the table will be left empty. - + Could not create table to import to: %1 - - - + + + Error while importing data: %1 - - + + Interrupted. import process status update - + Could not import data row number %1. The row was ignored. Problem details: %2 @@ -833,9 +833,14 @@ Error details: %2 - + + SQLite %1 does not support row value clauses in expressions. + + + - + + SQLite %1 does not support '%2' clause in expressions. @@ -852,13 +857,13 @@ Error details: %2 - + Parser stack overflow - + Syntax error @@ -913,17 +918,17 @@ Error details: %2 - + Could not resolve data source for column: %1 - + Could not resolve table for column '%1'. - + Could not initialize configuration file. Any configuration changes and queries history will be lost after application restart. Tried to initialize the file at following localizations: %1. @@ -1026,28 +1031,28 @@ The view will remain as it is. QueryExecutor - + Execution interrupted. - + Database is not open. - + Only one query can be executed simultaneously. - - + + An error occured while executing the count(*) query, thus data paging will be disabled. Error details from the database: %1 - + SQLiteStudio was unable to extract metadata from the query. Results won't be editable. diff --git a/SQLiteStudio3/coreSQLiteStudio/translations/coreSQLiteStudio_ru.qm b/SQLiteStudio3/coreSQLiteStudio/translations/coreSQLiteStudio_ru.qm index 24f5549..c638942 100644 Binary files a/SQLiteStudio3/coreSQLiteStudio/translations/coreSQLiteStudio_ru.qm and b/SQLiteStudio3/coreSQLiteStudio/translations/coreSQLiteStudio_ru.qm differ diff --git a/SQLiteStudio3/coreSQLiteStudio/translations/coreSQLiteStudio_ru.ts b/SQLiteStudio3/coreSQLiteStudio/translations/coreSQLiteStudio_ru.ts index 7e8bb9d..4716a1d 100644 --- a/SQLiteStudio3/coreSQLiteStudio/translations/coreSQLiteStudio_ru.ts +++ b/SQLiteStudio3/coreSQLiteStudio/translations/coreSQLiteStudio_ru.ts @@ -1,6 +1,6 @@ - + AbstractDb @@ -26,37 +26,37 @@ ChainExecutor - + The database for executing queries was not defined. chain executor Не указана база данных для выполнения запросов. - + The database for executing queries was not open. chain executor Не открыта база данных для выполнения запросов. - + Could not disable foreign keys in the database. Details: %1 chain executor - + Невозможно отключить внешние ключи в базе данных. Подробности: %1 - + Could not start a database transaction. Details: %1 chain executor Невозможно начать транзакцию. Подробности: %1 - + Interrupted chain executor Прервано - + Could not commit a database transaction. Details: %1 chain executor Невозможно завершить транзакцию. Подробности: %1 @@ -239,23 +239,23 @@ Tables, indexes, triggers and views copied to database %3 will remain. Could not parse object '%1' in order to move or copy it. - + Невозможно проанализировать объект '%1' для его перемещения либо копирования. DbVersionConverter - + Target file exists, but could not be overwritten. Целевой файл существует, но не может быть перезаписан. - + Could not find proper database plugin to create target database. Невозможно найти подходящий модуль для создания целевой базы данных. - + Error while converting database: %1 Ошибка при конвертации базы данных: %1 @@ -343,23 +343,23 @@ Tables, indexes, triggers and views copied to database %3 will remain. Ошибка при подсчёте ширины столбца данных для экспорта результатов запроса: %1 - - + + Could not parse %1 in order to export it. It will be excluded from the export output. Невозможно проанализировать структуру %1. Данный объект будет исключён при выполнении экспорта. - + Error while reading data to export from table %1: %2 Ошибка при считывании данных для экспорта из таблицы %1: %2 - + Error while counting data to export from table %1: %2 Ошибка при подсчёте количества данных для экспорта из таблицы %1: %2 - + Error while counting data column width to export from table %1: %2 Ошибка при подсчёте ширины столбца данных для экспорта из таблицы %1: %2 @@ -367,43 +367,43 @@ Tables, indexes, triggers and views copied to database %3 will remain. FunctionManagerImpl - + Invalid number of arguments to function '%1'. Expected %2, but got %3. Неверное количество аргументов для функции '%1'. Ожидаемое количество: %2, передано: %3. - + No such function registered in SQLiteStudio: %1(%2) Функция не зарегистрирована в SQLiteStudio: %1(%2) - + Function %1(%2) was registered with language %3, but the plugin supporting that language is not currently loaded. Функция %1(%2) зарегистрирована для языка %3, однако модуль поддержки этого языка на данный момент не загружен. - + Invalid regular expression pattern: %1 Неверный шаблон регулярного выражения: %1 - - + + Could not open file %1 for reading: %2 Невозможно открыть файл %1 для чтения: %2 - + Could not open file %1 for writting: %2 Невозможно открыть файл %1 для записи: %2 - + Error while writting to file %1: %2 Ошибка при записи в файл %1: %2 - + Unsupported scripting language: %1 Неподдерживаемый скриптовый язык: %1 @@ -419,7 +419,7 @@ Tables, indexes, triggers and views copied to database %3 will remain. ImportManager - + Imported data to the table '%1' successfully. Импорт данных в таблицу '%1' выполнен успешно. @@ -437,41 +437,41 @@ Tables, indexes, triggers and views copied to database %3 will remain. Невозможно начать транзакцию для импорта данных: %1 - + Could not commit transaction for imported data: %1 Невозможно завершить транзакцию для импортированных данных: %1 - + Table '%1' has less columns than there are columns in the data to be imported. Excessive data columns will be ignored. В таблице '%1' столбцов меньше, чем в импортируемых данных. Лишние столбцы будут проигнорированы. - + Table '%1' has more columns than there are columns in the data to be imported. Some columns in the table will be left empty. В таблице '%1' столбцов больше, чем в импортируемых данных. Недостающие столбцы будут оставлены пустыми. - + Could not create table to import to: %1 Невозможно создать таблицу для импорта: %1 - - - + + + Error while importing data: %1 Ошибка при импорте данных: %1 - - + + Interrupted. import process status update Прервано. - + Could not import data row number %1. The row was ignored. Problem details: %2 Невозможно импортировать строку данных № %1. Строка пропущена. Подробности проблемы: %2 @@ -835,9 +835,14 @@ Error details: %2 SQLite %1 не поддерживает операторы текущей даты и текущего времени в выражениях. - + + SQLite %1 does not support row value clauses in expressions. + + + - + + SQLite %1 does not support '%2' clause in expressions. SQLite %1 не поддерживает оператор '%2' в выражениях. @@ -854,13 +859,13 @@ Error details: %2 - + Parser stack overflow Переполнение стека анализатора - + Syntax error Синтаксическая ошибка @@ -915,17 +920,17 @@ Error details: %2 Заполняющий код не может быть пустым. - + Could not resolve data source for column: %1 Невозможно определить источник данных для столбца: %1 - + Could not resolve table for column '%1'. - + Невозможно определить таблицу для столбца '%1'. - + Could not initialize configuration file. Any configuration changes and queries history will be lost after application restart. Tried to initialize the file at following localizations: %1. Невозможно инициализировать файл конфигурации. Любые изменения конфигурации и история запросов будут утеряны после перезапуска приложения. Попытки инициализации файла предпринимались в следующих местах: %1. @@ -1033,28 +1038,28 @@ The view will remain as it is. QueryExecutor - + Execution interrupted. Выполнение прервано. - + Database is not open. База данных не открыта. - + Only one query can be executed simultaneously. Одновременно может быть выполнен только один запрос. - - + + An error occured while executing the count(*) query, thus data paging will be disabled. Error details from the database: %1 Возникла ошибка при выполнении запроса count(*), поэтому разбивка данных по страницам отключена. Детали ошибки из базы данных: %1 - + SQLiteStudio was unable to extract metadata from the query. Results won't be editable. SQLiteStudio не удалось извлечь метаданные из запроса. Результаты нельзя будет редактировать. diff --git a/SQLiteStudio3/coreSQLiteStudio/translations/coreSQLiteStudio_sk.ts b/SQLiteStudio3/coreSQLiteStudio/translations/coreSQLiteStudio_sk.ts index 4a617e4..3298d89 100644 --- a/SQLiteStudio3/coreSQLiteStudio/translations/coreSQLiteStudio_sk.ts +++ b/SQLiteStudio3/coreSQLiteStudio/translations/coreSQLiteStudio_sk.ts @@ -1,6 +1,6 @@ - + AbstractDb @@ -26,37 +26,37 @@ ChainExecutor - + The database for executing queries was not defined. chain executor - + The database for executing queries was not open. chain executor - + Could not disable foreign keys in the database. Details: %1 chain executor - + Could not start a database transaction. Details: %1 chain executor - + Interrupted chain executor - + Could not commit a database transaction. Details: %1 chain executor @@ -243,17 +243,17 @@ Tables, indexes, triggers and views copied to database %3 will remain. DbVersionConverter - + Target file exists, but could not be overwritten. Cieľový súbor existuje ale nemôže byť prepísaný. - + Could not find proper database plugin to create target database. Nieje možné nájsť správny databázový plugin pre vytvorenie cieľovej databázy. - + Error while converting database: %1 Vyskytla sa chyba počas konvertovania databázy: %1 @@ -341,23 +341,23 @@ Tables, indexes, triggers and views copied to database %3 will remain. - - + + Could not parse %1 in order to export it. It will be excluded from the export output. - + Error while reading data to export from table %1: %2 - + Error while counting data to export from table %1: %2 - + Error while counting data column width to export from table %1: %2 @@ -365,43 +365,43 @@ Tables, indexes, triggers and views copied to database %3 will remain. FunctionManagerImpl - + Invalid number of arguments to function '%1'. Expected %2, but got %3. - + No such function registered in SQLiteStudio: %1(%2) - + Function %1(%2) was registered with language %3, but the plugin supporting that language is not currently loaded. - + Invalid regular expression pattern: %1 - - + + Could not open file %1 for reading: %2 - + Could not open file %1 for writting: %2 - + Error while writting to file %1: %2 - + Unsupported scripting language: %1 @@ -417,7 +417,7 @@ Tables, indexes, triggers and views copied to database %3 will remain. ImportManager - + Imported data to the table '%1' successfully. @@ -435,41 +435,41 @@ Tables, indexes, triggers and views copied to database %3 will remain. - + Could not commit transaction for imported data: %1 - + Table '%1' has less columns than there are columns in the data to be imported. Excessive data columns will be ignored. - + Table '%1' has more columns than there are columns in the data to be imported. Some columns in the table will be left empty. - + Could not create table to import to: %1 - - - + + + Error while importing data: %1 Vyskytla sa chyba počas importu dát: %1 - - + + Interrupted. import process status update - + Could not import data row number %1. The row was ignored. Problem details: %2 @@ -833,9 +833,14 @@ Error details: %2 - + + SQLite %1 does not support row value clauses in expressions. + + + - + + SQLite %1 does not support '%2' clause in expressions. @@ -852,13 +857,13 @@ Error details: %2 - + Parser stack overflow - + Syntax error Chyba syntaxe @@ -913,17 +918,17 @@ Error details: %2 - + Could not resolve data source for column: %1 - + Could not resolve table for column '%1'. - + Could not initialize configuration file. Any configuration changes and queries history will be lost after application restart. Tried to initialize the file at following localizations: %1. @@ -1026,28 +1031,28 @@ The view will remain as it is. QueryExecutor - + Execution interrupted. - + Database is not open. - + Only one query can be executed simultaneously. - - + + An error occured while executing the count(*) query, thus data paging will be disabled. Error details from the database: %1 Vyskytla sa chyba počas vykonávania dotazu count(*), dôsledkom čoho bolo zablokované stránkovanie. Detail chyby: %1 - + SQLiteStudio was unable to extract metadata from the query. Results won't be editable. diff --git a/SQLiteStudio3/coreSQLiteStudio/translations/coreSQLiteStudio_zh_CN.ts b/SQLiteStudio3/coreSQLiteStudio/translations/coreSQLiteStudio_zh_CN.ts index 3410fa0..b9c43f2 100644 --- a/SQLiteStudio3/coreSQLiteStudio/translations/coreSQLiteStudio_zh_CN.ts +++ b/SQLiteStudio3/coreSQLiteStudio/translations/coreSQLiteStudio_zh_CN.ts @@ -1,6 +1,6 @@ - + AbstractDb @@ -26,37 +26,37 @@ ChainExecutor - + The database for executing queries was not defined. chain executor - + The database for executing queries was not open. chain executor - + Could not disable foreign keys in the database. Details: %1 chain executor - + Could not start a database transaction. Details: %1 chain executor - + Interrupted chain executor - + Could not commit a database transaction. Details: %1 chain executor @@ -243,17 +243,17 @@ Tables, indexes, triggers and views copied to database %3 will remain. DbVersionConverter - + Target file exists, but could not be overwritten. - + Could not find proper database plugin to create target database. - + Error while converting database: %1 @@ -341,23 +341,23 @@ Tables, indexes, triggers and views copied to database %3 will remain. - - + + Could not parse %1 in order to export it. It will be excluded from the export output. - + Error while reading data to export from table %1: %2 - + Error while counting data to export from table %1: %2 - + Error while counting data column width to export from table %1: %2 @@ -365,43 +365,43 @@ Tables, indexes, triggers and views copied to database %3 will remain. FunctionManagerImpl - + Invalid number of arguments to function '%1'. Expected %2, but got %3. - + No such function registered in SQLiteStudio: %1(%2) - + Function %1(%2) was registered with language %3, but the plugin supporting that language is not currently loaded. - + Invalid regular expression pattern: %1 - - + + Could not open file %1 for reading: %2 - + Could not open file %1 for writting: %2 - + Error while writting to file %1: %2 - + Unsupported scripting language: %1 @@ -417,7 +417,7 @@ Tables, indexes, triggers and views copied to database %3 will remain. ImportManager - + Imported data to the table '%1' successfully. @@ -435,41 +435,41 @@ Tables, indexes, triggers and views copied to database %3 will remain. - + Could not commit transaction for imported data: %1 - + Table '%1' has less columns than there are columns in the data to be imported. Excessive data columns will be ignored. - + Table '%1' has more columns than there are columns in the data to be imported. Some columns in the table will be left empty. - + Could not create table to import to: %1 - - - + + + Error while importing data: %1 - - + + Interrupted. import process status update - + Could not import data row number %1. The row was ignored. Problem details: %2 @@ -833,9 +833,14 @@ Error details: %2 - + + SQLite %1 does not support row value clauses in expressions. + + + - + + SQLite %1 does not support '%2' clause in expressions. @@ -852,13 +857,13 @@ Error details: %2 - + Parser stack overflow - + Syntax error @@ -913,17 +918,17 @@ Error details: %2 - + Could not resolve data source for column: %1 - + Could not resolve table for column '%1'. - + Could not initialize configuration file. Any configuration changes and queries history will be lost after application restart. Tried to initialize the file at following localizations: %1. @@ -1026,28 +1031,28 @@ The view will remain as it is. QueryExecutor - + Execution interrupted. - + Database is not open. - + Only one query can be executed simultaneously. - - + + An error occured while executing the count(*) query, thus data paging will be disabled. Error details from the database: %1 - + SQLiteStudio was unable to extract metadata from the query. Results won't be editable. diff --git a/SQLiteStudio3/create_linux_portable.sh b/SQLiteStudio3/create_linux_portable.sh deleted file mode 100644 index 55d4813..0000000 --- a/SQLiteStudio3/create_linux_portable.sh +++ /dev/null @@ -1,156 +0,0 @@ -#!/bin/sh - -printUsage() { - echo "$0 [tgz|dist|dist_full]" -} - -if [ "$#" -lt 2 ] || [ "$#" -gt 3 ]; then - printUsage - exit 1 -fi - -if [ "$#" -eq 3 ] && [ "$3" != "tgz" ] && [ "$3" != "dist" ] && [ "$3" != "dist_plugins" ] && [ "$3" != "dist_full" ]; then - printUsage - exit 1 -fi - -which chrpath >/dev/null -if [ "$?" -ne 0 ]; then - echo "chrpath program missing!" - exit 1 -fi - -qt_paths_bin="${2/qmake/qtpaths}" -$qt_paths_bin -v >/dev/null 2>&1 -if [ "$?" -ne 0 ]; then - echo "qtpaths program missing!" - exit 1 -fi - -cd $1 - -required_modules="libQt5Core.so libQt5Concurrent.so libQt5DBus.so libQt5Gui.so libQt5Network.so libQt5PrintSupport.so libQt5Script.so libQt5Widgets.so libQt5Xml.so \ - libQt5Svg.so" -required_plugins="platforms/libqxcb.so imageformats/libqgif.so imageformats/libqicns.so imageformats/libqico.so imageformats/libqjpeg.so imageformats/libqmng.so \ - imageformats/libqsvg.so imageformats/libqtga.so imageformats/libqtiff.so iconengines/libqsvgicon.so printsupport/libcupsprintersupport.so platformthemes/libqgtk2.so" - -qt_lib_dir=`ldd SQLiteStudio/sqlitestudio | grep libQt5Core | awk '{print $3;}'` -qt_lib_dir=`dirname $qt_lib_dir` -qt_plugins_dir=`$qt_paths_bin --plugin-dir` - -# Create portable dir to store distribution in -rm -rf portable -mkdir portable -cd portable -portable=`pwd` - -# Copy all output from compilation here -cp -R $1/SQLiteStudio . - -# Make lib directory to move all *.so files (sqlitestudio files and Qt files and dependencies) -cd SQLiteStudio - -# Copy SQLite libs -cd $portable/SQLiteStudio -sqlite3_lib=`ldd $1/SQLiteStudio/lib/libcoreSQLiteStudio.so | grep libsqlite | awk '{print $3;}'` -sqlite2_lib=`ldd plugins/libDbSqlite2.so | grep libsqlite | awk '{print $3;}'` -cp $sqlite3_lib lib -cp $sqlite2_lib lib -strip lib/*libsqlite* - -# Copy Qt -cd $portable/SQLiteStudio/lib -for module in $required_modules; do - if [ ! -f $qt_lib_dir/$module ]; then - echo "Required Qt module doesn't exist: $qt_lib_dir/$module" - exit 1 - fi - cp -P $qt_lib_dir/$module* . - - for dep_lib in `ldd $qt_lib_dir/$module | grep $qt_lib_dir | awk '{print $3;}'`; do - cp -Pu $dep_lib* . - done -done - -for lib in `ls *.so`; do - chrpath -r \$ORIGIN/lib $lib >/dev/null -done - -# Now copy Qt plugins -cd $portable/SQLiteStudio -qt_plugin_dirs=() -for plugin in $required_plugins; do - if [ ! -f $qt_plugins_dir/$plugin ]; then - echo "Required Qt plugin doesn't exist: $qt_plugins_dir/$plugin" - exit 1 - fi - parts=(${plugin/\// }) - mkdir ${parts[0]} 2>/dev/null - cp -P $qt_plugins_dir/$plugin ${parts[0]} - - # Update rpath in Qt plugins - cd ${parts[0]} - for lib in `ls *.so`; do - chrpath -r \$ORIGIN/../lib $lib >/dev/null - done - cd .. -done - -cd $portable/SQLiteStudio -chrpath -r \$ORIGIN/lib sqlitestudio >/dev/null -chrpath -r \$ORIGIN/lib sqlitestudiocli >/dev/null - -cd $portable -VERSION=`SQLiteStudio/sqlitestudiocli -v | awk '{print $2}'` - -if [ "$3" == "tgz" ]; then - tar cf sqlitestudio-$VERSION.tar SQLiteStudio - xz -z sqlitestudio-$VERSION.tar -elif [ "$3" == "dist" ] || [ "$3" == "dist_plugins" ] || [ "$3" == "dist_full" ]; then - if [ "$3" == "dist" ] || [ "$3" == "dist_full" ]; then - # Complete - echo "Building complete package: sqlitestudio-$VERSION.tar.xz" - tar cf sqlitestudio-$VERSION.tar SQLiteStudio - xz -z sqlitestudio-$VERSION.tar - - # App - echo "Building incremental update package: sqlitestudio-$VERSION.tar.gz" - cp -R SQLiteStudio app - cd app - if [ "$3" == "dist" ]; then - rm -rf plugins - rm -f lib/libQ* - rm -rf iconengines - rm -rf imageformats - rm -rf platforms - rm -rf platformthemes - rm -rf printsupport - find . -type l -exec rm -f {} \; - fi - rm -f lib/libicu* - rm -f lib/libsqlite.so.0 ;# this is for SQLite 2 - tar cf sqlitestudio-$VERSION.tar * - gzip -9 sqlitestudio-$VERSION.tar - mv sqlitestudio-$VERSION.tar.gz .. - cd .. - rm -rf app - fi - - # Plugins - mkdir plugins - SQLiteStudio/sqlitestudio --list-plugins | while read line - do - PLUGIN=`echo $line | awk '{print $1}'` - PLUGIN_VER=`echo $line | awk '{print $2}'` - if [ -f SQLiteStudio/plugins/lib$PLUGIN.so ]; then - echo "Building plugin package: $PLUGIN-$PLUGIN_VER.tar.gz" - cp SQLiteStudio/plugins/lib$PLUGIN.so plugins/ - tar cf $PLUGIN\-$PLUGIN_VER.tar plugins - gzip -9 $PLUGIN\-$PLUGIN_VER.tar - fi - rm -f plugins/* - done - rm -rf plugins - - echo "Done." -fi diff --git a/SQLiteStudio3/create_macosx_bundle.sh b/SQLiteStudio3/create_macosx_bundle.sh index 51b563a..f5c595b 100755 --- a/SQLiteStudio3/create_macosx_bundle.sh +++ b/SQLiteStudio3/create_macosx_bundle.sh @@ -60,12 +60,27 @@ do install_name_tool -change libguiSQLiteStudio.1.dylib "@rpath/libguiSQLiteStudio.1.dylib" $PLUGIN_FILE done +function replaceInfo() { + echo Replacing Info.plist + cd $1/SQLiteStudio + VERSION=`SQLiteStudio.app/Contents/MacOS/sqlitestudiocli -v | awk '{print $2}'` + YEAR=`date '+%Y'` + + cd SQLiteStudio.app/Contents + sed "s/%VERSION%/$VERSION/g" Info.plist | sed "s/%YEAR%/$YEAR/g" > Info.plist.new + echo "New plist:" + cat Info.plist.new + mv Info.plist.new Info.plist +} + if [ "$3" == "dmg" ]; then $qt_deploy_bin SQLiteStudio.app -dmg + replaceInfo $1 elif [ "$3" == "dist" ] || [ "$3" == "dist_plugins" ] || [ "$3" == "dist_full" ]; then if [ "$3" == "dist" ] || [ "$3" == "dist_full" ]; then $qt_deploy_bin SQLiteStudio.app -dmg -executable=SQLiteStudio.app/Contents/MacOS/SQLiteStudio -always-overwrite -verbose=3 2> /tmp/log.txt + replaceInfo $1 cd $1/SQLiteStudio VERSION=`SQLiteStudio.app/Contents/MacOS/sqlitestudiocli -v | awk '{print $2}'` @@ -88,6 +103,7 @@ elif [ "$3" == "dist" ] || [ "$3" == "dist_plugins" ] || [ "$3" == "dist_full" ] rm -rf app else $qt_deploy_bin SQLiteStudio.app + replaceInfo $1 fi # Plugins @@ -108,5 +124,5 @@ elif [ "$3" == "dist" ] || [ "$3" == "dist_plugins" ] || [ "$3" == "dist_full" ] echo "Done." else $qt_deploy_bin SQLiteStudio.app + replaceInfo $1 fi - diff --git a/SQLiteStudio3/create_win32_portable.bat b/SQLiteStudio3/create_win32_portable.bat deleted file mode 100644 index 6d48245..0000000 --- a/SQLiteStudio3/create_win32_portable.bat +++ /dev/null @@ -1,120 +0,0 @@ -@echo off - -set QT_DIR=C:\Qt\5.6\mingw49_32\bin -set ZIP="c:\Program Files\7-Zip\7z.exe" - -set QMAKE=%QT_DIR%\qmake.exe -set OLDDIR=%CD% - -rem Find Qt -if exist %QMAKE% ( - echo Qt found at %QT_DIR% -) else ( - echo Cannot find Qt - GOTO:EOF -) - -rem Find 7zip -if exist %ZIP% ( - echo 7zip found at %ZIP% -) else ( - echo Cannot find 7zip - GOTO:EOF -) - -cd %OLDDIR% - -rem Clean up -echo Cleaning up... -cd ..\output -rmdir /s /q portable - -rem Create a copy -echo Creating a portable distribution -mkdir portable\SQLiteStudio -xcopy SQLiteStudio portable\SQLiteStudio /s /e /q > nul - -rem Remove .a files from app dir -cd portable\SQLiteStudio -del /q *.a -set PORTABLE=%CD% - -rem Remove .a files from plugins dir -cd plugins -del /q *.a -rem Copy Qt files -cd %QT_DIR% -set QT_LIB_LIST=Qt5Core Qt5Gui Qt5Network Qt5PrintSupport Qt5Script Qt5Svg Qt5Widgets Qt5Xml icudt53 icuin53 icuuc53 libgcc_s_dw2-1 libstdc++-6 libwinpthread-1 -for %%i in (%QT_LIB_LIST%) do ( - copy "%%i.dll" %PORTABLE% > nul -) -copy qt.conf %PORTABLE% > nul - -mkdir %PORTABLE%\iconengines %PORTABLE%\imageformats %PORTABLE%\platforms %PORTABLE%\printsupport -cd %QT_DIR%\..\plugins - -copy iconengines\qsvgicon.dll %PORTABLE%\iconengines > nul -copy platforms\qwindows.dll %PORTABLE%\platforms > nul -copy printsupport\windowsprintersupport.dll %PORTABLE%\printsupport > nul -for %%i in (qdds qgif qicns qico qjpeg qsvg qtga qtiff qwbmp) do ( - copy imageformats\%%i.dll %PORTABLE%\imageformats > nul -) - -rem Copy app-specific deps -cd %OLDDIR%\..\..\lib -copy *.dll %PORTABLE% > nul - -call:getAppVersion -cd %PORTABLE%\.. -%ZIP% a -r sqlitestudio-%APP_VERSION%.zip SQLiteStudio > nul - -rem Incremental package -echo Creating incremental update package -cd %PORTABLE%\.. -mkdir incremental\SQLiteStudio -xcopy SQLiteStudio incremental\SQLiteStudio /s /e /q > nul -cd incremental\SQLiteStudio -del /q Qt5*.dll -del /q icu*.dll -del /q libgcc* libstdc* libwinpthread* -rmdir /s /q iconengines imageformats platforms printsupport plugins - -cd %PORTABLE%\..\incremental -%ZIP% a -r sqlitestudio-%APP_VERSION%.zip SQLiteStudio > nul - -rem Plugin packages -echo Creating plugin updates -cd %PORTABLE%\.. -for /f "delims=" %%p in ('SQLiteStudio\SQLiteStudio.exe --list-plugins') do ( - call:preparePlugin %%p -) - -cd %OLDDIR% -GOTO:EOF - -:preparePlugin - set plugin=%~1 - set plugin_ver=%~2 - if exist SQLiteStudio\plugins\%plugin%.dll ( - echo Creating plugin update: %plugin% - mkdir plugins\%plugin%\SQLiteStudio\plugins - copy SQLiteStudio\plugins\%plugin%.dll plugins\%plugin%\SQLiteStudio\plugins > nul - - cd plugins\%plugin% - %ZIP% a -r ..\%plugin%-%plugin_ver%.zip SQLiteStudio > nul - cd ..\.. - ) -GOTO:EOF - -:getAppVersion - pushd - cd %PORTABLE% - for /f "delims=" %%v in ('sqlitestudiocli --version') do ( - call:getAppVersionFromSecondArgument %%v - ) - popd -GOTO:EOF - -:getAppVersionFromSecondArgument - set APP_VERSION=%~2 -GOTO:EOF diff --git a/SQLiteStudio3/guiSQLiteStudio/constraints/tableforeignkeypanel.cpp b/SQLiteStudio3/guiSQLiteStudio/constraints/tableforeignkeypanel.cpp index 7354997..f8390a1 100644 --- a/SQLiteStudio3/guiSQLiteStudio/constraints/tableforeignkeypanel.cpp +++ b/SQLiteStudio3/guiSQLiteStudio/constraints/tableforeignkeypanel.cpp @@ -393,9 +393,6 @@ void TableForeignKeyPanel::readTables() resolver.setIgnoreSystemObjects(true); QStringList tables = resolver.getTables(); // TODO named db attach not supported - SqliteCreateTable* createTable = dynamic_cast(constraint->parentStatement()); - tables.removeOne(createTable->table); - tables.sort(Qt::CaseInsensitive); ui->fkTableCombo->addItems(tables); diff --git a/SQLiteStudio3/guiSQLiteStudio/datagrid/sqlqueryitem.cpp b/SQLiteStudio3/guiSQLiteStudio/datagrid/sqlqueryitem.cpp index be26d9f..4a04736 100644 --- a/SQLiteStudio3/guiSQLiteStudio/datagrid/sqlqueryitem.cpp +++ b/SQLiteStudio3/guiSQLiteStudio/datagrid/sqlqueryitem.cpp @@ -10,8 +10,8 @@ SqlQueryItem::SqlQueryItem(QObject *parent) : QObject(parent) { - setUncommited(false); - setCommitingError(false); + setUncommitted(false); + setCommittingError(false); setRowId(RowId()); setColumn(nullptr); } @@ -36,36 +36,36 @@ void SqlQueryItem::setRowId(const RowId& rowId) QStandardItem::setData(rowId, DataRole::ROWID); } -bool SqlQueryItem::isUncommited() const +bool SqlQueryItem::isUncommitted() const { - return QStandardItem::data(DataRole::UNCOMMITED).toBool(); + return QStandardItem::data(DataRole::UNCOMMITTED).toBool(); } -void SqlQueryItem::setUncommited(bool uncommited) +void SqlQueryItem::setUncommitted(bool uncommitted) { - QStandardItem::setData(QVariant(uncommited), DataRole::UNCOMMITED); - if (!uncommited) + QStandardItem::setData(QVariant(uncommitted), DataRole::UNCOMMITTED); + if (!uncommitted) { setOldValue(QVariant()); - setCommitingError(false); + setCommittingError(false); } } void SqlQueryItem::rollback() { setValue(getOldValue(), true, true); - setUncommited(false); + setUncommitted(false); setDeletedRow(false); } -bool SqlQueryItem::isCommitingError() const +bool SqlQueryItem::isCommittingError() const { - return QStandardItem::data(DataRole::COMMITING_ERROR).toBool(); + return QStandardItem::data(DataRole::COMMITTING_ERROR).toBool(); } -void SqlQueryItem::setCommitingError(bool isError) +void SqlQueryItem::setCommittingError(bool isError) { - QStandardItem::setData(QVariant(isError), DataRole::COMMITING_ERROR); + QStandardItem::setData(QVariant(isError), DataRole::COMMITTING_ERROR); } bool SqlQueryItem::isNewRow() const @@ -113,7 +113,7 @@ void SqlQueryItem::setValue(const QVariant &value, bool limited, bool loadedFrom // It's modified when: // - original and new value is different (value or NULL status), while it's not loading from DB - // - this item was already marked as uncommited + // - this item was already marked as uncommitted bool modified = ( ( newValue != origValue || @@ -121,7 +121,7 @@ void SqlQueryItem::setValue(const QVariant &value, bool limited, bool loadedFrom ) && !loadedFromDb ) || - isUncommited(); + isUncommitted(); if (modified && !getOldValue().isValid()) setOldValue(origValue); @@ -134,10 +134,10 @@ void SqlQueryItem::setValue(const QVariant &value, bool limited, bool loadedFrom QStandardItem::setData(newValue, DataRole::VALUE); setLimitedValue(limited); - setUncommited(modified); + setUncommitted(modified); // Value for display (in a cell) will always be limited, for performance reasons - QStandardItem::setData("x", DataRole::VALUE_FOR_DISPLAY); // the same trick as with the DataRole::VALUE + setValueForDisplay("x"); // the same trick as with the DataRole::VALUE if (!limited) { int theLimit = SqlQueryModel::getCellDataLengthLimit(); @@ -396,11 +396,15 @@ QVariant SqlQueryItem::data(int role) const QString SqlQueryItem::loadFullData() { SqlQueryModelColumn* col = getColumn(); - if (col->editionForbiddenReason.size() > 0) - { - qWarning() << "Tried to load full cell which is not editable. This should be already handled in Editor class when invoking edition action."; - return tr("This cell is not editable, because: %1").arg(SqlQueryModelColumn::resolveMessage(col->editionForbiddenReason.values().first())); - } + + // Yes, this function won't be called in case of trying to edit the cell - it's handled in the Editor. + // However this function can be called from the FormView, to display full contents of the read-only property. + // I'll keep it for some time just in case. To be removed in future. +// if (col->editionForbiddenReason.size() > 0) +// { +// qWarning() << "Tried to load full cell which is not editable. This should be already handled in Editor class when invoking edition action."; +// return tr("This cell is not editable, because: %1").arg(SqlQueryModelColumn::resolveMessage(col->editionForbiddenReason.values().first())); +// } // This should not happen anymore (since WITHOUT ROWID tables should be handled properly now, // but we will keep this here for a while, just in case. @@ -422,22 +426,37 @@ QString SqlQueryItem::loadFullData() Dialect dialect = db->getDialect(); // Query - RowIdConditionBuilder rowIdBuilder; - rowIdBuilder.setRowId(getRowId()); - QString query = "SELECT %1 FROM %2 WHERE " + rowIdBuilder.build(); + QString query; + QHash queryArgs; + QString column = wrapObjIfNeeded(col->column, dialect); + if (col->editionForbiddenReason.size() > 0) + { + static_qstring(tpl, "SELECT %1 FROM (%2) LIMIT 1 OFFSET %3"); + + // The query + query = tpl.arg(column, model->getQuery(), QString::number(index().row())); + } + else + { + static_qstring(tpl, "SELECT %1 FROM %2 WHERE %3"); - // Column - query = query.arg(wrapObjIfNeeded(col->column, dialect)); + // Db and table + QString source = wrapObjIfNeeded(col->table, dialect); + if (!col->database.isNull()) + source.prepend(wrapObjIfNeeded(col->database, dialect)+"."); - // Database and table - QString source = wrapObjIfNeeded(col->table, dialect); - if (!col->database.isNull()) - source.prepend(wrapObjIfNeeded(col->database, dialect)+"."); + // ROWID + RowIdConditionBuilder rowIdBuilder; + rowIdBuilder.setRowId(getRowId()); + QString rowId = rowIdBuilder.build(); + queryArgs = rowIdBuilder.getQueryArgs(); - query = query.arg(source); + // The query + query = tpl.arg(column, source, rowId); + } // Get the data - SqlQueryPtr results = db->exec(query, rowIdBuilder.getQueryArgs()); + SqlQueryPtr results = db->exec(query, queryArgs); if (results->isError()) return results->getErrorText(); @@ -453,6 +472,6 @@ QVariant SqlQueryItem::getFullValue() QVariant originalValue = getValue(); loadFullData(); QVariant result = getValue(); - setValue(originalValue, true, !isUncommited()); + setValue(originalValue, true, !isUncommitted()); return result; } diff --git a/SQLiteStudio3/guiSQLiteStudio/datagrid/sqlqueryitem.h b/SQLiteStudio3/guiSQLiteStudio/datagrid/sqlqueryitem.h index b2552cd..805d275 100644 --- a/SQLiteStudio3/guiSQLiteStudio/datagrid/sqlqueryitem.h +++ b/SQLiteStudio3/guiSQLiteStudio/datagrid/sqlqueryitem.h @@ -21,8 +21,8 @@ class GUI_API_EXPORT SqlQueryItem : public QObject, public QStandardItem VALUE = 1002, LIMITED_VALUE = 1003, COLUMN = 1004, - UNCOMMITED = 1005, - COMMITING_ERROR = 1006, + UNCOMMITTED = 1005, + COMMITTING_ERROR = 1006, NEW_ROW = 1007, DELETED = 1008, OLD_VALUE = 1009, @@ -39,12 +39,12 @@ class GUI_API_EXPORT SqlQueryItem : public QObject, public QStandardItem RowId getRowId() const; void setRowId(const RowId& rowId); - bool isUncommited() const; - void setUncommited(bool uncommited); + bool isUncommitted() const; + void setUncommitted(bool uncommitted); void rollback(); - bool isCommitingError() const; - void setCommitingError(bool isError); + bool isCommittingError() const; + void setCommittingError(bool isError); bool isNewRow() const; void setNewRow(bool isNew); diff --git a/SQLiteStudio3/guiSQLiteStudio/datagrid/sqlqueryitemdelegate.cpp b/SQLiteStudio3/guiSQLiteStudio/datagrid/sqlqueryitemdelegate.cpp index 19090ad..74a82ca 100644 --- a/SQLiteStudio3/guiSQLiteStudio/datagrid/sqlqueryitemdelegate.cpp +++ b/SQLiteStudio3/guiSQLiteStudio/datagrid/sqlqueryitemdelegate.cpp @@ -17,6 +17,9 @@ #include #include #include +#include + +bool SqlQueryItemDelegate::warnedAboutHugeContents = false; SqlQueryItemDelegate::SqlQueryItemDelegate(QObject *parent) : QStyledItemDelegate(parent) @@ -28,9 +31,9 @@ void SqlQueryItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem & QStyledItemDelegate::paint(painter, option, index); SqlQueryItem* item = getItem(index); - if (item->isUncommited()) + if (item->isUncommitted()) { - painter->setPen(item->isCommitingError() ? CFG_UI.Colors.DataUncommitedError.get() : CFG_UI.Colors.DataUncommited.get()); + painter->setPen(item->isCommittingError() ? CFG_UI.Colors.DataUncommittedError.get() : CFG_UI.Colors.DataUncommitted.get()); painter->setBrush(Qt::NoBrush); painter->drawRect(option.rect.x(), option.rect.y(), option.rect.width()-1, option.rect.height()-1); } @@ -47,21 +50,24 @@ QWidget* SqlQueryItemDelegate::createEditor(QWidget* parent, const QStyleOptionV if (item->isDeletedRow()) { - notifyWarn(tr("Cannot edit this cell. Details: %2").arg(tr("The row is marked for deletion."))); + notifyWarn(tr("Cannot edit this cell. Details: %1").arg(tr("The row is marked for deletion."))); return nullptr; } if (!item->getColumn()->canEdit()) { - notifyWarn(tr("Cannot edit this cell. Details: %2").arg(item->getColumn()->getEditionForbiddenReason())); + notifyWarn(tr("Cannot edit this cell. Details: %1").arg(item->getColumn()->getEditionForbiddenReason())); return nullptr; } - if (item->isLimitedValue()) - item->loadFullData(); + if (item->isLimitedValue() && !item->loadFullData().isNull() && model->isStructureOutOfDate()) + { + notifyWarn(tr("Cannot edit this cell. Details: %1").arg(tr("Structure of this table has changed since last data was loaded. Reload the data to proceed."))); + return nullptr; + } if (!item->getColumn()->getFkConstraints().isEmpty()) - return getFkEditor(item, parent); + return getFkEditor(item, parent, model); return getEditor(item->getValue().userType(), parent); } @@ -71,13 +77,15 @@ QString SqlQueryItemDelegate::displayText(const QVariant& value, const QLocale& UNUSED(locale); if (value.type() == QVariant::Double) - return doubleToString(value.toDouble()); + return doubleToString(value); return QStyledItemDelegate::displayText(value, locale); } void SqlQueryItemDelegate::setEditorData(QWidget* editor, const QModelIndex& index) const { + // No need to check or load full data, it is already preloaded if necessary in createEditor(). + QComboBox* cb = dynamic_cast(editor); QLineEdit* le = dynamic_cast(editor); if (cb) { @@ -129,23 +137,40 @@ void SqlQueryItemDelegate::setModelDataForFk(QComboBox* cb, QAbstractItemModel* if (cbModel->isExecutionInProgress() || !cbModel->isAllDataLoaded()) return; + QString cbText = cb->currentText(); + if (CFG_UI.General.KeepNullWhenEmptyValue.get() && model->data(index, Qt::EditRole).isNull() && cbText.isEmpty()) + return; + int idx = cb->currentIndex(); if (idx < 0 || idx >= cbModel->rowCount()) { - model->setData(index, cb->currentText()); + model->setData(index, cbText, Qt::EditRole); + return; + } + + QList row = cbModel->getRow(idx); + if (!row[0]) + { + // This happens when inexisting value is confirmed with "Enter" key, + // cause rowCount() is apparently incremented, but items not yet. + model->setData(index, cbText, Qt::EditRole); return; } - QVariant comboData = cbModel->getRow(idx)[0]->getValue(); - if (cb->currentText() != comboData.toString()) - comboData = cb->currentText(); + QVariant comboData = row[0]->getValue(); + if (cbText != comboData.toString()) + comboData = cbText; - model->setData(index, comboData); + model->setData(index, comboData, Qt::EditRole); } void SqlQueryItemDelegate::setModelDataForLineEdit(QLineEdit* editor, QAbstractItemModel* model, const QModelIndex& index) const { QString value = editor->text(); + + if (CFG_UI.General.KeepNullWhenEmptyValue.get() && model->data(index, Qt::EditRole).isNull() && value.isEmpty()) + return; + bool ok; QVariant variant = value.toLongLong(&ok); if (ok) @@ -169,11 +194,18 @@ void SqlQueryItemDelegate::setEditorDataForLineEdit(QLineEdit* le, const QModelI QVariant value = index.data(Qt::EditRole); if (value.userType() == QVariant::Double) { - le->setText(doubleToString(value.toDouble())); + le->setText(doubleToString(value)); return; } - le->setText(value.toString()); + QString str = value.toString(); + if (str.size() > HUGE_CONTENTS_WARNING_LIMIT && !warnedAboutHugeContents) + { + NOTIFY_MANAGER->warn(tr("Editing a huge contents in an inline cell editor is not a good idea. It can become slow and inconvenient. It's better to edit such big contents in a Form View, or in popup editor (available under rick-click menu).")); + warnedAboutHugeContents = true; + } + + le->setText(str); } SqlQueryItem* SqlQueryItemDelegate::getItem(const QModelIndex &index) const @@ -186,6 +218,7 @@ QWidget* SqlQueryItemDelegate::getEditor(int type, QWidget* parent) const { UNUSED(type); QLineEdit *editor = new QLineEdit(parent); + editor->setMaxLength(std::numeric_limits::max()); editor->setFrame(editor->style()->styleHint(QStyle::SH_ItemView_DrawDelegateFrame, 0, editor)); return editor; @@ -257,12 +290,15 @@ QString SqlQueryItemDelegate::getSqlForFkEditor(SqlQueryItem* item) const return sql.arg(selectedCols.join(", "), fkConfitionTables.join(", "), conditionsStr); } -qlonglong SqlQueryItemDelegate::getRowCountForFkEditor(Db* db, const QString& query) const +qlonglong SqlQueryItemDelegate::getRowCountForFkEditor(Db* db, const QString& query, bool* isError) const { static_qstring(tpl, "SELECT count(*) FROM (%1)"); QString sql = tpl.arg(query); SqlQueryPtr result = db->exec(sql); + if (isError) + *isError = result->isError(); + return result->getSingleCell().toLongLong(); } @@ -283,21 +319,35 @@ void SqlQueryItemDelegate::fkDataReady() // Set selected combo value to initial value from the cell QComboBox* cb = modelToFkCombo[model]; QVariant value = modelToFkInitialValue[model]; - QModelIndexList idxList = model->findIndexes(SqlQueryItem::DataRole::VALUE, value, 1); - - int idx = 0; - if (idxList.size() > 0) - idx = idxList.first().row(); + if (model->rowCount() > 0) + { + QModelIndex startIdx = model->index(0, 0); + QModelIndex endIdx = model->index(model->rowCount() - 1, 0); + QModelIndexList idxList = model->findIndexes(startIdx, endIdx, SqlQueryItem::DataRole::VALUE, value, 1); + + if (idxList.size() > 0) + cb->setCurrentIndex(idxList.first().row()); + else + cb->setCurrentText(value.toString()); + } + else + { + cb->setCurrentText(value.toString()); + } +} - cb->setCurrentIndex(idx); +void SqlQueryItemDelegate::fkDataFailed(const QString &errorText) +{ + notifyWarn(tr("Cannot edit this cell. Details: %1").arg(errorText)); } -QWidget* SqlQueryItemDelegate::getFkEditor(SqlQueryItem* item, QWidget* parent) const +QWidget* SqlQueryItemDelegate::getFkEditor(SqlQueryItem* item, QWidget* parent, const SqlQueryModel* model) const { QString sql = getSqlForFkEditor(item); - Db* db = item->getModel()->getDb(); - qlonglong rowCount = getRowCountForFkEditor(db, sql); + Db* db = model->getDb(); + bool countingError = false; + qlonglong rowCount = getRowCountForFkEditor(db, sql, &countingError); if (rowCount > MAX_ROWS_FOR_FK) { notifyWarn(tr("Foreign key for column %2 has more than %1 possible values. It's too much to display in drop down list. You need to edit value manually.") @@ -306,6 +356,12 @@ QWidget* SqlQueryItemDelegate::getFkEditor(SqlQueryItem* item, QWidget* parent) return getEditor(item->getValue().userType(), parent); } + if (rowCount == 0 && countingError && model->isStructureOutOfDate()) + { + notifyWarn(tr("Cannot edit this cell. Details: %1").arg(tr("Structure of this table has changed since last data was loaded. Reload the data to proceed."))); + return nullptr; + } + QComboBox *cb = new QComboBox(parent); cb->setEditable(true); @@ -321,30 +377,31 @@ QWidget* SqlQueryItemDelegate::getFkEditor(SqlQueryItem* item, QWidget* parent) queryView->setMinimumWidth(wd); }); - SqlQueryModel* model = new SqlQueryModel(queryView); - model->setView(queryView); + SqlQueryModel* queryModel = new SqlQueryModel(queryView); + queryModel->setView(queryView); // Mapping of model to cb, so we can update combo when data arrives. - modelToFkInitialValue[model] = item->getValue(); - modelToFkCombo[model] = cb; - connect(cb, &QComboBox::destroyed, [this, model](QObject*) + modelToFkInitialValue[queryModel] = item->getValue(); + modelToFkCombo[queryModel] = cb; + connect(cb, &QComboBox::destroyed, [this, queryModel](QObject*) { - modelToFkCombo.remove(model); - modelToFkInitialValue.remove(model); + modelToFkCombo.remove(queryModel); + modelToFkInitialValue.remove(queryModel); }); // When execution is done, update combo. - connect(model, SIGNAL(executionSuccessful()), this, SLOT(fkDataReady())); + connect(queryModel, SIGNAL(executionSuccessful()), this, SLOT(fkDataReady())); + connect(queryModel, SIGNAL(executionFailed(QString)), this, SLOT(fkDataFailed(QString))); // Setup combo, model, etc. - cb->setModel(model); + cb->setModel(queryModel); cb->setView(queryView); cb->setModelColumn(0); - model->setHardRowLimit(MAX_ROWS_FOR_FK); - model->setDb(db); - model->setQuery(sql); - model->executeQuery(); + queryModel->setHardRowLimit(MAX_ROWS_FOR_FK); + queryModel->setDb(db); + queryModel->setQuery(sql); + queryModel->executeQuery(); queryView->verticalHeader()->setVisible(false); queryView->horizontalHeader()->setVisible(true); diff --git a/SQLiteStudio3/guiSQLiteStudio/datagrid/sqlqueryitemdelegate.h b/SQLiteStudio3/guiSQLiteStudio/datagrid/sqlqueryitemdelegate.h index 82d12c3..a35ef9a 100644 --- a/SQLiteStudio3/guiSQLiteStudio/datagrid/sqlqueryitemdelegate.h +++ b/SQLiteStudio3/guiSQLiteStudio/datagrid/sqlqueryitemdelegate.h @@ -26,23 +26,26 @@ class GUI_API_EXPORT SqlQueryItemDelegate : public QStyledItemDelegate private: SqlQueryItem* getItem(const QModelIndex &index) const; QWidget* getEditor(int type, QWidget* parent) const; - QWidget* getFkEditor(SqlQueryItem* item, QWidget* parent) const; + QWidget* getFkEditor(SqlQueryItem* item, QWidget* parent, const SqlQueryModel *model) const; void setEditorDataForLineEdit(QLineEdit* le, const QModelIndex& index) const; void setEditorDataForFk(QComboBox* cb, const QModelIndex& index) const; void setModelDataForFk(QComboBox* editor, QAbstractItemModel* model, const QModelIndex& index) const; void setModelDataForLineEdit(QLineEdit* editor, QAbstractItemModel* model, const QModelIndex& index) const; QString getSqlForFkEditor(SqlQueryItem* item) const; - qlonglong getRowCountForFkEditor(Db* db, const QString& query) const; + qlonglong getRowCountForFkEditor(Db* db, const QString& query, bool *isError) const; QSet editorsWithAsyncExecution; mutable QHash modelToFkCombo; mutable QHash modelToFkInitialValue; + static bool warnedAboutHugeContents; static const qlonglong MAX_ROWS_FOR_FK = 10000L; static const int CELL_LENGTH_LIMIT = 30; + static const int HUGE_CONTENTS_WARNING_LIMIT = 32767; // pow(2, 16) / 2 - 1 private slots: void fkDataReady(); + void fkDataFailed(const QString& errorText); }; #endif // SQLQUERYITEMDELEGATE_H diff --git a/SQLiteStudio3/guiSQLiteStudio/datagrid/sqlquerymodel.cpp b/SQLiteStudio3/guiSQLiteStudio/datagrid/sqlquerymodel.cpp index 15cf1bf..009b05a 100644 --- a/SQLiteStudio3/guiSQLiteStudio/datagrid/sqlquerymodel.cpp +++ b/SQLiteStudio3/guiSQLiteStudio/datagrid/sqlquerymodel.cpp @@ -32,6 +32,11 @@ SqlQueryModel::SqlQueryModel(QObject *parent) : connect(queryExecutor, SIGNAL(executionFinished(SqlQueryPtr)), this, SLOT(handleExecFinished(SqlQueryPtr))); connect(queryExecutor, SIGNAL(executionFailed(int,QString)), this, SLOT(handleExecFailed(int,QString))); connect(queryExecutor, SIGNAL(resultsCountingFinished(quint64,quint64,int)), this, SLOT(resultsCountingFinished(quint64,quint64,int))); + + NotifyManager* notifyManager = NotifyManager::getInstance(); + connect(notifyManager, SIGNAL(objectModified(Db*,QString,QString)), this, SLOT(handlePossibleTableModification(Db*,QString,QString))); + connect(notifyManager, SIGNAL(objectRenamed(Db*,QString,QString,QString)), this, SLOT(handlePossibleTableRename(Db*,QString,QString,QString))); + setItemPrototype(new SqlQueryItem()); existingModels << this; } @@ -97,12 +102,12 @@ void SqlQueryModel::executeQueryInternal() return; } - QList uncommitedItems = getUncommitedItems(); - if (uncommitedItems.size() > 0) + QList uncommittedItems = getUncommittedItems(); + if (uncommittedItems.size() > 0) { - QMessageBox::StandardButton result = QMessageBox::question(nullptr, tr("Uncommited data"), - tr("There are uncommited data changes. Do you want to proceed anyway? " - "All uncommited changes will be lost.")); + QMessageBox::StandardButton result = QMessageBox::question(nullptr, tr("Uncommitted data"), + tr("There are uncommitted data changes. Do you want to proceed anyway? " + "All uncommitted changes will be lost.")); if (result != QMessageBox::Yes) { @@ -110,7 +115,7 @@ void SqlQueryModel::executeQueryInternal() return; } - rollback(uncommitedItems); + rollback(uncommittedItems); } emit executionStarted(); @@ -219,9 +224,9 @@ QList SqlQueryModel::findItems(const QModelIndex& start, const QM return toItemList(findIndexes(start, end, role, value, hits)); } -QList SqlQueryModel::getUncommitedItems() const +QList SqlQueryModel::getUncommittedItems() const { - return findItems(SqlQueryItem::DataRole::UNCOMMITED, true); + return findItems(SqlQueryItem::DataRole::UNCOMMITTED, true); } QList > SqlQueryModel::groupItemsByRows(const QList& items) @@ -253,14 +258,14 @@ QHash > SqlQueryModel::groupItemsByTable(cons return itemsByTable; } -QList SqlQueryModel::filterOutCommitedItems(const QList& items) +QList SqlQueryModel::filterOutCommittedItems(const QList& items) { // This method doesn't make use of QMutableListIterator to remove items from passed list, // because it would require list in argument to drop 'const' keyword and it's already // there in calling methods, so it's easier to copy list and filter on the fly. QList newList; foreach (SqlQueryItem* item, items) - if (item->isUncommited()) + if (item->isUncommitted()) newList << item; return newList; @@ -291,13 +296,13 @@ QList SqlQueryModel::toItemList(const QModelIndexList& indexes) c void SqlQueryModel::commit() { - QList items = findItems(SqlQueryItem::DataRole::UNCOMMITED, true); + QList items = findItems(SqlQueryItem::DataRole::UNCOMMITTED, true); commitInternal(items); } void SqlQueryModel::commit(const QList& items) { - commitInternal(filterOutCommitedItems(items)); + commitInternal(filterOutCommittedItems(items)); } bool SqlQueryModel::commitRow(const QList& itemsInRow) @@ -334,13 +339,13 @@ void SqlQueryModel::rollbackRow(const QList& itemsInRow) void SqlQueryModel::rollback() { - QList items = findItems(SqlQueryItem::DataRole::UNCOMMITED, true); + QList items = findItems(SqlQueryItem::DataRole::UNCOMMITTED, true); rollbackInternal(items); } void SqlQueryModel::rollback(const QList& items) { - rollbackInternal(filterOutCommitedItems(items)); + rollbackInternal(filterOutCommittedItems(items)); } void SqlQueryModel::commitInternal(const QList& items) @@ -364,11 +369,11 @@ void SqlQueryModel::commitInternal(const QList& items) int numberOfItemsAdded = groupItemsByRows(findItems(SqlQueryItem::DataRole::NEW_ROW, true)).size(); int numberOfItemsDeleted = groupItemsByRows(findItems(SqlQueryItem::DataRole::DELETED, true)).size(); - // Removing "commit error" mark from items that are going to be commited now + // Removing "commit error" mark from items that are going to be committed now for (SqlQueryItem* item : items) - item->setCommitingError(false); + item->setCommittingError(false); - // Grouping by row and commiting + // Grouping by row and committing QList> groupedItems = groupItemsByRows(items); emit aboutToCommit(groupedItems.size()); @@ -382,11 +387,11 @@ void SqlQueryModel::commitInternal(const QList& items) ok = false; break; } - emit commitingStepFinished(step++); + emit committingStepFinished(step++); } - // Getting current uncommited list (after rows deletion it may be different) - QList itemsLeft = findItems(SqlQueryItem::DataRole::UNCOMMITED, true); + // Getting current uncommitted list (after rows deletion it may be different) + QList itemsLeft = findItems(SqlQueryItem::DataRole::UNCOMMITTED, true); // Getting common elements of initial and current item list, because of a possibility of the selective commit QMutableListIterator it(itemsLeft); @@ -396,20 +401,20 @@ void SqlQueryModel::commitInternal(const QList& items) it.remove(); } - // Commiting to the database + // Committing to the database if (ok) { if (!db->commit()) { ok = false; - notifyError(tr("An error occurred while commiting the transaction: %1").arg(db->getErrorText())); + notifyError(tr("An error occurred while committing the transaction: %1").arg(db->getErrorText())); } else { - // Commited successfully + // Committed successfully for (SqlQueryItem* item : itemsLeft) { - item->setUncommited(false); + item->setUncommitted(false); item->setNewRow(false); } @@ -418,7 +423,7 @@ void SqlQueryModel::commitInternal(const QList& items) for (int row : rowsDeletedSuccessfullyInTheCommit) removeRow(row - removeOffset++); // deleting row decrements all rows below - emit commitStatusChanged(getUncommitedItems().size() > 0); + emit commitStatusChanged(getUncommittedItems().size() > 0); } } rowsDeletedSuccessfullyInTheCommit.clear(); @@ -450,7 +455,7 @@ void SqlQueryModel::rollbackInternal(const QList& items) foreach (const QList& itemsInRow, groupedItems) rollbackRow(itemsInRow); - emit commitStatusChanged(getUncommitedItems().size() > 0); + emit commitStatusChanged(getUncommittedItems().size() > 0); } void SqlQueryModel::reload() @@ -485,7 +490,7 @@ StrHash SqlQueryModel::attachDependencyTables() if (!attachDb) { qCritical() << "Could not resolve database" << reqAttach << ", while it's a required attach name for SqlQueryModel to commit edited data!" - << "This may result in errors when commiting some data modifications."; + << "This may result in errors when committing some data modifications."; continue; } @@ -493,7 +498,7 @@ StrHash SqlQueryModel::attachDependencyTables() if (attachName.isNull()) { qCritical() << "Could not attach database" << reqAttach << ", while it's a required attach name for SqlQueryModel to commit edited data!" - << "This may result in errors when commiting some data modifications."; + << "This may result in errors when committing some data modifications."; continue; } @@ -646,9 +651,9 @@ bool SqlQueryModel::commitEditedRow(const QList& itemsInRow) if (results->isError()) { for (SqlQueryItem* item : items) - item->setCommitingError(true); + item->setCommittingError(true); - notifyError(tr("An error occurred while commiting the data: %1").arg(results->getErrorText())); + notifyError(tr("An error occurred while committing the data: %1").arg(results->getErrorText())); return false; } @@ -783,7 +788,7 @@ QList SqlQueryModel::loadRow(SqlResultsRowPtr row) SqlQueryItem* item = nullptr; RowId rowId; int colIdx = 0; - foreach (const QVariant& value, row->valueList().mid(rowIdColumns)) + foreach (const QVariant& value, row->valueList().mid(0, resultColumnCount)) { item = new SqlQueryItem(); rowId = getRowIdValue(row, colIdx); @@ -920,16 +925,27 @@ void SqlQueryModel::readColumns() { columns.clear(); tableToRowIdColumn.clear(); + tablesInUse.clear(); // Reading column mapping for ROWID columns int totalRowIdCols = 0; - AliasedTable table; + AliasedTable aliasedTable; + DbAndTable dbAndTable; foreach (const QueryExecutor::ResultRowIdColumnPtr& resCol, queryExecutor->getRowIdResultColumns()) { - table.setDatabase(resCol->dbName); - table.setTable(resCol->table); - table.setTableAlias(resCol->tableAlias); - tableToRowIdColumn[table] = resCol->queryExecutorAliasToColumn; + if (resCol->dbName.isEmpty() || resCol->dbName.toLower() == "main" || resCol->dbName.toLower() == "temp") + dbAndTable.setDb(db); + else if (!resCol->dbName.isEmpty()) + dbAndTable.setDb(DBLIST->getByName(resCol->dbName)); + + dbAndTable.setDatabase(resCol->database); + dbAndTable.setTable(resCol->table); + tablesInUse << dbAndTable; + + aliasedTable.setDatabase(resCol->dbName); + aliasedTable.setTable(resCol->table); + aliasedTable.setTableAlias(resCol->tableAlias); + tableToRowIdColumn[aliasedTable] = resCol->queryExecutorAliasToColumn; totalRowIdCols += resCol->queryExecutorAliasToColumn.size(); } @@ -937,9 +953,12 @@ void SqlQueryModel::readColumns() readColumnDetails(); // Preparing other usful information about columns - rowIdColumns = totalRowIdCols; + resultColumnCount = queryExecutor->getResultColumns().size(); tablesForColumns = getTablesForColumns(); columnEditionStatus = getColumnEditionEnabledList(); + + // We have fresh info about columns + structureOutOfDate = false; } void SqlQueryModel::readColumnDetails() @@ -1191,7 +1210,7 @@ void SqlQueryModel::resultsCountingFinished(quint64 rowsAffected, quint64 rowsRe void SqlQueryModel::itemValueEdited(SqlQueryItem* item) { UNUSED(item); - emit commitStatusChanged(getUncommitedItems().size() > 0); + emit commitStatusChanged(getUncommittedItems().size() > 0); } void SqlQueryModel::changeSorting(int logicalIndex, Qt::SortOrder order) @@ -1382,7 +1401,7 @@ void SqlQueryModel::updateSelectiveCommitRollbackActions(const QItemSelection& s { foreach (SqlQueryItem* item, selectedItems) { - if (item->isUncommited()) + if (item->isUncommitted()) { result = true; break; @@ -1405,7 +1424,7 @@ void SqlQueryModel::addNewRowInternal(int rowIdx) item = new SqlQueryItem(); item->setNewRow(true); - item->setUncommited(true); + item->setUncommitted(true); item->setColumn(columnModel); items << item; @@ -1526,6 +1545,21 @@ int SqlQueryModel::getRowsPerPage() const return rowsPerPage; } +int SqlQueryModel::getQueryCountLimitForSmartMode() const +{ + return queryExecutor->getQueryCountLimitForSmartMode(); +} + +void SqlQueryModel::setQueryCountLimitForSmartMode(int value) +{ + queryExecutor->setQueryCountLimitForSmartMode(value); +} + +bool SqlQueryModel::isStructureOutOfDate() const +{ + return structureOutOfDate; +} + bool SqlQueryModel::isAllDataLoaded() const { return allDataLoaded; @@ -1596,14 +1630,31 @@ void SqlQueryModel::deleteSelectedRows() } item->setDeletedRow(true); - item->setUncommited(true); + item->setUncommitted(true); } } foreach (SqlQueryItem* item, newItemsToDelete) removeRow(item->index().row()); - emit commitStatusChanged(getUncommitedItems().size() > 0); + emit commitStatusChanged(getUncommittedItems().size() > 0); +} + +void SqlQueryModel::handlePossibleTableModification(Db *modDb, const QString &database, const QString &objName) +{ + QString dbName = database.toLower() == "main" ? QString() : database; + DbAndTable dbAndTable(modDb, dbName, objName); + if (tablesInUse.contains(dbAndTable)) + structureOutOfDate = true; +} + +void SqlQueryModel::handlePossibleTableRename(Db *modDb, const QString &database, const QString &oldName, const QString &newName) +{ + UNUSED(newName); + QString dbName = database.toLower() == "main" ? QString() : database; + DbAndTable dbAndTable(modDb, dbName, oldName); + if (tablesInUse.contains(dbAndTable)) + structureOutOfDate = true; } void SqlQueryModel::applySqlFilter(const QString& value) diff --git a/SQLiteStudio3/guiSQLiteStudio/datagrid/sqlquerymodel.h b/SQLiteStudio3/guiSQLiteStudio/datagrid/sqlquerymodel.h index 6af937b..7a4c282 100644 --- a/SQLiteStudio3/guiSQLiteStudio/datagrid/sqlquerymodel.h +++ b/SQLiteStudio3/guiSQLiteStudio/datagrid/sqlquerymodel.h @@ -55,7 +55,7 @@ class GUI_API_EXPORT SqlQueryModel : public QStandardItemModel QModelIndexList findIndexes(const QModelIndex &start, const QModelIndex& end, int role, const QVariant &value, int hits = -1) const; QList findItems(int role, const QVariant &value, int hits = -1) const; QList findItems(const QModelIndex &start, const QModelIndex& end, int role, const QVariant &value, int hits = -1) const; - QList getUncommitedItems() const; + QList getUncommittedItems() const; QList getRow(int row); int columnCount(const QModelIndex& parent = QModelIndex()) const; QVariant headerData(int section, Qt::Orientation orientation, int role) const; @@ -140,10 +140,15 @@ class GUI_API_EXPORT SqlQueryModel : public QStandardItemModel bool isAllDataLoaded() const; + bool isStructureOutOfDate() const; + + int getQueryCountLimitForSmartMode() const; + void setQueryCountLimitForSmartMode(int value); + protected: class CommitUpdateQueryBuilder : public RowIdConditionBuilder { - public: + public: void clear(); void setDatabase(const QString& database); @@ -229,6 +234,14 @@ class GUI_API_EXPORT SqlQueryModel : public QStandardItemModel Db* db = nullptr; QList columns; + /** + * @brief tablesInUse + * List of tables that are used in currently presented data set. + * Database in those tables (if not empty) is a symbolic name, as listed on database list. + * If database is empty, then it was not explicitly typed in the query, so it's the local main db. + */ + QList tablesInUse; + /** * @brief Limit of data length in loaded cells. * @@ -236,7 +249,7 @@ class GUI_API_EXPORT SqlQueryModel : public QStandardItemModel * Having this set to 10000 gives about 290 MB of memory consumption * while having 30 columns and 1000 result rows loaded, all with 10000 bytes. */ - static const int cellDataLengthLimit = 10000; + static const int cellDataLengthLimit = 100; private: struct TableDetails @@ -275,7 +288,7 @@ class GUI_API_EXPORT SqlQueryModel : public QStandardItemModel void storeStep1NumbersFromExecution(); void storeStep2NumbersFromExecution(); void restoreNumbersToQueryExecutor(); - QList filterOutCommitedItems(const QList& items); + QList filterOutCommittedItems(const QList& items); void commitInternal(const QList& items); void rollbackInternal(const QList& items); void reloadInternal(); @@ -369,12 +382,7 @@ class GUI_API_EXPORT SqlQueryModel : public QStandardItemModel */ int hardRowLimit = -1; - /** - * @brief rowIdColumns - * We skip first this number of columns from the results of the SQL query, because those are ROWID columns. - * The query returns ROWID columns, because this is how QueryExecutor provides this information. - */ - int rowIdColumns = 0; + int resultColumnCount = 0; /** * @brief tablesForColumns @@ -392,6 +400,8 @@ class GUI_API_EXPORT SqlQueryModel : public QStandardItemModel bool allDataLoaded = false; + bool structureOutOfDate = false; + /** * @brief Set of existing model objects, updated for each construction and destruction. * @@ -425,6 +435,8 @@ class GUI_API_EXPORT SqlQueryModel : public QStandardItemModel void addNewRow(); void addMultipleRows(); void deleteSelectedRows(); + void handlePossibleTableModification(Db* modDb, const QString& database, const QString& objName); + void handlePossibleTableRename(Db* modDb, const QString& database, const QString& oldName, const QString& newName); signals: /** @@ -475,7 +487,7 @@ class GUI_API_EXPORT SqlQueryModel : public QStandardItemModel * @brief commitStatusChanged * @param commitAvailable Tells if there's anything to commit/rollback or not. * - * Emitted after any results cell has been modified and can now be commited or rolled back. + * Emitted after any results cell has been modified and can now be committed or rolled back. * Also emitted after commit and rollback. */ void commitStatusChanged(bool commitAvailable); @@ -484,8 +496,8 @@ class GUI_API_EXPORT SqlQueryModel : public QStandardItemModel * @brief selectiveCommitStatusChanged * @param commitAvailable Tells if there's anything to commit/rollback or not. * - * Emitted when user changes selection in the view, so if the selection includes any uncommited cells, - * then this signal will be emitted with parameter true, or if there is no uncommited cells, + * Emitted when user changes selection in the view, so if the selection includes any uncommitted cells, + * then this signal will be emitted with parameter true, or if there is no uncommitted cells, * then it will be emitted with parameter false. */ void selectiveCommitStatusChanged(bool commitAvailable); @@ -498,7 +510,7 @@ class GUI_API_EXPORT SqlQueryModel : public QStandardItemModel void sortingUpdated(const QueryExecutor::SortList& sortOrder); void aboutToCommit(int totalSteps); - void commitingStepFinished(int step); + void committingStepFinished(int step); void commitFinished(); void itemEditionEnded(SqlQueryItem* item); }; diff --git a/SQLiteStudio3/guiSQLiteStudio/datagrid/sqlqueryview.cpp b/SQLiteStudio3/guiSQLiteStudio/datagrid/sqlqueryview.cpp index 50a0480..9f58fd2 100644 --- a/SQLiteStudio3/guiSQLiteStudio/datagrid/sqlqueryview.cpp +++ b/SQLiteStudio3/guiSQLiteStudio/datagrid/sqlqueryview.cpp @@ -48,7 +48,8 @@ void SqlQueryView::init() itemDelegate = new SqlQueryItemDelegate(); setItemDelegate(itemDelegate); setMouseTracking(true); - setEditTriggers(QAbstractItemView::AnyKeyPressed); +// setEditTriggers(QAbstractItemView::AnyKeyPressed); + setEditTriggers(QAbstractItemView::AnyKeyPressed|QAbstractItemView::EditKeyPressed); setContextMenuPolicy(Qt::CustomContextMenu); contextMenu = new QMenu(this); @@ -114,29 +115,29 @@ void SqlQueryView::setupActionsForMenu(SqlQueryItem* currentItem, const QList uncommitedItems = getModel()->getUncommitedItems(); - int uncommitedCount = uncommitedItems.size(); + // Uncommitted items count + QList uncommittedItems = getModel()->getUncommittedItems(); + int uncommittedCount = uncommittedItems.size(); - // Uncommited & selected items count - int uncommitedSelCount = 0; - foreach (SqlQueryItem* item, uncommitedItems) + // Uncommitted & selected items count + int uncommittedSelCount = 0; + foreach (SqlQueryItem* item, uncommittedItems) if (selectedItems.contains(item)) - uncommitedSelCount++; + uncommittedSelCount++; - if (uncommitedCount > 0) + if (uncommittedCount > 0) contextMenu->addAction(actionMap[COMMIT]); - if (uncommitedSelCount > 0) + if (uncommittedSelCount > 0) contextMenu->addAction(actionMap[SELECTIVE_COMMIT]); - if (uncommitedCount > 0) + if (uncommittedCount > 0) contextMenu->addAction(actionMap[ROLLBACK]); - if (uncommitedSelCount > 0) + if (uncommittedSelCount > 0) contextMenu->addAction(actionMap[SELECTIVE_ROLLBACK]); - if (uncommitedCount > 0 && selCount > 0) + if (uncommittedCount > 0 && selCount > 0) contextMenu->addSeparator(); if (selCount > 0) @@ -395,8 +396,11 @@ void SqlQueryView::goToReferencedRow(const QString& table, const QString& column static_qstring(sqlTpl, "SELECT * FROM %1 WHERE %2 = %3"); + Dialect dialect = db->getDialect(); + QString wrappedTable = wrapObjIfNeeded(table, dialect); + QString wrappedColumn = wrapObjIfNeeded(column, dialect); QString valueStr = wrapValueIfNeeded(value.toString()); - EditorWindow* win = MAINWINDOW->openSqlEditor(db, sqlTpl.arg(table, column, valueStr)); + EditorWindow* win = MAINWINDOW->openSqlEditor(db, sqlTpl.arg(wrappedTable, wrappedColumn, valueStr)); if (!win) return; @@ -516,7 +520,7 @@ void SqlQueryView::copy() { itemValue = item->getFullValue(); if (itemValue.userType() == QVariant::Double) - cells << doubleToString(itemValue.toDouble()); + cells << doubleToString(itemValue); else cells << itemValue.toString(); diff --git a/SQLiteStudio3/guiSQLiteStudio/datagrid/sqltablemodel.cpp b/SQLiteStudio3/guiSQLiteStudio/datagrid/sqltablemodel.cpp index 20c878b..3a9f0b0 100644 --- a/SQLiteStudio3/guiSQLiteStudio/datagrid/sqltablemodel.cpp +++ b/SQLiteStudio3/guiSQLiteStudio/datagrid/sqltablemodel.cpp @@ -2,6 +2,7 @@ #include "common/utils_sql.h" #include "sqlqueryitem.h" #include "services/notifymanager.h" +#include "uiconfig.h" #include #include #include @@ -28,6 +29,13 @@ void SqlTableModel::setDatabaseAndTable(const QString& database, const QString& this->table = table; setQuery("SELECT * FROM "+getDataSource()); + QString dbName = database; + if (database.toLower() == "main" || database.isEmpty()) + dbName = QString(); + + tablesInUse.clear(); + tablesInUse << DbAndTable(db, dbName, table); + SchemaResolver resolver(db); isWithOutRowIdTable = resolver.isWithoutRowIdTable(database, table); } @@ -37,7 +45,6 @@ SqlQueryModel::Features SqlTableModel::features() const return INSERT_ROW|DELETE_ROW|FILTERING; } - bool SqlTableModel::commitAddedRow(const QList& itemsInRow) { QList modelColumns = getTableColumnModels(table); @@ -70,9 +77,9 @@ bool SqlTableModel::commitAddedRow(const QList& itemsInRow) if (result->isError()) { foreach (SqlQueryItem* item, itemsInRow) - item->setCommitingError(true); + item->setCommittingError(true); - notifyError(tr("Error while commiting new row: %1").arg(result->getErrorText())); + notifyError(tr("Error while committing new row: %1").arg(result->getErrorText())); return false; } @@ -135,7 +142,7 @@ bool SqlTableModel::commitDeletedRow(const QList& itemsInRow) } if (!SqlQueryModel::commitDeletedRow(itemsInRow)) - qCritical() << "Could not delete row from SqlQueryView while commiting row deletion."; + qCritical() << "Could not delete row from SqlQueryView while committing row deletion."; return true; } @@ -168,7 +175,7 @@ void SqlTableModel::applyStringFilter(const QString& value) Dialect dialect = db->getDialect(); QStringList conditions; foreach (SqlQueryModelColumnPtr column, columns) - conditions << wrapObjIfNeeded(column->column, dialect)+" LIKE '%"+value+"%'"; + conditions << wrapObjIfNeeded(column->column, dialect)+" LIKE '%"+escapeString(value)+"%'"; setQuery("SELECT * FROM "+getDataSource()+" WHERE "+conditions.join(" OR ")); executeQuery(); @@ -185,7 +192,7 @@ void SqlTableModel::applyRegExpFilter(const QString& value) Dialect dialect = db->getDialect(); QStringList conditions; foreach (SqlQueryModelColumnPtr column, columns) - conditions << wrapObjIfNeeded(column->column, dialect)+" REGEXP '"+value+"'"; + conditions << wrapObjIfNeeded(column->column, dialect)+" REGEXP '"+escapeString(value)+"'"; setQuery("SELECT * FROM "+getDataSource()+" WHERE "+conditions.join(" OR ")); executeQuery(); @@ -392,7 +399,10 @@ void SqlTableModel::updateColumnsAndValues(const QList& itemsInRo item = itemsInRow[i++]; if (item->getValue().isNull()) { - if (modelColumn->isDefault()) + if (CFG_UI.General.UseDefaultValueForNull.get() && modelColumn->isDefault()) + continue; + + if (modelColumn->isNotNull()) // value is null, but it's NOT NULL, try using DEFAULT, or fail. continue; if (modelColumn->isPk() && modelColumn->isAutoIncr()) diff --git a/SQLiteStudio3/guiSQLiteStudio/dataview.cpp b/SQLiteStudio3/guiSQLiteStudio/dataview.cpp index 69ca9cd..6666834 100644 --- a/SQLiteStudio3/guiSQLiteStudio/dataview.cpp +++ b/SQLiteStudio3/guiSQLiteStudio/dataview.cpp @@ -153,7 +153,7 @@ void DataView::initWidgetCover() widgetCover = new WidgetCover(this); widgetCover->initWithProgressBarOnly("%v / %m"); connect(model, SIGNAL(aboutToCommit(int)), this, SLOT(coverForGridCommit(int))); - connect(model, SIGNAL(commitingStepFinished(int)), this, SLOT(updateGridCommitCover(int))); + connect(model, SIGNAL(committingStepFinished(int)), this, SLOT(updateGridCommitCover(int))); connect(model, SIGNAL(commitFinished()), this, SLOT(hideGridCommitCover())); } @@ -650,7 +650,7 @@ void DataView::updateFilterIcon() } } -bool DataView::isUncommited() const +bool DataView::isUncommitted() const { return uncommittedGrid || uncommittedForm; } diff --git a/SQLiteStudio3/guiSQLiteStudio/dataview.h b/SQLiteStudio3/guiSQLiteStudio/dataview.h index fcab9f2..73ccfe7 100644 --- a/SQLiteStudio3/guiSQLiteStudio/dataview.h +++ b/SQLiteStudio3/guiSQLiteStudio/dataview.h @@ -78,7 +78,7 @@ class GUI_API_EXPORT DataView : public QTabWidget, public ExtActionContainer SqlQueryView* getGridView() const; SqlQueryModel* getModel() const; QToolBar* getToolBar(int toolbar) const; - bool isUncommited() const; + bool isUncommitted() const; static void staticInit(); static void insertAction(ExtActionPrototype* action, ToolBar toolbar = TOOLBAR_GRID); diff --git a/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtree.cpp b/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtree.cpp index fbe0a38..018eeb6 100644 --- a/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtree.cpp +++ b/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtree.cpp @@ -976,6 +976,13 @@ QString DbTree::getSelectedViewName() const return view; } +QList DbTree::getSelectedItems(DbTreeItem::Type itemType) +{ + return getSelectedItems([itemType](DbTreeItem* item) + { + return item->getType() == itemType; + }); +} void DbTree::refreshSchema(Db* db) { @@ -1498,7 +1505,7 @@ void DbTree::resetAutoincrement() if (res->isError()) notifyError(tr("An error occurred while trying to reset autoincrement value for table '%1': %2").arg(table, res->getErrorText())); else - notifyInfo(tr("Autoincrement value for table '%1' has been reset successfly.").arg(table)); + notifyInfo(tr("Autoincrement value for table '%1' has been reset successfully.").arg(table)); } void DbTree::eraseTableData() @@ -1507,27 +1514,36 @@ void DbTree::eraseTableData() if (!db || !db->isValid()) return; - DbTreeItem* item = ui->treeView->currentItem(); - QString table = item->getTable(); - if (table.isNull()) + QList items = getSelectedItems(DbTreeItem::Type::TABLE); + if (items.isEmpty()) { qWarning() << "Tried to erase table data, while table wasn't selected in DbTree."; return; } - QMessageBox::StandardButton btn = QMessageBox::question(this, tr("Erase table data"), tr("Are you sure you want to delete all data from table '%1'?") - .arg(table)); + QStringList tables; + for (DbTreeItem* item : items) + tables << item->getTable(); + + QMessageBox::StandardButton btn = QMessageBox::question(this, tr("Erase table data"), tr("Are you sure you want to delete all data from table(s): %1?") + .arg(tables.join(", "))); if (btn != QMessageBox::Yes) return; - SqlQueryPtr res = db->exec(QString("DELETE FROM %1;").arg(wrapObjIfNeeded(table, db->getDialect()))); - if (res->isError()) + static_qstring(DELETE_SQL, "DELETE FROM %1;"); + Dialect dialect = db->getDialect(); + SqlQueryPtr res; + for (const QString& table : tables) { - notifyError(tr("An error occurred while trying to delete data from table '%1': %2").arg(table, res->getErrorText())); - return; - } + res = db->exec(DELETE_SQL.arg(wrapObjIfNeeded(table, dialect))); + if (res->isError()) + { + notifyError(tr("An error occurred while trying to delete data from table '%1': %2").arg(table, res->getErrorText())); + return; + } - notifyInfo(tr("All data has been deleted for table '%1'.").arg(table)); + notifyInfo(tr("All data has been deleted for table '%1'.").arg(table)); + } } void DbTree::addColumn(DbTreeItem* item) @@ -1591,6 +1607,11 @@ void DbTree::currentChanged(const QModelIndex ¤t, const QModelIndex &previ } void DbTree::deleteSelected(ItemFilterFunc filterFunc) +{ + deleteItems(getSelectedItems(filterFunc)); +} + +QList DbTree::getSelectedItems(DbTree::ItemFilterFunc filterFunc) { QModelIndexList idxList = ui->treeView->getSelectedIndexes(); QList items; @@ -1603,10 +1624,10 @@ void DbTree::deleteSelected(ItemFilterFunc filterFunc) items << item; } - - deleteItems(items); + return items; } + void DbTree::deleteItems(const QList& itemsToDelete) { QList items = itemsToDelete; @@ -1741,12 +1762,22 @@ void DbTree::generateInsertForTable() void DbTree::generateUpdateForTable() { + Db* db = getSelectedDb(); + QString table = getSelectedTableName(); + QueryGenerator generator; + QString sql = generator.generateUpdateOfTable(db, table); + MAINWINDOW->openSqlEditor(db, sql); } void DbTree::generateDeleteForTable() { + Db* db = getSelectedDb(); + QString table = getSelectedTableName(); + QueryGenerator generator; + QString sql = generator.generateDeleteFromTable(db, table); + MAINWINDOW->openSqlEditor(db, sql); } void DbTree::setupDefShortcuts() @@ -1759,11 +1790,6 @@ void DbTree::setupDefShortcuts() BIND_SHORTCUTS(DbTree, Action); } -void DbTree::closeEvent(QCloseEvent *e) -{ - e->ignore(); -} - int qHash(DbTree::Action action) { return static_cast(action); diff --git a/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtree.h b/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtree.h index ea415a4..f97e5eb 100644 --- a/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtree.h +++ b/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtree.h @@ -123,7 +123,6 @@ class GUI_API_EXPORT DbTree : public QDockWidget, public ExtActionContainer protected: void createActions(); void setupDefShortcuts(); - void closeEvent(QCloseEvent* e); private: typedef std::function ItemFilterFunc; @@ -148,6 +147,8 @@ class GUI_API_EXPORT DbTree : public QDockWidget, public ExtActionContainer QString getSelectedIndexName() const; QString getSelectedTriggerName() const; QString getSelectedViewName() const; + QList getSelectedItems(DbTreeItem::Type itemType); + QList getSelectedItems(ItemFilterFunc filterFunc = nullptr); static bool areDbTreeItemsValidForItem(QList srcItems, const DbTreeItem* dstItem); static bool areUrlsValidForItem(const QList& srcUrls, const DbTreeItem* dstItem); diff --git a/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtree.ui b/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtree.ui index 687415d..780b306 100644 --- a/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtree.ui +++ b/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtree.ui @@ -14,7 +14,7 @@ false - QDockWidget::DockWidgetFloatable|QDockWidget::DockWidgetMovable + QDockWidget::AllDockWidgetFeatures Qt::LeftDockWidgetArea|Qt::RightDockWidgetArea diff --git a/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtreemodel.cpp b/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtreemodel.cpp index c11221d..9fe88c2 100644 --- a/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtreemodel.cpp +++ b/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtreemodel.cpp @@ -35,7 +35,7 @@ DbTreeModel::DbTreeModel() connectDbManagerSignals(); connect(CFG, SIGNAL(massSaveBegins()), this, SLOT(massSaveBegins())); - connect(CFG, SIGNAL(massSaveCommited()), this, SLOT(massSaveCommited())); + connect(CFG, SIGNAL(massSaveCommitted()), this, SLOT(massSaveCommitted())); connect(CFG_UI.General.ShowSystemObjects, SIGNAL(changed(QVariant)), this, SLOT(markSchemaReloadingRequired())); dbOrganizer = new DbObjectOrganizer(confirmReferencedTables, resolveNameConflict, confirmConversion, confirmConversionErrors); @@ -743,7 +743,7 @@ void DbTreeModel::massSaveBegins() requireSchemaReloading = false; } -void DbTreeModel::massSaveCommited() +void DbTreeModel::massSaveCommitted() { if (requireSchemaReloading) { diff --git a/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtreemodel.h b/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtreemodel.h index 122421a..50b080d 100644 --- a/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtreemodel.h +++ b/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtreemodel.h @@ -116,7 +116,7 @@ class GUI_API_EXPORT DbTreeModel : public QStandardItemModel void dbUnloaded(Db* db); void dbLoaded(Db* db); void massSaveBegins(); - void massSaveCommited(); + void massSaveCommitted(); void markSchemaReloadingRequired(); void dbObjectsMoveFinished(bool success, Db* srcDb, Db* dstDb); void dbObjectsCopyFinished(bool success, Db* srcDb, Db* dstDb); diff --git a/SQLiteStudio3/guiSQLiteStudio/dialogs/configdialog.cpp b/SQLiteStudio3/guiSQLiteStudio/dialogs/configdialog.cpp index 42c7099..85ae12d 100644 --- a/SQLiteStudio3/guiSQLiteStudio/dialogs/configdialog.cpp +++ b/SQLiteStudio3/guiSQLiteStudio/dialogs/configdialog.cpp @@ -199,7 +199,7 @@ void ConfigDialog::init() << CFG_UI.General.ShowVirtualTableLabels; for (CfgEntry* cfg : entries) - connect(cfg, &CfgEntry::changed, this, &ConfigDialog::markRequiresSchemasRefresh); + connect(cfg, SIGNAL(changed(QVariant)), this, SLOT(markRequiresSchemasRefresh())); ui->activeStyleCombo->addItems(QStyleFactory::keys()); diff --git a/SQLiteStudio3/guiSQLiteStudio/dialogs/configdialog.ui b/SQLiteStudio3/guiSQLiteStudio/dialogs/configdialog.ui index c69ad20..6bedd25 100644 --- a/SQLiteStudio3/guiSQLiteStudio/dialogs/configdialog.ui +++ b/SQLiteStudio3/guiSQLiteStudio/dialogs/configdialog.ui @@ -229,7 +229,7 @@ - 5 + 1 @@ -408,7 +408,7 @@ 0 0 564 - 504 + 580 @@ -418,10 +418,13 @@ Data browsing and editing - - + + + + <p>When the data is read into grid view columns width is automatically adjusted. This value limits the initial width for the adjustment, but user can still resize the column manually over this limit.</p> + - Number of data rows per page: + Limit initial data column width to (in pixels): @@ -444,16 +447,6 @@ - - - - <p>When the data is read into grid view columns width is automatically adjusted. This value limits the initial width for the adjustment, but user can still resize the column manually over this limit.</p> - - - Limit initial data column width to (in pixels): - - - @@ -473,7 +466,7 @@ - + <p>When this is enabled and user holds mouse pointer over a cell in any data view (query results, a table data, a view data) a tooltip will appear with details about the cell - it includes details like column data type, constraints, ROWID and others.</p> @@ -486,6 +479,39 @@ + + + + Number of data rows per page: + + + + + + + <p>When editing a cell which used to have NULL value and entering empty string as new value, then this option determinates whether the new value should remain NULL (have this option enabled), or should it be overwritten with empty string value (have this option disabled).</p> + + + Keep NULL value when entering empty value + + + General.KeepNullWhenEmptyValue + + + + + + + <html><head/><body><p>Enable this to always enforce DEFAULT value when committing a NULL value for a column that has DEFAULT value defined, even though the column is allowed to contain NULL values.</p><p>Disable this option to use DEFAULT value exclusively when NULL value is committed for column with NOT NULL constraint.</p></body></html> + + + Use DEFAULT value (if defined), when committing NULL value + + + General.UseDefaultValueForNull + + + @@ -766,7 +792,7 @@ - Don't show DDL preview dialog when commiting schema changes + Don't show DDL preview dialog when committing schema changes General.DontShowDdlPreview @@ -1001,8 +1027,8 @@ 0 0 - 596 - 487 + 447 + 307 @@ -1422,7 +1448,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;"> +</style></head><body style=" font-family:'Noto Sans'; font-size:10pt; font-weight:400; font-style:normal;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;">Abcdefgh</span></p></body></html> @@ -1513,8 +1539,8 @@ p, li { white-space: pre-wrap; } 0 0 - 290 - 323 + 268 + 328 @@ -1635,8 +1661,8 @@ p, li { white-space: pre-wrap; } 0 0 - 352 - 806 + 331 + 829 @@ -1921,17 +1947,17 @@ p, li { white-space: pre-wrap; } - + - <p>Any data changes will be outlined with this color, until they're commited to the database.</p> + <p>Any data changes will be outlined with this color, until they're committed to the database.</p> - Uncommited data outline color + Uncommitted data outline color - + 50 @@ -1942,14 +1968,14 @@ p, li { white-space: pre-wrap; } - Colors.DataUncommited + Colors.DataUncommitted - <p>In case of error while commiting data changes, the problematic cell will be outlined with this color.</p> + <p>In case of error while committing data changes, the problematic cell will be outlined with this color.</p> Commit error outline color @@ -1968,7 +1994,7 @@ p, li { white-space: pre-wrap; } - Colors.DataUncommitedError + Colors.DataUncommittedError @@ -2238,7 +2264,7 @@ p, li { white-space: pre-wrap; } sqlEditorNumberFgButton sqlEditorBindParamFgButton sqlEditorValidObjectsButton - dataViewUncommitedButton + dataViewUncommittedButton dataViewErrorButton dataViewNullFgButton dataViewDeletedRowBgButton diff --git a/SQLiteStudio3/guiSQLiteStudio/dialogs/dbdialog.cpp b/SQLiteStudio3/guiSQLiteStudio/dialogs/dbdialog.cpp index 6bdf41f..781e25e 100644 --- a/SQLiteStudio3/guiSQLiteStudio/dialogs/dbdialog.cpp +++ b/SQLiteStudio3/guiSQLiteStudio/dialogs/dbdialog.cpp @@ -81,7 +81,6 @@ void DbDialog::showEvent(QShowEvent *e) int idx = ui->typeCombo->findText(db->getTypeLabel()); ui->typeCombo->setCurrentIndex(idx); - ui->generateCheckBox->setChecked(false); ui->fileEdit->setText(db->getPath()); ui->nameEdit->setText(db->getName()); disableTypeAutodetection = false; @@ -126,19 +125,18 @@ void DbDialog::init() ui->testConnIcon->setVisible(false); connect(ui->fileEdit, SIGNAL(textChanged(QString)), this, SLOT(fileChanged(QString))); - connect(ui->nameEdit, SIGNAL(textChanged(QString)), this, SLOT(nameModified(QString))); - connect(ui->generateCheckBox, SIGNAL(toggled(bool)), this, SLOT(generateNameSwitched(bool))); + connect(ui->nameEdit, SIGNAL(textEdited(QString)), this, SLOT(nameModified(QString))); connect(ui->browseCreateButton, SIGNAL(clicked()), this, SLOT(browseClicked())); connect(ui->browseOpenButton, SIGNAL(clicked()), this, SLOT(browseClicked())); connect(ui->testConnButton, SIGNAL(clicked()), this, SLOT(testConnectionClicked())); connect(ui->typeCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(dbTypeChanged(int))); - generateNameSwitched(true); - layout()->setSizeConstraint(QLayout::SetFixedSize); if (mode == Mode::ADD && CFG_UI.General.NewDbNotPermanentByDefault.get()) ui->permamentCheckBox->setChecked(false); + + validate(); } void DbDialog::updateOptions() @@ -462,55 +460,76 @@ bool DbDialog::testDatabase() bool DbDialog::validate() { // Name - if (!ui->generateCheckBox->isChecked()) + bool nameState = true; + if (ui->nameEdit->text().isEmpty()) + { + nameState = false; + setValidState(ui->nameEdit, false, tr("Enter an unique database name.")); + } + + Db* registeredDb = nullptr; + if (nameState) { - if (ui->nameEdit->text().isEmpty()) + registeredDb = DBLIST->getByName(ui->nameEdit->text(), Qt::CaseInsensitive); + if (registeredDb && (mode == Mode::ADD || registeredDb != db)) { - setValidState(ui->nameEdit, false, tr("Enter an unique database name.")); - return false; + nameState = false; + setValidState(ui->nameEdit, false, tr("This name is already in use. Please enter unique name.")); } } - Db* registeredDb = DBLIST->getByName(ui->nameEdit->text(), Qt::CaseInsensitive); - if (registeredDb && (mode == Mode::ADD || registeredDb != db)) + if (nameState) { - setValidState(ui->nameEdit, false, tr("This name is already in use. Please enter unique name.")); - return false; + if (nameManuallyEdited) + setValidStateInfo(ui->nameEdit, tr("

Automatic name generation was disabled, becuase the name was edited manually. To restore automatic generation please erase contents of the name field.

")); + else + setValidState(ui->nameEdit, true); } - setValidState(ui->nameEdit, true); // File + bool fileState = true; if (ui->fileEdit->text().isEmpty()) { setValidState(ui->fileEdit, false, tr("Enter a database file path.")); - return false; + fileState = false; } - registeredDb = DBLIST->getByPath(ui->fileEdit->text()); - if (registeredDb && (mode == Mode::ADD || registeredDb != db)) + if (fileState) { - setValidState(ui->fileEdit, false, tr("This database is already on the list under name: %1").arg(registeredDb->getName())); - return false; + registeredDb = DBLIST->getByPath(ui->fileEdit->text()); + if (registeredDb && (mode == Mode::ADD || registeredDb != db)) + { + setValidState(ui->fileEdit, false, tr("This database is already on the list under name: %1").arg(registeredDb->getName())); + fileState = false; + } } - setValidState(ui->fileEdit, true); + + if (fileState) + setValidState(ui->fileEdit, true); // Type + bool typeState = true; if (ui->typeCombo->count() == 0) { // No need to set validation message here. SQLite3 plugin is built in, // so if this happens, something is really, really wrong. qCritical() << "No db plugins loaded in db dialog!"; - return false; + typeState = false; } - if (ui->typeCombo->currentIndex() < 0) + if (typeState) { - setValidState(ui->typeCombo, false, tr("Select a database type.")); - return false; + if (ui->typeCombo->currentIndex() < 0) + { + setValidState(ui->typeCombo, false, tr("Select a database type.")); + typeState = false; + } } - setValidState(ui->typeCombo, true); - return true; + if (typeState) + setValidState(ui->typeCombo, true); + + return nameState && fileState && typeState; } void DbDialog::updateState() @@ -532,13 +551,12 @@ void DbDialog::typeChanged(int index) { UNUSED(index); updateOptions(); - valueForNameGenerationChanged(); } void DbDialog::valueForNameGenerationChanged() { updateState(); - if (!ui->generateCheckBox->isChecked()) + if (nameManuallyEdited) return; QString generatedName; @@ -566,21 +584,6 @@ void DbDialog::browseForFile() setFileDialogInitPathByFile(path); } -void DbDialog::generateNameSwitched(bool checked) -{ - if (checked) - { - ui->nameEdit->setPlaceholderText(tr("Auto-generated")); - valueForNameGenerationChanged(); - } - else - { - ui->nameEdit->setPlaceholderText(tr("Type the name")); - } - - ui->nameEdit->setReadOnly(checked); -} - void DbDialog::fileChanged(const QString &arg1) { UNUSED(arg1); @@ -637,9 +640,9 @@ void DbDialog::dbTypeChanged(int index) propertyChanged(); } -void DbDialog::nameModified(const QString &arg1) +void DbDialog::nameModified(const QString &value) { - UNUSED(arg1); + nameManuallyEdited = !value.isEmpty(); updateState(); } diff --git a/SQLiteStudio3/guiSQLiteStudio/dialogs/dbdialog.h b/SQLiteStudio3/guiSQLiteStudio/dialogs/dbdialog.h index 2beea3e..3d1a9da 100644 --- a/SQLiteStudio3/guiSQLiteStudio/dialogs/dbdialog.h +++ b/SQLiteStudio3/guiSQLiteStudio/dialogs/dbdialog.h @@ -70,6 +70,7 @@ class GUI_API_EXPORT DbDialog : public QDialog DbPluginOption::CustomBrowseHandler customBrowseHandler = nullptr; bool disableTypeAutodetection = false; bool doAutoTest = false; + bool nameManuallyEdited = false; static const constexpr int ADDITIONAL_ROWS_BEGIN_INDEX = 1; @@ -77,13 +78,12 @@ class GUI_API_EXPORT DbDialog : public QDialog void typeChanged(int index); void valueForNameGenerationChanged(); void browseForFile(); - void generateNameSwitched(bool checked); void fileChanged(const QString &arg1); void browseClicked(); void testConnectionClicked(); void propertyChanged(); void dbTypeChanged(int index); - void nameModified(const QString &arg1); + void nameModified(const QString &value); public slots: void accept(); diff --git a/SQLiteStudio3/guiSQLiteStudio/dialogs/dbdialog.ui b/SQLiteStudio3/guiSQLiteStudio/dialogs/dbdialog.ui index 6f35079..9878bec 100644 --- a/SQLiteStudio3/guiSQLiteStudio/dialogs/dbdialog.ui +++ b/SQLiteStudio3/guiSQLiteStudio/dialogs/dbdialog.ui @@ -7,7 +7,7 @@ 0 0 455 - 365 + 366 @@ -80,24 +80,7 @@ - - - true - - - - - - - Generate name basing on file path - - - Generate automatically - - - true - - + diff --git a/SQLiteStudio3/guiSQLiteStudio/dialogs/quitconfirmdialog.ui b/SQLiteStudio3/guiSQLiteStudio/dialogs/quitconfirmdialog.ui index 6f97934..20d4f21 100644 --- a/SQLiteStudio3/guiSQLiteStudio/dialogs/quitconfirmdialog.ui +++ b/SQLiteStudio3/guiSQLiteStudio/dialogs/quitconfirmdialog.ui @@ -11,7 +11,7 @@ - Uncommited changes + Uncommitted changes diff --git a/SQLiteStudio3/guiSQLiteStudio/dialogs/triggercolumnsdialog.cpp b/SQLiteStudio3/guiSQLiteStudio/dialogs/triggercolumnsdialog.cpp index 462e57f..7890b3c 100644 --- a/SQLiteStudio3/guiSQLiteStudio/dialogs/triggercolumnsdialog.cpp +++ b/SQLiteStudio3/guiSQLiteStudio/dialogs/triggercolumnsdialog.cpp @@ -1,13 +1,18 @@ #include "triggercolumnsdialog.h" #include "ui_triggercolumnsdialog.h" - +#include "uiutils.h" #include -TriggerColumnsDialog::TriggerColumnsDialog(QWidget *parent) : +TriggerColumnsDialog::TriggerColumnsDialog(QWidget *parent, int globalX, int globalY) : QDialog(parent, Qt::Popup), + globalX(globalX), + globalY(globalY), ui(new Ui::TriggerColumnsDialog) { ui->setupUi(this); + + connect(ui->selectAllBtn, SIGNAL(clicked(bool)), this, SLOT(selectAll())); + connect(ui->deselectAllBtn, SIGNAL(clicked(bool)), this, SLOT(deselectAll())); } TriggerColumnsDialog::~TriggerColumnsDialog() @@ -26,7 +31,7 @@ void TriggerColumnsDialog::addColumn(const QString& name, bool checked) QStringList TriggerColumnsDialog::getCheckedColumns() const { QStringList columns; - foreach (QCheckBox* cb, checkBoxList) + for (QCheckBox* cb : checkBoxList) { if (cb->isChecked()) columns << cb->text(); @@ -49,4 +54,17 @@ void TriggerColumnsDialog::changeEvent(QEvent *e) void TriggerColumnsDialog::showEvent(QShowEvent*) { adjustSize(); + move(globalX, globalY); +} + +void TriggerColumnsDialog::selectAll() +{ + for (QCheckBox* cb : checkBoxList) + cb->setChecked(true); +} + +void TriggerColumnsDialog::deselectAll() +{ + for (QCheckBox* cb : checkBoxList) + cb->setChecked(false); } diff --git a/SQLiteStudio3/guiSQLiteStudio/dialogs/triggercolumnsdialog.h b/SQLiteStudio3/guiSQLiteStudio/dialogs/triggercolumnsdialog.h index 1ba0d69..d7e719c 100644 --- a/SQLiteStudio3/guiSQLiteStudio/dialogs/triggercolumnsdialog.h +++ b/SQLiteStudio3/guiSQLiteStudio/dialogs/triggercolumnsdialog.h @@ -15,7 +15,7 @@ class GUI_API_EXPORT TriggerColumnsDialog : public QDialog Q_OBJECT public: - explicit TriggerColumnsDialog(QWidget *parent = 0); + explicit TriggerColumnsDialog(QWidget *parent, int globalX, int globalY); ~TriggerColumnsDialog(); void addColumn(const QString& name, bool checked); @@ -27,7 +27,13 @@ class GUI_API_EXPORT TriggerColumnsDialog : public QDialog private: QList checkBoxList; + int globalX; + int globalY; Ui::TriggerColumnsDialog *ui = nullptr; + + private slots: + void selectAll(); + void deselectAll(); }; #endif // TRIGGERCOLUMNSDIALOG_H diff --git a/SQLiteStudio3/guiSQLiteStudio/dialogs/triggercolumnsdialog.ui b/SQLiteStudio3/guiSQLiteStudio/dialogs/triggercolumnsdialog.ui index 861e17b..b01e01d 100644 --- a/SQLiteStudio3/guiSQLiteStudio/dialogs/triggercolumnsdialog.ui +++ b/SQLiteStudio3/guiSQLiteStudio/dialogs/triggercolumnsdialog.ui @@ -6,7 +6,7 @@ 0 0 - 334 + 232 300 @@ -61,8 +61,8 @@ 0 0 - 316 - 237 + 212 + 205 @@ -82,6 +82,56 @@ + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 0 + 0 + + + + Select all + + + + + + + + 0 + 0 + + + + Deselect all + + + + + + diff --git a/SQLiteStudio3/guiSQLiteStudio/dialogs/triggerdialog.cpp b/SQLiteStudio3/guiSQLiteStudio/dialogs/triggerdialog.cpp index 12baafd..3254f26 100644 --- a/SQLiteStudio3/guiSQLiteStudio/dialogs/triggerdialog.cpp +++ b/SQLiteStudio3/guiSQLiteStudio/dialogs/triggerdialog.cpp @@ -360,7 +360,9 @@ void TriggerDialog::updateValidation() void TriggerDialog::showColumnsDialog() { - TriggerColumnsDialog dialog(this); + QPoint topRight = ui->actionColumns->mapToGlobal(ui->actionColumns->rect().topRight()); + + TriggerColumnsDialog dialog(this, topRight.x(), topRight.y()); foreach (const QString& colName, targetColumns) dialog.addColumn(colName, selectedColumns.contains(colName, Qt::CaseInsensitive)); diff --git a/SQLiteStudio3/guiSQLiteStudio/formview.cpp b/SQLiteStudio3/guiSQLiteStudio/formview.cpp index 6e62786..0ebb9aa 100644 --- a/SQLiteStudio3/guiSQLiteStudio/formview.cpp +++ b/SQLiteStudio3/guiSQLiteStudio/formview.cpp @@ -143,7 +143,7 @@ bool FormView::isCurrentRowModifiedInGrid() QModelIndex startIdx = model->index(gridView->getCurrentIndex().row(), 0); QModelIndex endIdx = model->index(gridView->getCurrentIndex().row(), model->columnCount() - 1); - return model->findIndexes(startIdx, endIdx, SqlQueryItem::DataRole::UNCOMMITED, true, 1).size() > 0; + return model->findIndexes(startIdx, endIdx, SqlQueryItem::DataRole::UNCOMMITTED, true, 1).size() > 0; } void FormView::updateDeletedState() @@ -250,7 +250,7 @@ void FormView::createActions() void FormView::setupDefShortcuts() { - setShortcutContext({ROLLBACK, COMMIT, NEXT_ROW, PREV_ROW, FIRST_ROW, LAST_ROW, INSERT_ROW, DELETE_ROW}, Qt::WidgetWithChildrenShortcut); + setShortcutContext({ROLLBACK, COMMIT, NEXT_ROW, PREV_ROW, FIRST_ROW, LAST_ROW, INSERT_ROW, DELETE_ROW}, Qt::ApplicationShortcut); BIND_SHORTCUTS(FormView, Action); } diff --git a/SQLiteStudio3/guiSQLiteStudio/formview.h b/SQLiteStudio3/guiSQLiteStudio/formview.h index a6a9708..7f84e4f 100644 --- a/SQLiteStudio3/guiSQLiteStudio/formview.h +++ b/SQLiteStudio3/guiSQLiteStudio/formview.h @@ -16,10 +16,10 @@ class DataWidgetMapper; CFG_KEY_LIST(FormView, QObject::tr("Data form view"), CFG_KEY_ENTRY(COMMIT, Qt::CTRL + Qt::Key_Return, QObject::tr("Commit changes for current row")) CFG_KEY_ENTRY(ROLLBACK, Qt::CTRL + Qt::Key_Backspace, QObject::tr("Rollback changes for current row")) - CFG_KEY_ENTRY(FIRST_ROW, Qt::CTRL + Qt::Key_PageUp, QObject::tr("Go to first row on current page")) - CFG_KEY_ENTRY(NEXT_ROW, Qt::CTRL + Qt::Key_Right, QObject::tr("Go to next row")) - CFG_KEY_ENTRY(PREV_ROW, Qt::CTRL + Qt::Key_Left, QObject::tr("Go to previous row")) - CFG_KEY_ENTRY(LAST_ROW, Qt::CTRL + Qt::Key_PageDown, QObject::tr("Go to last row on current page")) + CFG_KEY_ENTRY(FIRST_ROW, Qt::CTRL + Qt::ALT + Qt::Key_PageUp, QObject::tr("Go to first row on current page")) + CFG_KEY_ENTRY(NEXT_ROW, Qt::CTRL + Qt::ALT + Qt::Key_Right, QObject::tr("Go to next row")) + CFG_KEY_ENTRY(PREV_ROW, Qt::CTRL + Qt::ALT + Qt::Key_Left, QObject::tr("Go to previous row")) + CFG_KEY_ENTRY(LAST_ROW, Qt::CTRL + Qt::ALT + Qt::Key_PageDown, QObject::tr("Go to last row on current page")) CFG_KEY_ENTRY(INSERT_ROW, Qt::Key_Insert, QObject::tr("Insert new row")) CFG_KEY_ENTRY(DELETE_ROW, Qt::CTRL + Qt::Key_Delete, QObject::tr("Delete current row")) ) diff --git a/SQLiteStudio3/guiSQLiteStudio/guiSQLiteStudio.pro b/SQLiteStudio3/guiSQLiteStudio/guiSQLiteStudio.pro index be3e876..60a85ff 100644 --- a/SQLiteStudio3/guiSQLiteStudio/guiSQLiteStudio.pro +++ b/SQLiteStudio3/guiSQLiteStudio/guiSQLiteStudio.pro @@ -31,10 +31,10 @@ QMAKE_CXXFLAGS += -pedantic DEFINES += GUISQLITESTUDIO_LIBRARY -TRANSLATIONS += translations/guiSQLiteStudio_it.ts \ +TRANSLATIONS += translations/guiSQLiteStudio_de.ts \ + translations/guiSQLiteStudio_it.ts \ translations/guiSQLiteStudio_zh_CN.ts \ translations/guiSQLiteStudio_sk.ts \ - translations/guiSQLiteStudio_de.ts \ translations/guiSQLiteStudio_ru.ts \ translations/guiSQLiteStudio_pt_BR.ts \ translations/guiSQLiteStudio_fr.ts \ @@ -418,3 +418,5 @@ DISTFILES += \ + + diff --git a/SQLiteStudio3/guiSQLiteStudio/guiSQLiteStudio.qrc b/SQLiteStudio3/guiSQLiteStudio/guiSQLiteStudio.qrc index 97ed77f..0970b86 100644 --- a/SQLiteStudio3/guiSQLiteStudio/guiSQLiteStudio.qrc +++ b/SQLiteStudio3/guiSQLiteStudio/guiSQLiteStudio.qrc @@ -5,8 +5,12 @@ translations/guiSQLiteStudio_fr.qm translations/guiSQLiteStudio_sk.qm translations/guiSQLiteStudio_zh_CN.qm + translations/guiSQLiteStudio_de.qm general.css + + + diff --git a/SQLiteStudio3/guiSQLiteStudio/iconmanager.h b/SQLiteStudio3/guiSQLiteStudio/iconmanager.h index 7547712..2bc63a2 100644 --- a/SQLiteStudio3/guiSQLiteStudio/iconmanager.h +++ b/SQLiteStudio3/guiSQLiteStudio/iconmanager.h @@ -168,6 +168,8 @@ class GUI_API_EXPORT IconManager : public QObject DEF_ICON(RESULTS_IN_TAB, "results_in_tab") DEF_ICON(ROLLBACK, "rollback") DEF_ICON(SAVE_SQL_FILE, "save_sql_file") + DEF_ICON(SEARCH, "search") + DEF_ICON(SEARCH_AND_REPLACE, "search_and_replace") DEF_ICON(SET_NULL, "set_null") DEF_ICON(SORT_COLUMNS, "sort_columns") DEF_ICON(SORT_COUNT_01, "sort_cnt_01") diff --git a/SQLiteStudio3/guiSQLiteStudio/icons.qrc b/SQLiteStudio3/guiSQLiteStudio/icons.qrc index 6c08cc6..8819276 100644 --- a/SQLiteStudio3/guiSQLiteStudio/icons.qrc +++ b/SQLiteStudio3/guiSQLiteStudio/icons.qrc @@ -199,5 +199,7 @@ img/tag_hash_del.png img/tag_hash_edit.png img/wand.png + img/search_and_replace.png + img/search.png diff --git a/SQLiteStudio3/guiSQLiteStudio/img/search.png b/SQLiteStudio3/guiSQLiteStudio/img/search.png new file mode 100644 index 0000000..7a5ae62 Binary files /dev/null and b/SQLiteStudio3/guiSQLiteStudio/img/search.png differ diff --git a/SQLiteStudio3/guiSQLiteStudio/img/search_and_replace.png b/SQLiteStudio3/guiSQLiteStudio/img/search_and_replace.png new file mode 100644 index 0000000..a83efa5 Binary files /dev/null and b/SQLiteStudio3/guiSQLiteStudio/img/search_and_replace.png differ diff --git a/SQLiteStudio3/guiSQLiteStudio/mainwindow.cpp b/SQLiteStudio3/guiSQLiteStudio/mainwindow.cpp index 8d80277..f7bcb83 100644 --- a/SQLiteStudio3/guiSQLiteStudio/mainwindow.cpp +++ b/SQLiteStudio3/guiSQLiteStudio/mainwindow.cpp @@ -887,8 +887,8 @@ bool MainWindow::confirmQuit(const QList& instances) for (Committable* c : instances) { - if (c->isUncommited()) - dialog.addMessage(c->getQuitUncommitedConfirmMessage()); + if (c->isUncommitted()) + dialog.addMessage(c->getQuitUncommittedConfirmMessage()); } if (dialog.getMessageCount() == 0) diff --git a/SQLiteStudio3/guiSQLiteStudio/mdiwindow.cpp b/SQLiteStudio3/guiSQLiteStudio/mdiwindow.cpp index f2257c6..685e608 100644 --- a/SQLiteStudio3/guiSQLiteStudio/mdiwindow.cpp +++ b/SQLiteStudio3/guiSQLiteStudio/mdiwindow.cpp @@ -156,7 +156,7 @@ void MdiWindow::changeEvent(QEvent* event) void MdiWindow::closeEvent(QCloseEvent* e) { - if (dbBeingClosed || MAINWINDOW->isClosingApp() || !getMdiChild()->isUncommited()) + if (dbBeingClosed || MAINWINDOW->isClosingApp() || !getMdiChild()->isUncommitted()) { QMdiSubWindow::closeEvent(e); return; @@ -176,7 +176,7 @@ void MdiWindow::dbAboutToBeDisconnected(Db* db, bool& deny) if (MAINWINDOW->isClosingApp()) return; - if (getMdiChild()->isUncommited() && !confirmClose()) + if (getMdiChild()->isUncommitted() && !confirmClose()) deny = true; else dbBeingClosed = true; @@ -196,7 +196,7 @@ void MdiWindow::dbDisconnected(Db* db) bool MdiWindow::confirmClose() { - QMessageBox msgBox(QMessageBox::Question, tr("Uncommited changes"), getMdiChild()->getQuitUncommitedConfirmMessage(), QMessageBox::Yes|QMessageBox::No, this); + QMessageBox msgBox(QMessageBox::Question, tr("Uncommitted changes"), getMdiChild()->getQuitUncommittedConfirmMessage(), QMessageBox::Yes|QMessageBox::No, this); msgBox.setDefaultButton(QMessageBox::No); QAbstractButton* closeBtn = msgBox.button(QMessageBox::Yes); diff --git a/SQLiteStudio3/guiSQLiteStudio/searchtextlocator.cpp b/SQLiteStudio3/guiSQLiteStudio/searchtextlocator.cpp index ebdf2c0..7e5c2ec 100644 --- a/SQLiteStudio3/guiSQLiteStudio/searchtextlocator.cpp +++ b/SQLiteStudio3/guiSQLiteStudio/searchtextlocator.cpp @@ -69,6 +69,9 @@ int SearchTextLocator::getStartPosition() const void SearchTextLocator::setStartPosition(int value) { + if (ignoreCursorMovements) + return; + startPosition = value; initialStartPosition = value; afterDocPositionSwitch = false; @@ -148,11 +151,18 @@ void SearchTextLocator::replaceCurrent() if (lastMatchStart == -1 || lastMatchEnd == -1) return; + ignoreCursorMovements = true; + QTextCursor cursor(document); cursor.setPosition(lastMatchStart); cursor.setPosition(lastMatchEnd, QTextCursor::KeepAnchor); cursor.removeSelectedText(); cursor.insertText(replaceString); + + ignoreCursorMovements = false; + + // Adjust further lookups according to replaced lenght change. + startPosition += replaceString.length() - lookupString.length(); } bool SearchTextLocator::find(QTextDocument::FindFlags flags) diff --git a/SQLiteStudio3/guiSQLiteStudio/searchtextlocator.h b/SQLiteStudio3/guiSQLiteStudio/searchtextlocator.h index 0cfdb44..02ab9fa 100644 --- a/SQLiteStudio3/guiSQLiteStudio/searchtextlocator.h +++ b/SQLiteStudio3/guiSQLiteStudio/searchtextlocator.h @@ -49,6 +49,7 @@ class GUI_API_EXPORT SearchTextLocator : public QObject int lastMatchStart = -1; int lastMatchEnd = -1; bool afterDocPositionSwitch = false; + bool ignoreCursorMovements = false; // Config parameters QString lookupString; diff --git a/SQLiteStudio3/guiSQLiteStudio/sqleditor.cpp b/SQLiteStudio3/guiSQLiteStudio/sqleditor.cpp index 9dc85f7..c3fd257 100644 --- a/SQLiteStudio3/guiSQLiteStudio/sqleditor.cpp +++ b/SQLiteStudio3/guiSQLiteStudio/sqleditor.cpp @@ -1,4 +1,5 @@ #include "sqleditor.h" +#include "log.h" #include "uiconfig.h" #include "uiutils.h" #include "services/config.h" @@ -93,7 +94,7 @@ void SqlEditor::init() connect(this, &QWidget::customContextMenuRequested, this, &SqlEditor::customContextMenuRequested); connect(CFG_UI.Fonts.SqlEditor, SIGNAL(changed(QVariant)), this, SLOT(changeFont(QVariant))); - connect(CFG, SIGNAL(massSaveCommited()), this, SLOT(configModified())); + connect(CFG, SIGNAL(massSaveCommitted()), this, SLOT(configModified())); } void SqlEditor::removeErrorMarkers() @@ -135,10 +136,10 @@ void SqlEditor::createActions() createAction(MOVE_BLOCK_UP, tr("Move block up", "sql editor"), this, SLOT(moveBlockUp()), this); createAction(COPY_BLOCK_DOWN, tr("Copy block down", "sql editor"), this, SLOT(copyBlockDown()), this); createAction(COPY_BLOCK_UP, tr("Copy up down", "sql editor"), this, SLOT(copyBlockUp()), this); - createAction(FIND, ICONS.ACT_SEARCH, tr("Find", "sql editor"), this, SLOT(find()), this); + createAction(FIND, ICONS.SEARCH, tr("Find", "sql editor"), this, SLOT(find()), this); createAction(FIND_NEXT, tr("Find next", "sql editor"), this, SLOT(findNext()), this); createAction(FIND_PREV, tr("Find previous", "sql editor"), this, SLOT(findPrevious()), this); - createAction(REPLACE, tr("Replace", "sql editor"), this, SLOT(replace()), this); + createAction(REPLACE, ICONS.SEARCH_AND_REPLACE, tr("Replace", "sql editor"), this, SLOT(replace()), this); createAction(TOGGLE_COMMENT, tr("Toggle comment", "sql editor"), this, SLOT(toggleComment()), this); actionMap[CUT]->setEnabled(false); @@ -213,7 +214,8 @@ bool SqlEditor::handleValidObjectContextMenu(const QPoint& pos) if (!obj) return false; - QString objName = toPlainText().mid(obj->from, (obj->to - obj->from + 1)); + Dialect dialect = getDialect(); + QString objName = stripObjName(toPlainText().mid(obj->from, (obj->to - obj->from + 1)), dialect); validObjContextMenu->clear(); @@ -832,7 +834,7 @@ void SqlEditor::completerRightPressed() void SqlEditor::parseContents() { - if (document()->characterCount() > 100000) + if (document()->characterCount() > SqliteSyntaxHighlighter::MAX_QUERY_LENGTH) { if (richFeaturesEnabled) notifyWarn(tr("Contents of the SQL editor are huge, so errors detecting and existing objects highlighting are temporarily disabled.")); @@ -860,11 +862,14 @@ void SqlEditor::parseContents() } queryParser->setDialect(dialect); - queryParser->parse(sql); + if (richFeaturesEnabled) + { + queryParser->parse(sql); + checkForValidObjects(); + checkForSyntaxErrors(); + highlighter->rehighlight(); + } - checkForValidObjects(); - checkForSyntaxErrors(); - highlighter->rehighlight(); } void SqlEditor::checkForSyntaxErrors() @@ -1494,7 +1499,7 @@ void SqlEditor::mousePressEvent(QMouseEvent* e) if (obj && e->button() == Qt::LeftButton) { QString objName = toPlainText().mid(obj->from, (obj->to - obj->from + 1)); - openObject(obj->dbName, objName); + openObject(obj->dbName, stripObjName(objName, getDialect())); } } diff --git a/SQLiteStudio3/guiSQLiteStudio/sqlitesyntaxhighlighter.cpp b/SQLiteStudio3/guiSQLiteStudio/sqlitesyntaxhighlighter.cpp index e3e1950..ac8d6cf 100644 --- a/SQLiteStudio3/guiSQLiteStudio/sqlitesyntaxhighlighter.cpp +++ b/SQLiteStudio3/guiSQLiteStudio/sqlitesyntaxhighlighter.cpp @@ -12,7 +12,7 @@ SqliteSyntaxHighlighter::SqliteSyntaxHighlighter(QTextDocument *parent) : setupFormats(); setupMapping(); setCurrentBlockState(regulartTextBlockState); - connect(CFG, SIGNAL(massSaveCommited()), this, SLOT(setupFormats())); + connect(CFG, SIGNAL(massSaveCommitted()), this, SLOT(setupFormats())); } void SqliteSyntaxHighlighter::setSqliteVersion(int version) @@ -125,7 +125,7 @@ QString SqliteSyntaxHighlighter::getPreviousStatePrefix(TextBlockState textBlock void SqliteSyntaxHighlighter::highlightBlock(const QString &text) { - if (text.length() <= 0) + if (text.length() <= 0 || document()->characterCount() > MAX_QUERY_LENGTH) return; // Reset to default @@ -265,7 +265,6 @@ void SqliteSyntaxHighlighter::setCreateTriggerContext(bool value) createTriggerContext = value; } - bool SqliteSyntaxHighlighter::getObjectLinksEnabled() const { return objectLinksEnabled; diff --git a/SQLiteStudio3/guiSQLiteStudio/sqlitesyntaxhighlighter.h b/SQLiteStudio3/guiSQLiteStudio/sqlitesyntaxhighlighter.h index 0696d02..48649d4 100644 --- a/SQLiteStudio3/guiSQLiteStudio/sqlitesyntaxhighlighter.h +++ b/SQLiteStudio3/guiSQLiteStudio/sqlitesyntaxhighlighter.h @@ -74,6 +74,8 @@ class GUI_API_EXPORT SqliteSyntaxHighlighter : public QSyntaxHighlighter bool getCreateTriggerContext() const; void setCreateTriggerContext(bool value); + static constexpr int MAX_QUERY_LENGTH = 100000; + protected: void highlightBlock(const QString &text); diff --git a/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_de.qm b/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_de.qm index 597e95f..f1dac43 100644 Binary files a/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_de.qm and b/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_de.qm differ diff --git a/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_de.ts b/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_de.ts index ba0392e..c597ce1 100644 --- a/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_de.ts +++ b/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_de.ts @@ -1,6 +1,6 @@ - + AboutDialog @@ -432,8 +432,12 @@ + Collations editor window has uncommitted modifications. + + + Collations editor window has uncommited modifications. - Der Editorfür Kollationen enthält nicht gespeicherte Änderungen. + Der Editorfür Kollationen enthält nicht gespeicherte Änderungen. @@ -906,7 +910,7 @@ but it's okay to use it. ConfigDialog - + Configuration Konfiguration @@ -997,215 +1001,234 @@ but it's okay to use it. Datenbearbeitung - + Number of data rows per page: Anzahl an Datenzeilen pro Seite: - - + + <p>When the data is read into grid view columns width is automatically adjusted. This value limits the initial width for the adjustment, but user can still resize the column manually over this limit.</p> <p>Wenn Daten in das Ergebnisfenster eingelesen werden, dann wird die Breite der Spalten dabei automatisch angepasst. Dieser Wert begrenzt maximale Breite für die automatische Breitenanpassung. Der Anwender kann die Spaltenbreite jedoch manuell über dieses Limit verbreitern.</p> - + Limit initial data column width to (in pixels): Begrenze die initiale Spaltenbreite im Ergebnisfenster auf (Pixel): - + + Keep NULL value when entering empty value + + + + <p>When this is enabled and user holds mouse pointer over a cell in any data view (query results, a table data, a view data) a tooltip will appear with details about the cell - it includes details like column data type, constraints, ROWID and others.</p> - + Show column and row details tooltip in data view - + + <p>When editing a cell which used to have NULL value and entering empty string as new value, then this option determinates whether the new value should remain NULL (have this option enabled), or should it be overwritten with empty string value (have this option disabled).</p> + + + + + <html><head/><body><p>Enable this to always enforce DEFAULT value when committing a NULL value for a column that has DEFAULT value defined, even though the column is allowed to contain NULL values.</p><p>Disable this option to use DEFAULT value exclusively when NULL value is committed for column with NOT NULL constraint.</p></body></html> + + + + + Use DEFAULT value (if defined), when committing NULL value + + + + Inserting new row in data grid Neue Zeile im Gitternetz des Datenfensters hinzufügen - + Before currently selected row Vor der derzeitig ausgewählten Zeile - + After currently selected row Nach der derzeitig ausgewählten Zeile - + At the end of data view Am Ende der Datenfensters - + <p>When enabled, Table Windows will show up with the data tab, instead of the structure tab.</p> <p>Wenn aktiviert, wird der Reiter "Daten" anstelle des Reiters "Struktur" angezeigt beim öffnen eines Tabellenfensters angezeigt.</p> - + <p>When enabled the "Data" tab will be placed as first tab in every Table Window, instead of being at second place.</p> <p>Wenn aktiviert, wird der Reiter "Daten" als erster Reiter angezeigt für jedes Tabellenfenster, anstelle an zweiter Stelle.</p> - + Place data tab as first tab in a Table Window Den Reiter Daten als ersten Reiter im Tabellenfenster anzeigen - + <p>When enabled, View Windows will show up with the data tab, instead of the structure tab.</p> - + <p>When enabled the "Data" tab will be placed as first tab in every View Window, instead of being at second place.</p> - + Place data tab as first tab in a View Window Den Reiter Daten als ersten Reiter im View-Fenster anzeigen - + Data types Datentypen - + Available editors: Verfügbare Editoren: - + Editors selected for this data type: Für diesen Datentyp ausgewählte Editoren: - + Schema editing Schema - + Number of DDL changes kept in history. Maximale Anzahl an DDL Änderungen im Verlauf. - + DDL history size: DDL Verlaufsgröße: - Don't show DDL preview dialog when commiting schema changes - Zeige keine DDL Vorschau, wenn Schemaänderungen committed werden + Zeige keine DDL Vorschau, wenn Schemaänderungen committed werden - + SQL queries SQL Abfragen - - + + Number of queries kept in the history. Maximale Anzahl an SQL Abfragen im Verlauf. - + History size: Verlaufsgröße: - + <p>If there is more than one query in the SQL editor window, then (if this option is enabled) only a single query will be executed - the one under the keyboard insertion cursor. Otherwise all queries will be executed. You can always limit queries to be executed by selecting those queries before calling to execute.</p> <p>Wenn diese Option aktiviert ist und sich mehrere SQL Abfragen im Editorfenster befinden, dann wird nur die SQL Abfrage ausgeführt, in der sich der Cursor befindet. Ist diese Option nicht gesetzt, dann werden alle SQL Abfragen ausgeführt. Sie können die auszuführenden SQL Abfragen selbst bestimmen, indem Sie diese vor der Ausführung mit der Maus oder Tastatur markieren.</p> - + Execute only the query under the cursor Führt nur die Abfrage unter dem Cursor aus - + Updates Updates - + Automatically check for updates at startup Prüfe vor dem Start automatisch auf Updates - + Session Sitzung - + Restore last session (active MDI windows) after startup Stelle letzte Sitzung nach dem Start wieder her (aktive MDI Fenster) - + Status Field Statusfeld - + <p>When user manually closes the Status panel, this option makes sure that if any new message is printed in the Status panel it will be reopened. If it's disabled, then Status panel can only be open manually by the user from the "View" menu.</p> - + Always open Status panel when new message is printed Den Panel Status immer öffnen, wenn eine neue Meldung ausgegeben wird - + Filter shortcuts by name or key combination Filtere Tastaturkürzel nach Name oder Tastenkombination - + Action Aktion - + Key combination Tastenkombination - - + + Language Sprache - + Changing language requires application restart to take effect. Die Änderung der Sprache erfordert einen Neustart des Programms. - + Compact layout Kompaktes Layout - + <p>Compact layout reduces all margins and spacing on the UI to minimum, making space for displaying more data. It makes the interface a little bit less aesthetic, but allows to display more data at once.</p> <p>Das kompakte Layout reduziert alle Lücken und Abstände der Oberfläche auf ein Minimum, um mehr Platz für die Darstellung der Daten zu schaffen. Die Oberfläche sieht dann zwar nicht mehr sehr ästhetisch aus, aber man hat mehr Daten im Überblick.</p> - + Use compact layout Benutze kompaktes Layout @@ -1285,7 +1308,7 @@ but it's okay to use it. Zeige Systemtabellen und Indizes in der Liste an - + Table windows Tabellenfenster @@ -1294,12 +1317,12 @@ but it's okay to use it. Wenn die Option aktiviert ist, dann wird im Tabellenfenster der Reiter "Daten" angezeigt statt "Strukturen". - + Open Table Windows with the data tab for start Öffnet das Tabellenfenster mit dem Reiter "Daten" im Vordergrund - + View windows Viewfenster @@ -1308,227 +1331,244 @@ but it's okay to use it. Wenn die Option aktiviert ist, dann wird im Viewfenster der Reiter "Daten" angezeigt statt "Strukturen". - + Open View Windows with the data tab for start Öffnet das Viewfenster mit dem Reiter "Daten" im Vordergrund - + + Don't show DDL preview dialog when committing schema changes + + + + Main window dock areas Dockingbereiche des Hauptfensters - + Left and right areas occupy corners Linke und rechte Bereiche belegen die Ecken - + Top and bottom areas occupy corners Obere und untere Bereiche belegen die Ecken - + Hide built-in plugins Verberge eingebaute Plugins - + Current style: Aktueller Stil: - + Preview Vorschau - + Enabled Aktiviert - + Disabled Deaktiviert - + Active formatter plugin Aktives Formatierungsplugin - + SQL editor font Schriftart des SQL Editors - + Database list font Schriftart der Datenbankliste - + Database list additional label font Zusätzliche Bezeichnungen in der Datenbankliste - + Data view font Schriftart der Ergebnisansicht - + Status field font Schriftart des Statusfelds - + SQL editor colors Farben des SQL Editors - + Current line background Hintergrundfarbe der aktuellen Zeile - + <p>SQL strings are enclosed with single quote characters.</p> <p>SQL Zeichenketten sind mit einfachen Anführungszeichen umschlossen.</p> - + String foreground Vordergrundfarbe von Zeichenketten - + <p>Bind parameters are placeholders for values yet to be provided by the user. They have one of the forms:</p><ul><li>:param_name</li><li>$param_name</li><li>@param_name</li><li>?</li></ul> <p>Bind Parameter sind Platzhalter für Werte, die der Anwender eingibt. Sie haben dabei eine der folgenden Formen:</p><ul><li>:param_name</li><li>$param_name</li><li>@param_name</li><li>?</li></ul> - + Bind parameter foreground Vordergrundfarbe von Bind Parametern - + Highlighted parenthesis background Hintergrundfarbe von hervorgehobener Klammern - + <p>BLOB values are binary values represented as hexadecimal numbers, like:</p><ul><li>X'12B4'</li><li>x'46A2F4'</li></ul> <p>BLOB Werte sind hexadezimale Werte wie z.B.:</p><ul><li>X'12B4'</li><li>x'46A2F4'</li></ul> - + BLOB value foreground Vordergrundfarbe von BLOB Werten - + Regular foreground Reguläre Vordergrundfarbe - + Line numbers area background Hintergrundfarbe der Zeilennummernleiste - + Keyword foreground Vordergrundfarbe von Schlüsselwörtern - + Number foreground Vordergrundfarbe von Ziffern - + Comment foreground Vordergrundfarbe von Kommentaren - + <p>Valid objects are name of tables, indexes, triggers, or views that exist in the SQLite database.</p> <p>Gültige Objekte sind Namen von Tabellen, Indizes, Triggern oder Views die in der SQLite Datenbank existieren.</p> - + Valid objects foreground Vordergrundfarbe von gültigen Objekten - + Data view colors Farben der Ergebnisansicht - + + <p>Any data changes will be outlined with this color, until they're committed to the database.</p> + + + + + Uncommitted data outline color + + + + + <p>In case of error while committing data changes, the problematic cell will be outlined with this color.</p> + + + <p>Any data changes will be outlined with this color, until they're commited to the database.</p> - <p>Jede Datenänderung wird mit dieser Farbe kenntlich gemacht, bis die geänderten Daten in die Datenbank zurückgeschrieben worden sind.</p> + <p>Jede Datenänderung wird mit dieser Farbe kenntlich gemacht, bis die geänderten Daten in die Datenbank zurückgeschrieben worden sind.</p> - Uncommited data outline color - Rahmenfarbe von nicht gespeicherten Daten + Rahmenfarbe von nicht gespeicherten Daten - <p>In case of error while commiting data changes, the problematic cell will be outlined with this color.</p> - <p>Tritt beim Speichern einer Änderung ein Problem auf, dann wird die problematische Zelle mit dieser Farbe markiert.</p> + <p>Tritt beim Speichern einer Änderung ein Problem auf, dann wird die problematische Zelle mit dieser Farbe markiert.</p> - + Commit error outline color Rahmenfarbe für fehlerhafte Daten - + NULL value foreground Vordergrundfarbe für NULL Werte - + Deleted row background Hintergrundfarbe von gelöschten Zeilen - + Database list colors Farben der Datenbankliste - + <p>Additional labels are those which tell you SQLite version, number of objects deeper in the tree, etc.</p> <p>Zusätzliche Bezeichnungen sind solche, die z.B. die SQLite Version oder die Anzahl an Einträgen in einer Baumliste usw. anzeigen.</p> - + Additional labels foreground Vordergrundfarbe für zusätzliche Bezeichnungen - + Status field colors Farben des Statusfelds - + Information message foreground Vordergrundfarbe für Infomeldungen - + Warning message foreground Vordergrundfarbe für Warnmeldungen - + Error message foreground Vordergrundfarbe für Fehlermeldungen @@ -2020,22 +2060,21 @@ Das Aufrufen anderer Seiten ist erst nach Abschluss der Zählung möglich.Datenbanktreiber - Generate automatically - Automatisch generieren + Automatisch generieren - + Options Optionen - + Permanent (keep it in configuration) Permanent (in der Konfiguration behalten) - + Test connection Verbindung testen @@ -2046,7 +2085,7 @@ Das Aufrufen anderer Seiten ist erst nach Abschluss der Zählung möglich. - + File Datei @@ -2056,28 +2095,27 @@ Das Aufrufen anderer Seiten ist erst nach Abschluss der Zählung möglich.Name (in der Liste) - Generate name basing on file path - Leitet den Namen vom Dateipfad ab + Leitet den Namen vom Dateipfad ab - + <p>Enable this if you want the database to be stored in configuration file and restored every time SQLiteStudio is started.</p> aasfd <p>Wenn diese Option aktiviert ist, wird die Datenbank in der Konfiguration gespeichert und bei jedem Start von SQLiteStudio wieder hergestellt.</p> - + Browse for existing database file on local computer Lokalen Computer nach Datenbankdateien durchsuchen - + Browse Durchsuchen - + Enter an unique database name. Geben Sie einen eindeutigen Datenbanknamen ein. @@ -2087,29 +2125,32 @@ Das Aufrufen anderer Seiten ist erst nach Abschluss der Zählung möglich.Der Name wird bereits benutzt, bitte geben Sie einen freien, eindeutigen Namen ein. - + + <p>Automatic name generation was disabled, becuase the name was edited manually. To restore automatic generation please erase contents of the name field.</p> + + + + Enter a database file path. Geben Sie einen Dateipfad für die Datenbank ein. - + This database is already on the list under name: %1 Die Datenbank ist bereits unter folgendem Namen in der Liste enthalten: %1 - + Select a database type. Wählen Sie einen Datebanktypen aus. - Auto-generated - Automatisch generiert + Automatisch generiert - Type the name - Geben Sie den Namen ein + Geben Sie den Namen ein @@ -2398,7 +2439,7 @@ Das Aufrufen anderer Seiten ist erst nach Abschluss der Zählung möglich. - + Erase table data Tabellendaten löschen @@ -2419,55 +2460,65 @@ Das Aufrufen anderer Seiten ist erst nach Abschluss der Zählung möglich.Abfrage für Tabelle generieren - - + + Create group Gruppe erstellen - + Group name Gruppenname - + Entry with name %1 already exists in group %2. Der Eintrag mit Namen %1 existiert bereits in der Gruppe %2. - + Delete group Gruppe löschen - + Are you sure you want to delete group %1? All objects from this group will be moved to parent group. Sind Sie sicher, dass Sie die Gruppe %1 löschen möchten? Alle Objekte in dieser Gruppe werden in die übergeordnete Gruppe verschoben. - + Are you sure you want to remove database '%1' from the list? Sind Sie sicher, dass Sie die Datenbank '%1' aus der Liste entfernen möchten? - + Are you sure you want to remove following databases from the list: %1 Sind Sie sicher, dass Sie folgende Datenbanken aus der Liste entfernen möchten: %1 - + Remove database Datenbank entfernen - + Vacuum (%1) Vacuum (%1) + + + Autoincrement value for table '%1' has been reset successfully. + + + + + Are you sure you want to delete all data from table(s): %1? + + Delete database Datenbank löschen @@ -2478,14 +2529,14 @@ Alle Objekte in dieser Gruppe werden in die übergeordnete Gruppe verschoben.Sind Sie sicher, dass Sie die Datenbank '%1' entfernen möchten? - - + + Cannot import, because no import plugin is loaded. Der Import kann nicht durchgeführt werden, da kein Import Plugin geladen ist. - - + + Cannot export, because no export plugin is loaded. Export fehlgeschlagen, da kein Export Plugins geladen sind. @@ -2498,67 +2549,65 @@ Alle Objekte in dieser Gruppe werden in die übergeordnete Gruppe verschoben.VACUUM erfolgreich abgeschlossen. - + Integrity check (%1) Integritätsprüfung (%1) - + Reset autoincrement Autoincrement zurücksetzen - + Are you sure you want to reset autoincrement value for table '%1'? Sind Sie sicher, dass Sie den Autoincrement Wert für die Tabelle '%1' zurücksetzen möchten? - + An error occurred while trying to reset autoincrement value for table '%1': %2 Ein Fehler ist aufgetreten beim Zurücksetzen des Autoincrementwertes für die Tabelle '%1': %2 - Autoincrement value for table '%1' has been reset successfly. - Autoincrementwert für die Tabelle '%1' wurde erfolgreich zurückgesetzt. + Autoincrementwert für die Tabelle '%1' wurde erfolgreich zurückgesetzt. - Are you sure you want to delete all data from table '%1'? - Sind Sie sicher, dass Sie alle Daten der Tabelle '%1' löschen möchten? + Sind Sie sicher, dass Sie alle Daten der Tabelle '%1' löschen möchten? - + An error occurred while trying to delete data from table '%1': %2 Beim Löschen der Daten aus Tabelle '%1' ist folgender Fehler aufgetreten: %2 - + All data has been deleted for table '%1'. Es wurden alle Daten aus Tabelle '%1' gelöscht. - + Following objects will be deleted: %1. Folgende Objekte werden gelöscht: %1. - + Following databases will be removed from list: %1. Folgende Datenbanken werden aus der Liste entfernt: %1. - + Remainig objects from deleted group will be moved in place where the group used to be. Die aus der gelöschten Gruppe verbleibenden Objekte werden an die Position der gelöschten Gruppe verschoben. - + %1<br><br>Are you sure you want to continue? %1<br><br>Sind Sie sicher, dass Sie fortfahren möchten? - + Delete objects Objekte löschen @@ -2825,78 +2874,82 @@ Bitte geben Sie einen neuen, eindeutigen Namen an oder drücken Sie %1, um den V View aus der Abfrage erstellen - + Previous database Vorherige Datenbank - + Next database Nächste Datenbank - + Show next tab sql editor Nächsten Reiter zeigen - + Show previous tab sql editor Vorherigen Reiter zeigen - + Focus results below sql editor Fokus auf die Ergebnisse unten - + Focus SQL editor above sql editor Fokus auf den SQL Editor oben - + Active database (%1/%2) Aktive Datenbank (%1/%2) - + Query finished in %1 second(s). Rows affected: %2 Abfrage in %1 Sekunde(n) abgeschlossen. %2 Zeile(n) betroffen - + Query finished in %1 second(s). Abfrage in %1 Sekunde(n) abgeschlossen. - + Clear execution history Lösche Ausführungsverlauf - + Are you sure you want to erase the entire SQL execution history? This cannot be undone. Sind Sie sicher, dass Sie den gesamten SQL Ausführungsverlauf löschen möchten? Dieser Vorgang kann nicht rückgängig gemacht werden. - + Cannot export, because no export plugin is loaded. Es kann nicht exportiert werden, da kein Export Plugin geladen ist. - + No database selected in the SQL editor. Cannot create a view for unknown database. Es ist keine Datenbank im SQL Editor selektiert. Für eine unbekannte Datenbank kann kein View erzeugt werden. - + + Editor window "%1" has uncommitted data. + + + Editor window "%1" has uncommited data. - Das Editorfenster "%1" hat ungespeicherte Daten. + Das Editorfenster "%1" hat ungespeicherte Daten. @@ -3356,8 +3409,12 @@ Bitte geben Sie einen neuen, eindeutigen Namen an oder drücken Sie %1, um den V + Functions editor window has uncommitted modifications. + + + Functions editor window has uncommited modifications. - Der Editorfür Funktionen enthält nicht gespeicherte Änderungen. + Der Editorfür Funktionen enthält nicht gespeicherte Änderungen. @@ -3956,9 +4013,13 @@ Bitte geben Sie einen neuen, eindeutigen Namen an oder drücken Sie %1, um den V MdiWindow - Uncommited changes - Nicht gespeicherte Änderungen + Nicht gespeicherte Änderungen + + + + Uncommitted changes + @@ -4892,9 +4953,13 @@ Bitte geben Sie einen neuen, eindeutigen Namen an oder drücken Sie %1, um den V QuitConfirmDialog - Uncommited changes - Nicht gespeicherte Änderungen + Nicht gespeicherte Änderungen + + + + Uncommitted changes + @@ -4994,180 +5059,180 @@ find next SqlEditor - + Cut sql editor Ausschneiden - + Copy sql editor Kopieren - + Paste sql editor Einfügen - + Delete sql editor Löschen - + Select all sql editor Alles auswählen - + Undo sql editor Rückgängig - + Redo sql editor Wiederholen - + Complete sql editor Komplett - + Format SQL sql editor SQL formatieren - + Save SQL to file sql editor SQL in Datei speichern - + Select file to save SQL sql editor SQL aus Datei laden - + Load SQL from file sql editor Zeile löschen - + Delete line sql editor Zeile löschen - + Move block down sql editor Block nach unten verschieben - + Move block up sql editor Block nach oben verschieben - + Copy block down sql editor Block nach unten kopieren - + Copy up down sql editor "up down" ??? Muss geklärt werden! Kopiere auf ab - + Find sql editor Finden - + Find next sql editor Nächster Fund - + Find previous sql editor Vorheriger Fund - + Replace sql editor Ersetzen - + Toggle comment sql editor Kommentar umschalten - + Saved SQL contents to file: %1 SQL Inhalte in Datei speichern: %1 - + Syntax completion can be used only when a valid database is set for the SQL editor. Die Funktion Autovervollständigung kann nur genutzt werden, wenn eine gültige Datenbank für den SQL Editor gewählt wurde. - + Contents of the SQL editor are huge, so errors detecting and existing objects highlighting are temporarily disabled. Der Text im SQL Editor ist sehr groß, daher wurde die Syntaxkontrolle und die farbliche Hervorhebung von Objekten vorübergehend deaktiviert. - + Save to file In Datei speichern - + Could not open file '%1' for writing: %2 Die Datei '%1' kann nicht für Schreibzugriffe geöffnet werden: %2 - + SQL scripts (*.sql);;All files (*) SQL Skripte (*.sql);;Alle Dateien (*) - + Open file Datei öffnen - + Could not open file '%1' for reading: %2 Die Datei '%1' kann nicht für Lesezugriffe geöffnet werden: %2 - + Reached the end of document. Hit the find again to restart the search. Das Dokumentenende wurde erreicht. Drücken Sie 'Nächster Fund', um die Suche am Dokumentenanfang fortzusetzen. @@ -5199,12 +5264,11 @@ find next Bedingungen: - This cell is not editable, because: %1 - Diese Zelle kann nicht editiert werden, weil: %1 + Diese Zelle kann nicht editiert werden, weil: %1 - + Cannot load the data for a cell that refers to the already closed database. Es können keine Daten für eine Zelle dargestellt werden, die eine bereits geschlossene Datenbank referenziert. @@ -5212,18 +5276,36 @@ find next SqlQueryItemDelegate - - Cannot edit this cell. Details: %2 - Die Zelle kann nicht editiert. Details: %2 + Die Zelle kann nicht editiert. Details: %2 - + The row is marked for deletion. Diese Zeile ist zum Löschen markiert. - + + + + + + Cannot edit this cell. Details: %1 + Die Zelle kann nicht editiert. Details: %1 + + + + + Structure of this table has changed since last data was loaded. Reload the data to proceed. + + + + + Editing a huge contents in an inline cell editor is not a good idea. It can become slow and inconvenient. It's better to edit such big contents in a Form View, or in popup editor (available under rick-click menu). + + + + Foreign key for column %2 has more than %1 possible values. It's too much to display in drop down list. You need to edit value manually. @@ -5231,69 +5313,85 @@ find next SqlQueryModel - - + + Only one query can be executed simultaneously. Es kann nur eine Abfrage gleichzeitig ausgeführt werden. - Uncommited data - Nicht gespeicherte Daten + Nicht gespeicherte Daten - There are uncommited data changes. Do you want to proceed anyway? All uncommited changes will be lost. - Es gibt ungespeicherte Änderungen. Möchten Sie wirklich fortfahren? Alle Änderungen werden dann verloren gehen. + Es gibt ungespeicherte Änderungen. Möchten Sie wirklich fortfahren? Alle Änderungen werden dann verloren gehen. - + Cannot commit the data for a cell that refers to the already closed database. Es können keine Daten für eine Zelle gespeichert werden, die eine bereits geschlossene Datenbank referenziert. - + Could not begin transaction on the database. Details: %1 Es kann keine Transaktion auf der Datenbank gestartet werden. Details: %1 - An error occurred while commiting the transaction: %1 - Fehler beim Committen der Transaktion: %1 + Fehler beim Committen der Transaktion: %1 - + An error occurred while rolling back the transaction: %1 Fehler beim Rollback der Transaktion: %1 - + Tried to commit a cell which is not editable (yet modified and waiting for commit)! This is a bug. Please report it. Es wurde versucht eine nicht editierbare Zelle zu committen (derzeit modifiziert und auf das Commit wartend)! Dies ist ein Fehler den Sie melden sollten. - An error occurred while commiting the data: %1 - Fehler beim Committen der Daten: %1 + Fehler beim Committen der Daten: %1 - - + + Uncommitted data + + + + + There are uncommitted data changes. Do you want to proceed anyway? All uncommitted changes will be lost. + + + + + An error occurred while committing the transaction: %1 + + + + + An error occurred while committing the data: %1 + + + + + Error while executing SQL query on database '%1': %2 Fehler beim Ausführen der SQL-Abfrage auf der Datenbank '%1': %2 - + Error while loading query results: %1 Fehler beim Laden der Abfrageergebnisse: %1 - + Insert multiple rows Mehrere Zeilen einfügen - + Number of rows to insert: Anzahl an Zeilen zum Einfügen: @@ -5301,117 +5399,117 @@ find next SqlQueryView - + Go to referenced row in... - + Copy Kopieren - + Copy as... Kopieren als... - + Paste Einfügen - + Paste as... Einfügen als... - + Set NULL values NULL Wert setzen - + Erase values Werte löschen - + Edit value in editor Wert im Editor bearbeiten - + Commit Commit - + Rollback Rollback - + Commit selected cells Gewählte Zellen speichern - + Rollback selected cells Gewählte Zellen wiederherstellen - + Define columns to sort by Sortierspalten definieren - + Remove custom sorting Benutzerdefinierte Sortierung entfernen - + Insert row Zeile einfügen - + Insert multiple rows Mehrere Zeilen einfügen - + Delete selected row Gewählte Zeile löschen - + Generate query for selected cells - + No items selected to paste clipboard contents to. Es sind keine Elemente selektiert in die der Inhalt der Zwischenablage eingefügt werden könnte. - + Go to referenced row in table '%1' - + table '%1' - + Referenced row (%1) - + Edit value Werte editieren @@ -5419,12 +5517,16 @@ find next SqlTableModel - Error while commiting new row: %1 - Fehler beim Committen der neuen Zeile: %1 + Fehler beim Committen der neuen Zeile: %1 - + + Error while committing new row: %1 + + + + Error while deleting row from table %1: %2 Fehler beim Löschen der Zeile aus Tabelle %1: %2 @@ -5687,7 +5789,7 @@ NULL - + Data @@ -5712,409 +5814,417 @@ NULL DDL - + Export table table window - + Import data to table table window - + Populate table table window Tabelle füllen - + Refresh structure table window - + Commit structure changes table window - + Rollback structure changes table window - + Add column table window - + Edit column table window - - + + Delete column table window - + Move column up table window Spalte nach oben verschieben - + Move column down table window Spalte nach unten verschieben - + Create similar table table window Erzeuge identische Tabelle - + Reset autoincrement value table window - + Add table constraint table window - + Edit table constraint table window - + Delete table constraint table window - + Move table constraint up table window - + Move table constraint down table window - + Add table primary key table window - + Add table foreign key table window - + Add table unique constraint table window - + Add table check constraint table window - + Refresh index list table window - + Create index table window - + Edit index table window - + Delete index table window Index löschen - + Refresh trigger list table window Trigger Liste aktualisieren - + Create trigger table window - + Edit trigger table window - + Delete trigger table window Trigger löschen - + Are you sure you want to delete column '%1'? table window - + Following problems will take place while modifying the table. Would you like to proceed? table window - + Table modification table window - + Could not load data for table %1. Error details: %2 - + Could not process the %1 table correctly. Unable to open a table window. - + Could not restore window %1, because no database or table was stored in session for this window. - + Could not restore window '%1', because no database or table was stored in session for this window. - + Could not restore window '%1', because database %2 could not be resolved. - + Could not restore window '%1'', because the table %2 doesn't exist in the database %3. - + New table %1 - - Commited changes for table '%1' successfly. + + Committed changes for table '%1' successfully. + + + + + Committed changes for table '%1' (named before '%2') successfully. - - Commited changes for table '%1' (named before '%2') successfly. + + Autoincrement value for table '%1' has been reset successfully. - + + Uncommitted changes + + + + + There are uncommitted structure modifications. You cannot browse or edit data until you have table structure settled. +Do you want to commit the structure, or do you want to go back to the structure tab? + + + + + Table window "%1" has uncommitted structure modifications and data. + + + + + Table window "%1" has uncommitted data. + + + + + Table window "%1" has uncommitted structure modifications. + + + + Could not commit table structure. Error message: %1 table window - + Reset autoincrement Autoincrement zurücksetzen - + Are you sure you want to reset autoincrement value for table '%1'? Sind Sie sicher, dass Sie den Autoincrement Wert für die Tabelle '%1' zurücksetzen möchten? - + An error occurred while trying to reset autoincrement value for table '%1': %2 Ein Fehler ist aufgetreten beim Zurücksetzen des Autoincrementwertes für die Tabelle '%1': %2 - Autoincrement value for table '%1' has been reset successfly. - Autoincrementwert für die Tabelle '%1' wurde erfolgreich zurückgesetzt. + Autoincrementwert für die Tabelle '%1' wurde erfolgreich zurückgesetzt. - + Empty name - + A blank name for the table is allowed in SQLite, but it is not recommended. Are you sure you want to create a table with blank name? - + Cannot create a table without at least one column. - + Cannot create table %1, if it has no primary key defined. Either uncheck the %2, or define a primary key. - + Cannot use autoincrement for primary key when %1 clause is used. Either uncheck the %2, or the autoincrement in a primary key. - + Are you sure you want to delete table constraint '%1'? table window - + Delete constraint table window Bedingung löschen - + Cannot export, because no export plugin is loaded. - + Cannot import, because no import plugin is loaded. - Uncommited changes - Nicht gespeicherte Änderungen + Nicht gespeicherte Änderungen - - There are uncommited structure modifications. You cannot browse or edit data until you have table structure settled. -Do you want to commit the structure, or do you want to go back to the structure tab? - - - - + Go back to structure tab - + Commit modifications and browse data. - + Name table window indexes Name - + Unique table window indexes - + Columns table window indexes Spalten - + Partial index condition table window indexes Partieller Indexzustand - + Name table window triggers Name - + Event table window triggers - + Condition table window triggers - + Details table window triggers Details - - - Table window "%1" has uncommited structure modifications and data. - - - - - Table window "%1" has uncommited data. - - - - - Table window "%1" has uncommited structure modifications. - - TriggerColumnsDialog @@ -6128,6 +6238,16 @@ Do you want to commit the structure, or do you want to go back to the structure Triggering columns: + + + Select all + Alles auswählen + + + + Deselect all + Auswahl aufheben + TriggerDialog @@ -6219,13 +6339,13 @@ Do you want to commit the structure, or do you want to go back to the structure - + Error trigger dialog Fehler - + An error occurred while executing SQL statements: %1 Fehler beim Ausführen des folgenden SQL Statments: @@ -6274,7 +6394,7 @@ Do you want to commit the structure, or do you want to go back to the structure - + Data @@ -6316,224 +6436,228 @@ Do you want to commit the structure, or do you want to go back to the structure - + Refresh the view view window - + Commit the view changes view window - + Rollback the view changes view window - + Explicit column names - + Generate output column names automatically basing on result columns of the view. - + Add column view window - + Edit column view window - + Delete column view window - + Move column up view window Spalte nach oben verschieben - + Move column down view window Spalte nach unten verschieben - + Refresh trigger list view window Trigger Liste aktualisieren - + Create new trigger view window Trigger erstellen - + Edit selected trigger view window Trigger editieren - + Delete selected trigger view window Trigger löschen - - - View window "%1" has uncommited structure modifications and data. - - - View window "%1" has uncommited data. + View window "%1" has uncommitted structure modifications and data. - View window "%1" has uncommited structure modifications. + View window "%1" has uncommitted data. - - Could not load data for view %1. Error details: %2 + + View window "%1" has uncommitted structure modifications. - - Uncommited changes - Nicht gespeicherte Änderungen + + Uncommitted changes + - - There are uncommited structure modifications. You cannot browse or edit data until you have the view structure settled. + + There are uncommitted structure modifications. You cannot browse or edit data until you have the view structure settled. Do you want to commit the structure, or do you want to go back to the structure tab? - - Go back to structure tab + + Committed changes for view '%1' successfully. - - Commit modifications and browse data. + + Committed changes for view '%1' (named before '%2') successfully. - - Commited changes for view '%1' successfly. + + Could not load data for view %1. Error details: %2 - - Commited changes for view '%1' (named before '%2') successfly. + Uncommited changes + Nicht gespeicherte Änderungen + + + + Go back to structure tab + + + + + Commit modifications and browse data. - + Could not commit view changes. Error message: %1 view window - + Override columns - + Currently defined columns will be overriden. Do you want to continue? - + Could not determinate columns returned from the view. The query is problably incomplete or contains errors. - + Name view window triggers Name - + Instead of view window triggers - + Condition view window triggers - + Details table window triggers Details - + Could not process the %1 view correctly. Unable to open a view window. - + Empty name - + A blank name for the view is allowed in SQLite, but it is not recommended. Are you sure you want to create a view with blank name? - + The SELECT statement could not be parsed. Please correct the query and retry. Details: %1 - + The view could not be modified due to internal SQLiteStudio error. Please report this! - + The view code could not be parsed properly for execution. This is a SQLiteStudio's bug. Please report it. - + Following problems will take place while modifying the view. Would you like to proceed? view window - + View modification view window diff --git a/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_es.ts b/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_es.ts index 715333f..2771e77 100644 --- a/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_es.ts +++ b/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_es.ts @@ -1,6 +1,6 @@ - + AboutDialog @@ -429,7 +429,7 @@ - Collations editor window has uncommited modifications. + Collations editor window has uncommitted modifications. @@ -903,7 +903,7 @@ but it's okay to use it. ConfigDialog - + Configuration @@ -993,215 +993,215 @@ but it's okay to use it. - + Number of data rows per page: - - + + <p>When the data is read into grid view columns width is automatically adjusted. This value limits the initial width for the adjustment, but user can still resize the column manually over this limit.</p> - + Limit initial data column width to (in pixels): - + <p>When this is enabled and user holds mouse pointer over a cell in any data view (query results, a table data, a view data) a tooltip will appear with details about the cell - it includes details like column data type, constraints, ROWID and others.</p> - + Show column and row details tooltip in data view - + + <p>When editing a cell which used to have NULL value and entering empty string as new value, then this option determinates whether the new value should remain NULL (have this option enabled), or should it be overwritten with empty string value (have this option disabled).</p> + + + + Inserting new row in data grid - + Before currently selected row - + After currently selected row - + At the end of data view - + <p>When enabled, Table Windows will show up with the data tab, instead of the structure tab.</p> - + <p>When enabled the "Data" tab will be placed as first tab in every Table Window, instead of being at second place.</p> - + Place data tab as first tab in a Table Window - + <p>When enabled, View Windows will show up with the data tab, instead of the structure tab.</p> - + <p>When enabled the "Data" tab will be placed as first tab in every View Window, instead of being at second place.</p> - + Place data tab as first tab in a View Window - + Data types - + Available editors: - + Editors selected for this data type: - + Schema editing - + Number of DDL changes kept in history. - + DDL history size: - - Don't show DDL preview dialog when commiting schema changes - - - - + SQL queries - - + + Number of queries kept in the history. - + History size: - + <p>If there is more than one query in the SQL editor window, then (if this option is enabled) only a single query will be executed - the one under the keyboard insertion cursor. Otherwise all queries will be executed. You can always limit queries to be executed by selecting those queries before calling to execute.</p> - + Execute only the query under the cursor - + Updates - + Automatically check for updates at startup - + Session - + Restore last session (active MDI windows) after startup - + Status Field - + <p>When user manually closes the Status panel, this option makes sure that if any new message is printed in the Status panel it will be reopened. If it's disabled, then Status panel can only be open manually by the user from the "View" menu.</p> - + Always open Status panel when new message is printed - + Filter shortcuts by name or key combination - + Action - + Key combination - - + + Language - + Changing language requires application restart to take effect. - + Compact layout - + <p>Compact layout reduces all margins and spacing on the UI to minimum, making space for displaying more data. It makes the interface a little bit less aesthetic, but allows to display more data at once.</p> - + Use compact layout @@ -1277,242 +1277,262 @@ but it's okay to use it. - + + Keep NULL value when entering empty value + + + + + <html><head/><body><p>Enable this to always enforce DEFAULT value when committing a NULL value for a column that has DEFAULT value defined, even though the column is allowed to contain NULL values.</p><p>Disable this option to use DEFAULT value exclusively when NULL value is committed for column with NOT NULL constraint.</p></body></html> + + + + + Use DEFAULT value (if defined), when committing NULL value + + + + Table windows - + Open Table Windows with the data tab for start - + View windows - + Open View Windows with the data tab for start - + + Don't show DDL preview dialog when committing schema changes + + + + Main window dock areas - + Left and right areas occupy corners - + Top and bottom areas occupy corners - + Hide built-in plugins - + Current style: - + Preview - + Enabled - + Disabled - + Active formatter plugin - + SQL editor font - + Database list font - + Database list additional label font - + Data view font - + Status field font - + SQL editor colors - + Current line background - + <p>SQL strings are enclosed with single quote characters.</p> - + String foreground - + <p>Bind parameters are placeholders for values yet to be provided by the user. They have one of the forms:</p><ul><li>:param_name</li><li>$param_name</li><li>@param_name</li><li>?</li></ul> - + Bind parameter foreground - + Highlighted parenthesis background - + <p>BLOB values are binary values represented as hexadecimal numbers, like:</p><ul><li>X'12B4'</li><li>x'46A2F4'</li></ul> - + BLOB value foreground - + Regular foreground - + Line numbers area background - + Keyword foreground - + Number foreground - + Comment foreground - + <p>Valid objects are name of tables, indexes, triggers, or views that exist in the SQLite database.</p> - + Valid objects foreground - + Data view colors - - <p>Any data changes will be outlined with this color, until they're commited to the database.</p> + + <p>Any data changes will be outlined with this color, until they're committed to the database.</p> - - Uncommited data outline color + + Uncommitted data outline color - - <p>In case of error while commiting data changes, the problematic cell will be outlined with this color.</p> + + <p>In case of error while committing data changes, the problematic cell will be outlined with this color.</p> - + Commit error outline color - + NULL value foreground - + Deleted row background - + Database list colors - + <p>Additional labels are those which tell you SQLite version, number of objects deeper in the tree, etc.</p> - + Additional labels foreground - + Status field colors - + Information message foreground - + Warning message foreground - + Error message foreground @@ -2003,22 +2023,17 @@ Browsing other pages will be possible after the row counting is done. - - Generate automatically - - - - + Options - + Permanent (keep it in configuration) - + Test connection @@ -2029,7 +2044,7 @@ Browsing other pages will be possible after the row counting is done. - + File @@ -2039,28 +2054,23 @@ Browsing other pages will be possible after the row counting is done. - - Generate name basing on file path - - - - + <p>Enable this if you want the database to be stored in configuration file and restored every time SQLiteStudio is started.</p> aasfd - + Browse for existing database file on local computer - + Browse - + Enter an unique database name. @@ -2070,28 +2080,23 @@ Browsing other pages will be possible after the row counting is done. - - Enter a database file path. - - - - - This database is already on the list under name: %1 + + <p>Automatic name generation was disabled, becuase the name was edited manually. To restore automatic generation please erase contents of the name field.</p> - - Select a database type. + + Enter a database file path. - - Auto-generated + + This database is already on the list under name: %1 - - Type the name + + Select a database type. @@ -2379,7 +2384,7 @@ Browsing other pages will be possible after the row counting is done. - + Erase table data @@ -2400,127 +2405,127 @@ Browsing other pages will be possible after the row counting is done. - - + + Create group - + Group name - + Entry with name %1 already exists in group %2. - + Delete group - + Are you sure you want to delete group %1? All objects from this group will be moved to parent group. - + Are you sure you want to remove database '%1' from the list? - + Are you sure you want to remove following databases from the list: %1 - + Remove database - + Vacuum (%1) - - - Cannot import, because no import plugin is loaded. + + Autoincrement value for table '%1' has been reset successfully. - - - Cannot export, because no export plugin is loaded. + + Are you sure you want to delete all data from table(s): %1? - - Integrity check (%1) + + + Cannot import, because no import plugin is loaded. - - Reset autoincrement + + + Cannot export, because no export plugin is loaded. - - Are you sure you want to reset autoincrement value for table '%1'? + + Integrity check (%1) - An error occurred while trying to reset autoincrement value for table '%1': %2 + Reset autoincrement - - Autoincrement value for table '%1' has been reset successfly. + + Are you sure you want to reset autoincrement value for table '%1'? - - Are you sure you want to delete all data from table '%1'? + + An error occurred while trying to reset autoincrement value for table '%1': %2 - + An error occurred while trying to delete data from table '%1': %2 - + All data has been deleted for table '%1'. - + Following objects will be deleted: %1. - + Following databases will be removed from list: %1. - + Remainig objects from deleted group will be moved in place where the group used to be. - + %1<br><br>Are you sure you want to continue? - + Delete objects @@ -2784,77 +2789,77 @@ Please enter new, unique name, or press '%1' to abort the operation: - + Previous database - + Next database - + Show next tab sql editor - + Show previous tab sql editor - + Focus results below sql editor - + Focus SQL editor above sql editor - + Active database (%1/%2) - + Query finished in %1 second(s). Rows affected: %2 - + Query finished in %1 second(s). - + Clear execution history - + Are you sure you want to erase the entire SQL execution history? This cannot be undone. - + Cannot export, because no export plugin is loaded. - + No database selected in the SQL editor. Cannot create a view for unknown database. - - Editor window "%1" has uncommited data. + + Editor window "%1" has uncommitted data. @@ -3311,7 +3316,7 @@ Please enter new, unique name, or press '%1' to abort the operation: - Functions editor window has uncommited modifications. + Functions editor window has uncommitted modifications. @@ -3911,7 +3916,7 @@ Please enter new, unique name, or press '%1' to abort the operation:MdiWindow - Uncommited changes + Uncommitted changes @@ -4844,7 +4849,7 @@ Please enter new, unique name, or press '%1' to abort the operation:QuitConfirmDialog - Uncommited changes + Uncommitted changes @@ -4942,179 +4947,179 @@ find next SqlEditor - + Cut sql editor - + Copy sql editor - + Paste sql editor - + Delete sql editor - + Select all sql editor - + Undo sql editor - + Redo sql editor - + Complete sql editor - + Format SQL sql editor - + Save SQL to file sql editor - + Select file to save SQL sql editor - + Load SQL from file sql editor - + Delete line sql editor - + Move block down sql editor - + Move block up sql editor - + Copy block down sql editor - + Copy up down sql editor - + Find sql editor - + Find next sql editor - + Find previous sql editor - + Replace sql editor - + Toggle comment sql editor - + Saved SQL contents to file: %1 - + Syntax completion can be used only when a valid database is set for the SQL editor. - + Contents of the SQL editor are huge, so errors detecting and existing objects highlighting are temporarily disabled. - + Save to file - + Could not open file '%1' for writing: %2 - + SQL scripts (*.sql);;All files (*) - + Open file - + Could not open file '%1' for reading: %2 - + Reached the end of document. Hit the find again to restart the search. @@ -5146,12 +5151,7 @@ find next - - This cell is not editable, because: %1 - - - - + Cannot load the data for a cell that refers to the already closed database. @@ -5159,18 +5159,32 @@ find next SqlQueryItemDelegate - - - Cannot edit this cell. Details: %2 + + The row is marked for deletion. - - The row is marked for deletion. + + + + + + Cannot edit this cell. Details: %1 + + + + + + Structure of this table has changed since last data was loaded. Reload the data to proceed. + + + + + Editing a huge contents in an inline cell editor is not a good idea. It can become slow and inconvenient. It's better to edit such big contents in a Form View, or in popup editor (available under rick-click menu). - + Foreign key for column %2 has more than %1 possible values. It's too much to display in drop down list. You need to edit value manually. @@ -5178,69 +5192,69 @@ find next SqlQueryModel - - + + Only one query can be executed simultaneously. - - Uncommited data + + Cannot commit the data for a cell that refers to the already closed database. - - There are uncommited data changes. Do you want to proceed anyway? All uncommited changes will be lost. + + Could not begin transaction on the database. Details: %1 - - Cannot commit the data for a cell that refers to the already closed database. + + An error occurred while rolling back the transaction: %1 - - Could not begin transaction on the database. Details: %1 + + Tried to commit a cell which is not editable (yet modified and waiting for commit)! This is a bug. Please report it. - - An error occurred while commiting the transaction: %1 + + Uncommitted data - - An error occurred while rolling back the transaction: %1 + + There are uncommitted data changes. Do you want to proceed anyway? All uncommitted changes will be lost. - - Tried to commit a cell which is not editable (yet modified and waiting for commit)! This is a bug. Please report it. + + An error occurred while committing the transaction: %1 - - An error occurred while commiting the data: %1 + + An error occurred while committing the data: %1 - - + + Error while executing SQL query on database '%1': %2 - + Error while loading query results: %1 - + Insert multiple rows - + Number of rows to insert: @@ -5248,117 +5262,117 @@ find next SqlQueryView - + Go to referenced row in... - + Copy - + Copy as... - + Paste - + Paste as... - + Set NULL values - + Erase values - + Edit value in editor - + Commit - + Rollback - + Commit selected cells - + Rollback selected cells - + Define columns to sort by - + Remove custom sorting - + Insert row - + Insert multiple rows - + Delete selected row - + Generate query for selected cells - + No items selected to paste clipboard contents to. - + Go to referenced row in table '%1' - + table '%1' - + Referenced row (%1) - + Edit value @@ -5366,12 +5380,12 @@ find next SqlTableModel - - Error while commiting new row: %1 + + Error while committing new row: %1 - + Error while deleting row from table %1: %2 @@ -5634,7 +5648,7 @@ NULL - + Data @@ -5659,409 +5673,409 @@ NULL - + Export table table window - + Import data to table table window - + Populate table table window - + Refresh structure table window - + Commit structure changes table window - + Rollback structure changes table window - + Add column table window - + Edit column table window - - + + Delete column table window - + Move column up table window - + Move column down table window - + Create similar table table window - + Reset autoincrement value table window - + Add table constraint table window - + Edit table constraint table window - + Delete table constraint table window - + Move table constraint up table window - + Move table constraint down table window - + Add table primary key table window - + Add table foreign key table window - + Add table unique constraint table window - + Add table check constraint table window - + Refresh index list table window - + Create index table window - + Edit index table window - + Delete index table window - + Refresh trigger list table window - + Create trigger table window - + Edit trigger table window - + Delete trigger table window - + Are you sure you want to delete column '%1'? table window - + Following problems will take place while modifying the table. Would you like to proceed? table window - + Table modification table window - + Could not load data for table %1. Error details: %2 - + Could not process the %1 table correctly. Unable to open a table window. - + Could not restore window %1, because no database or table was stored in session for this window. - + Could not restore window '%1', because no database or table was stored in session for this window. - + Could not restore window '%1', because database %2 could not be resolved. - + Could not restore window '%1'', because the table %2 doesn't exist in the database %3. - + New table %1 - - Commited changes for table '%1' successfly. + + Committed changes for table '%1' successfully. - - Commited changes for table '%1' (named before '%2') successfly. + + Committed changes for table '%1' (named before '%2') successfully. - + + Autoincrement value for table '%1' has been reset successfully. + + + + + Uncommitted changes + + + + + There are uncommitted structure modifications. You cannot browse or edit data until you have table structure settled. +Do you want to commit the structure, or do you want to go back to the structure tab? + + + + + Table window "%1" has uncommitted structure modifications and data. + + + + + Table window "%1" has uncommitted data. + + + + + Table window "%1" has uncommitted structure modifications. + + + + Could not commit table structure. Error message: %1 table window - + Reset autoincrement - + Are you sure you want to reset autoincrement value for table '%1'? - + An error occurred while trying to reset autoincrement value for table '%1': %2 - - Autoincrement value for table '%1' has been reset successfly. - - - - + Empty name - + A blank name for the table is allowed in SQLite, but it is not recommended. Are you sure you want to create a table with blank name? - + Cannot create a table without at least one column. - + Cannot create table %1, if it has no primary key defined. Either uncheck the %2, or define a primary key. - + Cannot use autoincrement for primary key when %1 clause is used. Either uncheck the %2, or the autoincrement in a primary key. - + Are you sure you want to delete table constraint '%1'? table window - + Delete constraint table window - + Cannot export, because no export plugin is loaded. - + Cannot import, because no import plugin is loaded. - - Uncommited changes - - - - - There are uncommited structure modifications. You cannot browse or edit data until you have table structure settled. -Do you want to commit the structure, or do you want to go back to the structure tab? - - - - + Go back to structure tab - + Commit modifications and browse data. - + Name table window indexes - + Unique table window indexes - + Columns table window indexes - + Partial index condition table window indexes - + Name table window triggers - + Event table window triggers - + Condition table window triggers - + Details table window triggers - - - Table window "%1" has uncommited structure modifications and data. - - - - - Table window "%1" has uncommited data. - - - - - Table window "%1" has uncommited structure modifications. - - TriggerColumnsDialog @@ -6075,6 +6089,16 @@ Do you want to commit the structure, or do you want to go back to the structure Triggering columns: + + + Select all + + + + + Deselect all + + TriggerDialog @@ -6166,13 +6190,13 @@ Do you want to commit the structure, or do you want to go back to the structure - + Error trigger dialog - + An error occurred while executing SQL statements: %1 @@ -6220,7 +6244,7 @@ Do you want to commit the structure, or do you want to go back to the structure - + Data @@ -6262,224 +6286,224 @@ Do you want to commit the structure, or do you want to go back to the structure - + Refresh the view view window - + Commit the view changes view window - + Rollback the view changes view window - + Explicit column names - + Generate output column names automatically basing on result columns of the view. - + Add column view window - + Edit column view window - + Delete column view window - + Move column up view window - + Move column down view window - + Refresh trigger list view window - + Create new trigger view window - + Edit selected trigger view window - + Delete selected trigger view window - - - View window "%1" has uncommited structure modifications and data. - - - View window "%1" has uncommited data. + View window "%1" has uncommitted structure modifications and data. - View window "%1" has uncommited structure modifications. + View window "%1" has uncommitted data. - - Could not load data for view %1. Error details: %2 + + View window "%1" has uncommitted structure modifications. - - Uncommited changes + + Uncommitted changes - - There are uncommited structure modifications. You cannot browse or edit data until you have the view structure settled. + + There are uncommitted structure modifications. You cannot browse or edit data until you have the view structure settled. Do you want to commit the structure, or do you want to go back to the structure tab? - - Go back to structure tab + + Committed changes for view '%1' successfully. - - Commit modifications and browse data. + + Committed changes for view '%1' (named before '%2') successfully. - - Commited changes for view '%1' successfly. + + Could not load data for view %1. Error details: %2 - - Commited changes for view '%1' (named before '%2') successfly. + + Go back to structure tab - + + Commit modifications and browse data. + + + + Could not commit view changes. Error message: %1 view window - + Override columns - + Currently defined columns will be overriden. Do you want to continue? - + Could not determinate columns returned from the view. The query is problably incomplete or contains errors. - + Name view window triggers - + Instead of view window triggers - + Condition view window triggers - + Details table window triggers - + Could not process the %1 view correctly. Unable to open a view window. - + Empty name - + A blank name for the view is allowed in SQLite, but it is not recommended. Are you sure you want to create a view with blank name? - + The SELECT statement could not be parsed. Please correct the query and retry. Details: %1 - + The view could not be modified due to internal SQLiteStudio error. Please report this! - + The view code could not be parsed properly for execution. This is a SQLiteStudio's bug. Please report it. - + Following problems will take place while modifying the view. Would you like to proceed? view window - + View modification view window diff --git a/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_fr.qm b/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_fr.qm index 2602532..71a632e 100644 Binary files a/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_fr.qm and b/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_fr.qm differ diff --git a/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_fr.ts b/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_fr.ts index 015a070..8a46630 100644 --- a/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_fr.ts +++ b/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_fr.ts @@ -31,7 +31,7 @@ Icon directories - Répertoires d’images + Répertoires des images @@ -41,18 +41,22 @@ Plugin directories - Répertoires des plugin + Répertoires des plugins Application directory - Répertoire de l’application + Répertoire de l’application SQLite 3 version: + + SQLite 3 version : + Version SQLite : + Configuration directory @@ -61,22 +65,22 @@ Qt version: - Version Qt: + Version Qt : Portable distribution. - Portable distribution. + Version portable MacOS X application boundle distribution. - MacOS X application boundle distribution. + MacOS X application boundle distribution Operating system managed distribution. - Operating system managed distribution. + Operating system managed distribution @@ -86,7 +90,7 @@ <h3>Table of contents:</h3><ol>%2</ol> - <h3>Table des matières:</h3><ol>%2</ol> + <h3>Table des matières : </h3><ol>%2</ol> @@ -104,18 +108,18 @@ E-mail address - Adresse E-mail + Adresse électronique Log in - S’identifier + S’identifier Short description - Courte description + Description brève @@ -135,7 +139,7 @@ Operating system - Système d’exploitation + Système d’exploitation @@ -150,18 +154,18 @@ You can see all your reported bugs and ideas by selecting menu '%1' and then '%2'. - Vous pouvez voir tous bugs et idées que vous avez rapportées en sélectionnant le menu « %1 » puis « %2 ». + Vous pouvez voir tous bugs et idées que vous avez rapportées en sélectionnant le menu « %1 » puis « %2 ». A bug report sent successfully. - Rapport de bug envoyé avec succès. + Rapport de bogue envoyé avec succès An error occurred while sending a bug report: %1 %2 - Une erreur est survenue lors de l’envoi du rapport de bug: %1 + Une erreur est survenue lors de l’envoi du rapport de bogue : %1 %2 @@ -173,13 +177,13 @@ An idea proposal sent successfully. - L’idée proposée à été envoyée avec succès. + L’idée proposée à été envoyée avec succès. An error occurred while sending an idea proposal: %1 %2 - Une erreeur est survenu lors de l’envoi de l’idée proposée: %1 %2 + Une erreeur est survenu lors de l’envoi de l’idée proposée : %1 %2 @@ -229,22 +233,22 @@ Providing true email address will make it possible to contact you regarding your report. To learn more, press 'help' button on the right side. - En fournissant un mail existant il sera possible de vous contacterau sujet du rapport. Pour en savoir plus, clic sur le bouton « help » sur le coté droit. + En fournissant un mail existant il sera possible de vous contacterau sujet du rapport. Pour en savoir plus, clic sur le bouton « help » sur le coté droit. Enter vaild e-mail address, or log in. - Entrez un mail valide ou connectez-vous. + Entrez un email valide ou connectez-vous. Short description requires at least 10 characters, but not more than 100. Longer description can be entered in the field below. - Une description courte nécessite au moins 10 caractères , mais pas plus de 100. La longueur de la description ne peut être contenue dans ce champ. + Une description courte nécessite au moins 10 caractères, mais pas plus de 100. La longueur de la description ne peut être contenue dans ce champ. Long description requires at least 30 characters. - Une descption longue require au moins 30 caractères. + Une descption longue require au moins 30 caractères. @@ -275,12 +279,12 @@ Clear reports history - Vider l’historique de rapports + Vider l’historique de rapports Delete selected entry - Supprimer l’entrée sélectionnée + Supprimer l’entrée sélectionnée @@ -303,12 +307,12 @@ Login: - Identification: + Identification : Password: - Mot de passe: + Mot de passe : @@ -356,12 +360,12 @@ Collation name: - Nom de regroupements: + Nom de regroupements : Implementation language: - Language d’implémentation: + Language d’implémentation : @@ -376,17 +380,17 @@ Register in following databases: - Inscrire dans les bases de données suivantes: + Inscrire dans les bases de données suivantes : Implementation code: - Code d’inplémentation: + Code d’inplémentation : Collations editor - Editeur de regroupement + Éditeur de regroupement @@ -396,7 +400,7 @@ Rollback all collation changes - annuler toutes les modifications de regroupement + Annuler toutes les modifications de regroupement @@ -421,17 +425,21 @@ Pick the implementation language. - Prendre le language d’inplémentation. + Prendre le language d’inplémentation. Enter a non-empty implementation code. - Saississez un nom, non vide, de language d’implémentation. + Saississez un nom, non vide, de language d’implémentation. + Collations editor window has uncommitted modifications. + + + Collations editor window has uncommited modifications. - L’éditeur de regroupement n’as pas enregistré les modifications. + L’éditeur de regroupement n’as pas enregistré les modifications. @@ -447,12 +455,12 @@ Collation name: - Nom de la jointure: + Nom de la jointure : Named constraint: - Constante nomée: + Constante nommée : @@ -470,22 +478,22 @@ Default value: - Valeur par défaut: + Valeur par défaut : Named constraint: - Contrainte nommée: + Contrainte nommée : Enter a default value expression. - Saississez l’expression d’une valeur par défaut. + Saississez l’expression d’une valeur par défaut. Invalid default value expression: %1 - Invalide expression d’une valeur par défaut: %1 + Invalide expression d’une valeur par défaut : %1 @@ -518,17 +526,17 @@ Data type: - Type de données: + Type de données : Column name: - Nom de colonne: + Nom de colonne : Size: - Taille: + Taille : @@ -554,7 +562,7 @@ Foreign Key - Clé étranère + Clef étrangère @@ -574,7 +582,7 @@ Primary Key - Clé primaire + Clef primaire @@ -587,95 +595,110 @@ Mode avancé - + Add constraint column dialog Ajouter une contrainte - + Edit constraint column dialog Editer la contrainte - - + + Delete constraint column dialog Supprimer la contrainte - + Move constraint up column dialog Monter la contrainte - + Move constraint down column dialog Descendre la contrainte - + Add a primary key column dialog - Ajouter une clé primaire + Ajouter une clef primaire - + Add a foreign key column dialog - Ajouter une clé étrangère + Ajouter une clef étrangère - + Add an unique constraint column dialog Ajouter une contrainte unique - + Add a check constraint column dialog Ajouter un contrôle de la contrainte - + Add a not null constraint column dialog Ajouter une contrainte non NULL - + Add a collate constraint column dialog Ajouter un commentaire à la contrainte - + Add a default constraint column dialog Ajouter une contrainte par défaut - + Are you sure you want to delete constraint '%1'? column dialog - Etes-vous sûr de vouloir supprimer la contrainte « %1 » ? + Êtes-vous sûr de vouloir supprimer la contrainte « %1 » ? - + Correct the constraint's configuration. Corrigez la configuration de la contrainte. - + This constraint is not officially supported by SQLite 2, but it's okay to use it. - Cette contrainte n’est pas supportée officiellement par SQLite 2, -mais c’est OK pour l’utiliser. + Cette contrainte n’est pas supportée officiellement par SQLite 2, +mais c’est OK pour l’utiliser. + + + + Scale is not allowed for INTEGER PRIMARY KEY columns. + + + + + Precision cannot be defined without the scale. + + + + + Precision is not allowed for INTEGER PRIMARY KEY columns. + @@ -704,12 +727,12 @@ mais c’est OK pour l’utiliser. Foreign table: - Table étrangère: + Table étrangère : Foreign column: - Colonne étrangère: + Colonne étrangère : @@ -719,12 +742,12 @@ mais c’est OK pour l’utiliser. Deferred foreign key - Clé étrangère refusée + Clef étrangère refusée Named constraint - Contrainte nomée + Contrainte nommée @@ -752,33 +775,33 @@ mais c’est OK pour l’utiliser. Autoincrement - Autoincrémentation + Auto-incrémentation Sort order: - ordre de tri: + Ordre de tri : Named constraint: - Contrainte nommée: + Contrainte nommée : On conflict: - Sur conflit: + Sur conflit : Enter a name of the constraint. - Saississez le nom d’une contrainte. + Saississez le nom d’une contrainte. Autoincrement (only for %1 type columns) column primary key - Autoincrémentation(seulement pour %1 colonne type) + Auto-incrémentation (seulement pour %1 colonne type) @@ -786,12 +809,12 @@ mais c’est OK pour l’utiliser. Named constraint: - + Contrainte nommée : On conflict: - Sur conflit: + Sur conflit : @@ -805,25 +828,25 @@ mais c’est OK pour l’utiliser. Column: %1 completer statusbar - Colonne: %1 + Colonne : %1 Table: %1 completer statusbar - Table: %1 + Table : %1 Index: %1 completer statusbar - Index: %1 + Index : %1 Trigger: %1 completer statusbar - Déclencheur: %1 + Déclencheur : %1 @@ -835,31 +858,31 @@ mais c’est OK pour l’utiliser. Database: %1 completer statusbar - Base de données: %1 + Base de données : %1 Keyword: %1 completer statusbar - Mon clé: %1 + Mot-clef : %1 Function: %1 completer statusbar - Fonction: %1 + Fonction : %1 Operator: %1 completer statusbar - Opérateur: %1 + Opérateur : %1 String completer statusbar - Chainge + Chaîne de caractères @@ -877,614 +900,721 @@ mais c’est OK pour l’utiliser. Collation: %1 completer statusbar - Regroupement: %1 + Regroupement : %1 Pragma function: %1 completer statusbar - Fonction Pragma: %1 + Fonction Pragma : %1 ConfigDialog - + Configuration Configuration - + Search Recherche - + General Général - + Keyboard shortcuts Raccourcis clavier - + Look & feel Aspet - + Style Style - + Fonts Polices - + Colors Couleurs - + Plugins Plugins - + Code formatters Formatage code - + Data browsing Navigation données - + Data editors - Editeur données + Éditeur de données - + Data browsing and editing - Navigateur et editeur données + Navigateur et éditeur de données - + Number of data rows per page: - Nombre de lignes de données par page: + Nombre de lignes de données par page : - - + + <p>When the data is read into grid view columns width is automatically adjusted. This value limits the initial width for the adjustment, but user can still resize the column manually over this limit.</p> - <p>Lorsque les données sont lues dans le tableau la largeur est automatiquement ajustée. Cette valeur limite la largeur initialepour l’ajustement, mais l’utilisateur peut recadrer les colonnes manuellement audessus de cette limite.</p> + <p>Lorsque les données sont lues dans le tableau, la largeur est automatiquement ajustée. Cette valeur limite la largeur initiale pour l’ajustement, mais l’utilisateur peut recadrer les colonnes manuellement au-dessus de cette limite.</p> - + Limit initial data column width to (in pixels): - Lilite initial de la largeur de la colonne de données (en pixel): + Limite initiale de la largeur de la colonne de données (en pixel) : - - Inserting new row in data grid + + <p>When editing a cell which used to have NULL value and entering empty string as new value, then this option determinates whether the new value should remain NULL (have this option enabled), or should it be overwritten with empty string value (have this option disabled).</p> - - Before currently selected row + + <html><head/><body><p>Enable this to always enforce DEFAULT value when committing a NULL value for a column that has DEFAULT value defined, even though the column is allowed to contain NULL values.</p><p>Disable this option to use DEFAULT value exclusively when NULL value is committed for column with NOT NULL constraint.</p></body></html> + + + + + Use DEFAULT value (if defined), when committing NULL value + + + + + Inserting new row in data grid - - - - General.InsertRowPlacement + + Before currently selected row - + After currently selected row - + At the end of data view - + + <p>When enabled, Table Windows will show up with the data tab, instead of the structure tab.</p> + + + + + <p>When enabled the "Data" tab will be placed as first tab in every Table Window, instead of being at second place.</p> + + + + + Place data tab as first tab in a Table Window + + + + + <p>When enabled, View Windows will show up with the data tab, instead of the structure tab.</p> + + + + Data types Types de données - + Available editors: - Editeurs disponibles: + Éditeurs disponibles : - + Editors selected for this data type: - Editeur sélectionné pour ce type de données: + Éditeur sélectionné pour ce type de données : - + Schema editing Edition de schéma - + Number of DDL changes kept in history. - Nombre de DDL modifiés gardés dans l’historique. + Nombre de DDL modifiés gardés dans l’historique. - + DDL history size: - Dimension de l’historique DDL: + Dimension de l’historique DDL : - Don't show DDL preview dialog when commiting schema changes - Ne pas montrer la présualisation DDL pendant l’enregistrement de schéma modifié + Ne pas montrer la présualisation DDL pendant l’enregistrement du schéma modifié - + SQL queries Requêtes SQL - - + + Number of queries kept in the history. - Nombre de requêtes gardées dans l’historique. + Nombre de requêtes gardées dans l’historique. - + History size: - Dimension de l’historique: + Dimension de l’historique : - + <p>If there is more than one query in the SQL editor window, then (if this option is enabled) only a single query will be executed - the one under the keyboard insertion cursor. Otherwise all queries will be executed. You can always limit queries to be executed by selecting those queries before calling to execute.</p> - <p>S’il y a plus d’une requête dans l’éditeur d’SQL, alors (si cette option est permise) seulement une seule requête sera exécutée -cellesous le curseur d’insertion. Autrement toutes les requêtes seront exécutées. Vous pouvez limiter le nombre de requêtes devant être exécutées en sélectionnant ces requêtes avant leur exécution.</p> + <p>S’il y a plus d’une requête dans l’éditeur SQL, alors (si cette option est permise) seulement une seule requête sera exécutée -cellesous le curseur d’insertion. Autrement toutes les requêtes seront exécutées. Vous pouvez limiter le nombre de requêtes devant être exécutées en sélectionnant ces requêtes avant leur exécution.</p> - + Execute only the query under the cursor Exécuter seulement la requête sous le curseur - + Updates Mises à jour - + Automatically check for updates at startup Contrôle automatique des mises à jour au lancement - + Session Session - + Restore last session (active MDI windows) after startup - Restaurer la dernière session(Fenêtre MDI active) après lancement + Restaurer la dernière session (Fenêtre MDI active) après lancement - + Filter shortcuts by name or key combination Filtre par nom raccourci ou combinaison de touches - + Action Action - + Key combination Combinaison de touches - - + + Language Langage - + Changing language requires application restart to take effect. - Le changement de langage requiére le redemarrage de l’application pour prendre effet. + Le changement de langage requiére le redemarrage de l’application pour prendre effet. - + Compact layout - + Présentation compacte - + <p>Compact layout reduces all margins and spacing on the UI to minimum, making space for displaying more data. It makes the interface a little bit less aesthetic, but allows to display more data at once.</p> - + Use compact layout - + Utiliser la présentation compacte - General.CompactLayout - + Général.PrésentationCompacte - + + Database list Liste de base de données - + If switched off, then columns will be sorted in the order they are typed in CREATE TABLE statement. - Sur off, les colonnes seront triées dans l’ordre de saisie de l’instruction CREATE TABLE. + Sur off, les colonnes seront triées dans l’ordre de saisie de l’instruction CREATE TABLE. - + Sort table columns alphabetically Ordre de tri alpha de la colonne - + Expand tables node when connected to a database Déployez le noeud des tables lors de la connexion de la base de données - + <p>Additional labels are those displayed next to the names on the databases list (they are blue, unless configured otherwise). Enabling this option will result in labels for databases, invalid databases and aggregated nodes (column group, index group, trigger group). For more labels see options below.<p> <p>Les labels supplémentaires sont ceux montrés à côté des noms dans la liste de bases de données ( bleus,sauf autre configaration). Permettre cette option aboutira aux lablels pour des bases de données, des bases de données invalides et des noeuds (colonnes, index, déclancheur). Pour plus de labels voir des options ci-dessous.<p> - + Display additional labels on the list - Afficher des labels supplémentairesà la liste + Afficher des labels supplémentaires à la liste - + For regular tables labels will show number of columns, indexes and triggers for each of tables. Pour des tables courantes les labels montrerons le nombre der colonnes, index et déclencheurs pour chaque tables. - + Display labels for regular tables Afficher les labels pour les tables courantes - + Virtual tables will be marked with a 'virtual' label. - Les tables vituelles seront marquées avec un label « virtuel ». + Les tables vituelles seront marquées avec un label « virtuel ». - + Display labels for virtual tables Afficher les labels pour les tables virtuelles - + Expand views node when connected to a database Etendre le noeud des vues lorsque la base de données est connectée - + If this option is switched off, then objects will be sorted in order they appear in sqlite_master table (which is in order they were created) - Si cette option est déactivée, les objets seront triés pour qu’ ils apparaissent dans la table sqlite_master (dans l’ordre de création) + Si cette option est déactivée, les objets seront triés pour qu’ ils apparaissent dans la table sqlite_master (dans l’ordre de création) - + Sort objects (tables, indexes, triggers and views) alphabetically - Tri d’objets (tables, index, déclancheurs et vues) en alpha + Tri d’objets (tables, index, déclancheurs et vues) en alpha - + Display system tables and indexes on the list Afficher les tables système et index dans la liste - + + Database dialog window + + + + + <p>When adding new database it is marked to be "permanent" (stored in configuration) by default. Checking this option makes every new database to NOT be "permanent" by default.</p> + + + + + Do not mark database to be "permanent" by default + + + + + <p>When this option is enabled, then files dropped from file manager onto database list will be automatically added to the list, bypassing standard database dialog. If for various reasons automatic process fails, then standard dialog will be presented to the user.</p> + + + + + Try to bypass dialog completly when dropping database file onto the list + + + + + Keep NULL value when entering empty value + + + + + <p>When this is enabled and user holds mouse pointer over a cell in any data view (query results, a table data, a view data) a tooltip will appear with details about the cell - it includes details like column data type, constraints, ROWID and others.</p> + + + + + Show column and row details tooltip in data view + + + + Table windows Fenêtre de ta table - When enabled, Table Windows will show up with the data tab, instead of the structure tab. - Lorsque c’est permis, la fenêtre des tables sera affichée avec l’onglet des données, à la place de l’onglet structure. + Lorsque c’est permis, la fenêtre des tables sera affichée avec l’onglet des données, à la place de l’onglet structure. - + Open Table Windows with the data tab for start - Ourerture la fenêtre de table avec l’onglet des données au départ + Ourerture la fenêtre de table avec l’onglet des données au départ - + View windows Fenêtre de vue - When enabled, View Windows will show up with the data tab, instead of the structure tab. - Lorsque c’est permis, la fenêtre des vues sera affichée avec l’onglet des données, à la place de l’onglet structure. + Lorsque c’est permis, la fenêtre des vues sera affichée avec l’onglet des données, à la place de l’onglet structure. - + Open View Windows with the data tab for start - Ourerture la fenêtre de vue avec l’onglet des données au départ + Ourerture la fenêtre de vue avec l’onglet des données au départ + + + + <p>When enabled the "Data" tab will be placed as first tab in every View Window, instead of being at second place.</p> + + + + + Place data tab as first tab in a View Window + + + + + Don't show DDL preview dialog when committing schema changes + + + + + Status Field + + + + + <p>When user manually closes the Status panel, this option makes sure that if any new message is printed in the Status panel it will be reopened. If it's disabled, then Status panel can only be open manually by the user from the "View" menu.</p> + + + + + Always open Status panel when new message is printed + - + Main window dock areas - + Left and right areas occupy corners - + Top and bottom areas occupy corners - + Hide built-in plugins Cacher des plugins incorporés - + Current style: - Style actuel: + Style actuel : - + Preview Aperçu - + Enabled En service - + Disabled Hors service - + Active formatter plugin - Plugin de formattage actf + Plugin de formattage actif - + SQL editor font - Police de l’éditeur SQL + Police de caractères de l’éditeur SQL - + Database list font - Liste des polices de base de données + Liste des polices de caractères de base de données - + Database list additional label font - Police additionel de la liste des base de données + Police de caractères additionelle de la liste des bases de données - + Data view font - Police des données de vue + Police de caractères des données de vue - + Status field font - Police du champ status + Police de caractères du champ d’état - + SQL editor colors - Couleurs de l’éditeur SQL + Couleurs de l’éditeur SQL - + Current line background Fond actuel de la ligne - + <p>SQL strings are enclosed with single quote characters.</p> <p>Les chaines SQL sont encadrées avec de caractères simple quote.</p> - + String foreground Avant plan chaine - + <p>Bind parameters are placeholders for values yet to be provided by the user. They have one of the forms:</p><ul><li>:param_name</li><li>$param_name</li><li>@param_name</li><li>?</li></ul> - <p>Les paramètres fournis par l’utilisateur sont passés par valeur. Ils ont l’une de ces formes:</p><ul><li>:param_name</li><li>$param_name</li><li>@param_name</li><li>?</li></ul> + <p>Les paramètres fournis par l’utilisateur sont passés par valeur. Ils ont l’une de ces formes : </p><ul><li>:param_name</li><li>$param_name</li><li>@param_name</li><li>?</li></ul> - + Bind parameter foreground Premier plan de paramètre de lien - + Highlighted parenthesis background Parenthèses surlignées - + <p>BLOB values are binary values represented as hexadecimal numbers, like:</p><ul><li>X'12B4'</li><li>x'46A2F4'</li></ul> - <p>les valeurs BLOB sont binaire représentés comme nombres hexadécimaux, comme:</p><ul><li>X'12B4'</li><li>x'46A2F4'</li></ul> + <p>les valeurs BLOB sont binaire représentés comme nombres hexadécimaux, comme : </p><ul><li>X'12B4'</li><li>x'46A2F4'</li></ul> - + BLOB value foreground Premier plan de valeur BLOB - + Regular foreground Avant plan courant - + Line numbers area background Zone des numéros de ligne en arrière plan - + Keyword foreground - Mot clé en avant plan + Mot-clef en avant plan - + Number foreground Nombre en avant plan - + Comment foreground Commentaire en avant plan - + <p>Valid objects are name of tables, indexes, triggers, or views that exist in the SQLite database.</p> <p>Les objets valides sont les nom de tables, index, déclencheurs, ou vues qui existent dans la base de données SQLite.</p> - + Valid objects foreground Objets valides en avant plan - + Data view colors Couleurs de vue de données - + + <p>Any data changes will be outlined with this color, until they're committed to the database.</p> + + + + + Uncommitted data outline color + + + + + <p>In case of error while committing data changes, the problematic cell will be outlined with this color.</p> + + + <p>Any data changes will be outlined with this color, until they're commited to the database.</p> - <p>Touts les modifications de données seront écrits avec cette couleur,à l’enregistrement de la base de données.</p> + <p>Toutes les modifications de données seront écrits avec cette couleur, à l’enregistrement de la base de données.</p> - Uncommited data outline color - Annulation de la couleur des données + Annulation de la couleur des données - <p>In case of error while commiting data changes, the problematic cell will be outlined with this color.</p> - <p>En cas de l’erreur à l’enregistrement des modifications de données, la cellule problématique sera indiquée avec cette couleur.</p> + <p>En cas de l’erreur à l’enregistrement des modifications de données, la cellule problématique sera indiquée avec cette couleur.</p> - + Commit error outline color - Erreur d’enregistrement du surlignage + Erreur d’enregistrement du surlignage - + NULL value foreground Valeur NULL au premier plan - + Deleted row background Ligne supprimée en arrier plan - + Database list colors Liste de couleurs des bases de données - + <p>Additional labels are those which tell you SQLite version, number of objects deeper in the tree, etc.</p> - <p>Des labels supplémentaires indique la version SQLITE, le nombre d’objets au nieau inférieur, etc.</p> + <p>Des labels supplémentaires indique la version SQLITE, le nombre d’objets au nievau inférieur, etc.</p> - + Additional labels foreground Labels additionels en avant plan - + Status field colors - Couleurs du status des champs + Couleurs du champ d’état - + Information message foreground - Message d’information devant + Message d’information devant - + Warning message foreground Warning devant - + Error message foreground - Message d’erreur devant + Message d’erreur devant Description: plugin details - Description: + Description : Category: plugin details - Catégories: + Catégories : Version: plugin details - Version: + Version : Author: plugin details - Auteur: + Auteur : Internal name: plugin details - Nom interne: + Nom interne : Dependencies: plugin details - Dépendances: + Dépendances : Conflicts: plugin details - Conflicts: + Conflicts : @@ -1492,43 +1622,43 @@ mais c’est OK pour l’utiliser. Détails plugins - + Plugins are loaded/unloaded immediately when checked/unchecked, but modified list of plugins to load at startup is not saved until you commit the whole configuration dialog. - Les plugins sont chargés/déchargés immédiatement avec vérifié/non vérifié, mais les modifications de la liste de plugins à charger au lancement ne sont pas enregistrées avant l’enregistrement de la configuration entière. + Les plugins sont chargés/déchargés immédiatement avec vérifié/non vérifié, mais les modifications de la liste de plugins à charger au lancement ne sont pas enregistrées avant l’enregistrement de la configuration entière. - + %1 (built-in) plugins manager in configuration dialog %1 (intégré) - + Details Détails - + No plugins in this category. Pas de plugins dans cette catégorie. - + Add new data type - Ajoutez un nouveau type de données + Ajouter un nouveau type de données - + Rename selected data type Renommer le type de données sélectionné - + Delete selected data type Supprimez le type de données sélectionnées - + Help for configuring data type editors Aide à la configuration des éditeurs de type de données @@ -1538,12 +1668,12 @@ mais c’est OK pour l’utiliser. The condition - La condition + Condition Named constraint: - Contrainte nommée: + Contrainte nommée : @@ -1591,13 +1721,13 @@ mais c’est OK pour l’utiliser. Primary key table constraints - Clé primaire + Clef primaire Foreign key table constraints - Clé étrangère + Clef étrangère @@ -1642,7 +1772,7 @@ mais c’est OK pour l’utiliser. Column (%1) table constraints - Colonne(%1) + Colonne (%1) @@ -1680,139 +1810,139 @@ mais c’est OK pour l’utiliser. DataView - + Filter data data view Filtre de données - + Grid view - Vue tableau + Table - + Form view - Vue formulaire + Formulaire - + Refresh table data data view Actualiser les données de la table - + First page data view Première page - + Previous page data view Page précédente - + Next page data view Page suivante - + Last page data view Dernière page - + Apply filter data view Appliquer le filtre - + Commit changes for selected cells data view Enregistrer les modifications des cellules sélectionnées - + Rollback changes for selected cells data view Annuler les modifications des celulles sélectionnées - + Show grid view of results sql editor - Afficache des résultats en tableau + Affichage des résultats en tableau - + Show form view of results sql editor Affichage des résultat en formulaire - + Filter by text data view Filtrer par texte - + Filter by the Regular Expression data view Filtrer par une expression standard - + Filter by SQL expression data view Filtrer par une expression SQL - + Tabs on top data view Onglets en haut - + Tabs at bottom data view Onglet en bas - + Place new rows above selected row data view - + Place new rows below selected row data view - + Place new rows at the end of the data view data view - + Total number of rows is being counted. Browsing other pages will be possible after the row counting is done. - Le total des lignes en cours de comptage. La navigation d’autres pages à la fin du comptage. + Le total des lignes en cours de comptage. La navigation d’autres pages à la fin du comptage. - + Row: %1 - Lignes: %1 + Lignes : %1 @@ -1830,7 +1960,7 @@ Browsing other pages will be possible after the row counting is done. Source database version: - Version de la base de données source: + Version de la base de données source : @@ -1840,7 +1970,7 @@ Browsing other pages will be possible after the row counting is done. Target version: - Version cible: + Version cible : @@ -1850,12 +1980,12 @@ Browsing other pages will be possible after the row counting is done. Target file: - Fichier cible: + Fichier cible : Name of the new database: - Nom de la nouvelle base de données: + Nom de la nouvelle base de données : @@ -1870,12 +2000,12 @@ Browsing other pages will be possible after the row counting is done. Enter valid and writable file path. - Saississez le chemin d’un fichier valide et en écriture. + Saississez le chemin d’un fichier valide et en écriture. Entered file exists and will be overwritten. - Le fichier remplacera l’existant. + Le fichier remplacera l’existant. @@ -1895,7 +2025,7 @@ Browsing other pages will be possible after the row counting is done. Database %1 has been successfully converted and now is available under new name: %2 - La base de données %1 a été convertie correctement et disponible sous le nom: %2 + La base de données %1 a été convertie correctement et disponible sous le nom : %2 @@ -1905,12 +2035,12 @@ Browsing other pages will be possible after the row counting is done. Following error occurred while converting SQL statements to the target SQLite version: - L’erreur suivante est survenue lors de la conversion des déclarations SQL dans cible version SQLite: + L’erreur suivante est survenue lors de la conversion des déclarations SQL dans cible version SQLite : Would you like to ignore those errors and proceed? - Souhaitez-vous ignorer ces erreurs et continuer? + Souhaitez-vous ignorer ces erreurs et continuer ? @@ -1918,12 +2048,12 @@ Browsing other pages will be possible after the row counting is done. Database - Base de donnée + Base de données Database type - + Type de base de données @@ -1931,24 +2061,23 @@ Browsing other pages will be possible after the row counting is done. Pilote de base de données - Generate automatically - + Générer automatiquement - + Options Options - + Permanent (keep it in configuration) - + Permanent (conserver dans la configuration) - + Test connection - + Tester la connexion Name @@ -1965,30 +2094,29 @@ Browsing other pages will be possible after the row counting is done. Create new database file - + Créer un nouveau fichier de base de données - + File Fichier Name (on the list) - + Nom (dans la liste) - Generate name basing on file path - Génération du nom basé sur le chemin du fichier + Génération du nom basé sur le chemin du fichier Permanent Permanent - + <p>Enable this if you want the database to be stored in configuration file and restored every time SQLiteStudio is started.</p> aasfd <p>Autorisez-ceci si vous voulez que la base de données soit stockée dans le fichier de configuration et restauré chaque fois SQLiteStudio est lancé.</p> @@ -1998,32 +2126,37 @@ Browsing other pages will be possible after the row counting is done. Test de connexion - + Browse for existing database file on local computer - + Browse Navigateur - + Enter an unique database name. - + This name is already in use. Please enter unique name. - + + <p>Automatic name generation was disabled, becuase the name was edited manually. To restore automatic generation please erase contents of the name field.</p> + + + + Enter a database file path. - + This database is already on the list under name: %1 @@ -2032,19 +2165,13 @@ Browsing other pages will be possible after the row counting is done. Select a database type. - - - Auto-generated - - The name will be auto-generated Le non sera généré automatiquement - Type the name - Saississez le nom + Saississez le nom @@ -2057,7 +2184,7 @@ Browsing other pages will be possible after the row counting is done. Are you sure you want to delete table %1? - Confirmez la suppression de la table %1? + Confirmez la suppression de la table %1 ? @@ -2067,7 +2194,7 @@ Browsing other pages will be possible after the row counting is done. Are you sure you want to delete index %1? - Confirmez la suppression de l’indexe %1? + Confirmez la suppression de l’index %1 ? @@ -2077,7 +2204,7 @@ Browsing other pages will be possible after the row counting is done. Are you sure you want to delete trigger %1? - Confirmez la suppression du déclencheur %1? + Confirmez la suppression du déclencheur %1 ? @@ -2087,12 +2214,34 @@ Browsing other pages will be possible after the row counting is done. Are you sure you want to delete view %1? - Confirmez la suppression de la vue %1? + Confirmez la suppression de la vue %1 ? + Error while dropping %1: %2 - Erreur à l’abandon %1: %2 + Erreur à l’abandon %1 : %2 + + + + Delete objects + Objets supprimés + + + + Are you sure you want to delete following objects: +%1 + + + + + Cannot start transaction. Details: %1 + + + + + Cannot commit transaction. Details: %1 + @@ -2108,344 +2257,370 @@ Browsing other pages will be possible after the row counting is done. Filtre par nom - + Copy Copier - + Paste Coller - + Select all Tout sélectionner - + Create a group - Créer un group + Créer un groupe - + Delete the group - Supprimer un group + Supprimer le groupe - + Rename the group - Renommerr un group + Renommer le groupe - + Add a database - Ajout d’une base de données + Attacher une base de données - + Edit the database Modifier la base de données - + Remove the database - Enlever la base de données + Déatcher la base de données - + Connect to the database - Connecter la base de données + Connecter une base de données - + Disconnect from the database Déconnecter la base de données - + Import Importer - + Export the database Exporter la base de données - + Convert database type Type de base de données à convertir - + Vacuum Vaccum - + Integrity check - Contrôle d’intégrité + Contrôle d’intégrité - + Create a table Créer une table - + Edit the table - Modifier une table + Modifier la table - + Delete the table - Supprimer une table + Supprimer la table - + Export the table - Exporter une table + Exporter la table - + Import into the table - Importer dans une table + Importer dans la table - + Populate table Peupler une table - + Create similar table Créer une table identique - + Reset autoincrement sequence - Réinitialise l’autoincrémentation + Réinitialise l’auto-incrémentation - + Create an index Créer un index - + Edit the index - Modifier un index + Modifier l’index - + Delete the index - Supprimer un index + Supprimer l’index - + Create a trigger Créer un déclencheur - + Edit the trigger - modifier un déclencheur + Modifier le déclencheur - + Delete the trigger - Supprimer un déclencheur + Supprimer le déclencheur - + Create a view Créer une vue - + Edit the view - Modier une vue + Modier la vue - + Delete the view - Supprimer une vue + Supprimer la vue - + Add a column Ajouter une colonne - + Edit the column - Modifier une colonne + Modifier la colonne - + Delete the column - Supprimer une colonne + Supprimer la colonne - + Delete selected items Supprimer les objets sélectionnés - + Clear filter Vider le filtre - + Refresh all database schemas - Actualiser tous les schémas de base de données + Actualiser tous les schémas de la base de données - + Refresh selected database schema - Actualiser les schémas de la base de données sélectionnée + Actualiser les schémas sélectionné de la base de données - - + + Erase table data - - + + Database Base de données - + Grouping Groupement - - + + Generate query for table + + + + + Create group - Créer groupe + Créer un groupe - + Group name - Nom de groupe + Nom du groupe - + Entry with name %1 already exists in group %2. - L’entrée nommée %1 existe déjà dans le group %2. + L’entrée nommée %1 existe déjà dans le groupe %2. - + Delete group Supprimer le groupe - + Are you sure you want to delete group %1? All objects from this group will be moved to parent group. - Etes-vous certain de supprimer le groupe %1? + Êtes-vous certain de supprimer le groupe %1 ? Tous les objets de ce groupe seront déplacés dans le groupe parent. - + + Are you sure you want to remove database '%1' from the list? + + + + + Are you sure you want to remove following databases from the list: +%1 + + + + + Remove database + + + + + Vacuum (%1) + + + + + Autoincrement value for table '%1' has been reset successfully. + + + + + Are you sure you want to delete all data from table(s): %1? + + + Delete database - Suppression de la base de données + Suppression de la base de données - Are you sure you want to delete database '%1'? - Etes-vous certain de vouloir supprimer la base de données: « %1 » ? + Êtes-vous certain de vouloir supprimer la base de données : « %1 » ? - - + + Cannot import, because no import plugin is loaded. - Import impossible, car aucun plugin d’import n’est chargé. + Import impossible, car aucun plugin d’import n’est chargé. - - + + Cannot export, because no export plugin is loaded. - Export impossible, car aucun plugin d’import n’est chargé. + Export impossible, car aucun plugin d’import n’est chargé. - Error while executing VACUUM on the database %1: %2 - Erreur pendant l’exécution de VACCUM sur la base de données %1: %2 + Erreur pendant l’exécution de VACCUM sur la base de données %1 : %2 - VACUUM execution finished successfully. - Exécution de VACCUM terminé avec succès. + Exécution de VACCUM terminé avec succès. - + Integrity check (%1) - Contrôle d’intégrité (%1) + Contrôle d’intégrité (%1) - + Reset autoincrement - Remise à zéro de l’autoincrément + Remise à zéro de l’auto-incrément - + Are you sure you want to reset autoincrement value for table '%1'? - Etes-vous certain de vouloir réinitialiser l’outoincrémentation de la table « %1 » ? + Êtes-vous certain de vouloir réinitialiser l’auto-incrémentation de la table « %1 » ? - + An error occurred while trying to reset autoincrement value for table '%1': %2 - Une erreur est survenue pendant la réinitialisation de la valeur de l’autoincrémentation de la table « %1 » : %2 + Une erreur est survenue pendant la réinitialisation de la valeur de l’auto-incrémentation de la table « %1 » : %2 - Autoincrement value for table '%1' has been reset successfly. - La valeur de l’autoincrémentaion de la table %1 a été réinitialisé avec succès. - - - - Are you sure you want to delete all data from table « %1 » ? - + La valeur de l’auto-incrémentation de la table %1 a été réinitialisé avec succès. - + An error occurred while trying to delete data from table '%1': %2 - + All data has been deleted for table '%1'. - + Following objects will be deleted: %1. - Les objets suivant vont être supprimés: %1. + Les objets suivant vont être supprimés : %1. - + Following databases will be removed from list: %1. - Les bases de données suivantes seront enlevées de la liste: %1. + Les bases de données suivantes seront enlevées de la liste : %1. - + Remainig objects from deleted group will be moved in place where the group used to be. - Les objets restants du groupe supprimé seront déplacés où le groupe a eu l’habitude d’être. + Les objets restants du groupe supprimé seront déplacés où le groupe a eu l’habitude d’être. - + %1<br><br>Are you sure you want to continue? - %1<br><br>Etes-vous certain de vouloir continuer? + %1<br><br>Êtes-vous certain de vouloir continuer ? - + Delete objects Objets supprimés @@ -2480,132 +2655,137 @@ Tous les objets de ce groupe seront déplacés dans le groupe parent. DbTreeModel - + Database: %1 dbtree tooltip - Base de données: %1 + Base de données : %1 - + Version: dbtree tooltip - Version: + Version : - + File size: dbtree tooltip - Taille fichier: + Taille fichier : - + Encoding: dbtree tooltip - Codage: + Codage : Error details: dbtree tooltip - Détails erreur: + Détails de l’erreur : - + Error: dbtree tooltip - + Erreur : - + Table : %1 dbtree tooltip - Table: %1 + Table : %1 - + Columns (%1): dbtree tooltip - Colonnes:(%1): + Colonnes (%1): - + Indexes (%1): dbtree tooltip - Index (%1): + Indexs (%1) : - + Triggers (%1): dbtree tooltip - Déclencheurs (%1): + Déclencheurs (%1) : - + Copy Copier - + Move - Déplcer + Déplacer - + Include data Données incluses - + Include indexes Index inclus - + Include triggers Déclencheurs inclus - + Abort Abandonner - + + Could not add dropped database file '%1' automatically. Manual setup is necessary. + + + + Referenced tables Tables référencées - + Do you want to include following referenced tables as well: %1 Vous voulez inclure des tables référencées suivantes aussi : %1 - + Name conflict Conflit de nom - + Following object already exists in the target database. Please enter new, unique name, or press '%1' to abort the operation: - L’objet suivant existe déjà dans la base de données cible. -Entrez SVP un nouveau nom, unique, ou cliquez « %1 » pour d’interrompre l’opération : + L’objet suivant existe déjà dans la base de données cible. +Entrez SVP un nouveau nom, unique, ou cliquez « %1 » pour d’interrompre l’opération : - + SQL statements conversion Conversion des déclarations SQL - + Following error occurred while converting SQL statements to the target SQLite version: - L’erreur suivante est survenue en convertissant des déclarations de SQL de la version cible SQLite : + L’erreur suivante est survenue en convertissant des déclarations de SQL de la version cible SQLite : - + Would you like to ignore those errors and proceed? - Voulez-vous ignorer ces erreurs et procéder? + Voulez-vous ignorer ces erreurs et procéder ? @@ -2613,15 +2793,15 @@ Entrez SVP un nouveau nom, unique, ou cliquez « %1 » pour d’in Filter by database: - Filtre par base de données: + Filtre par base de données : -- Queries executed on database %1 (%2) -- Date and time of execution: %3 %4 - -- Requête éxécutée sur la base de données %1(%2) --- Date et heure d’exécution: %3 + -- Requête éxécutée sur la base de données %1 (%2) +-- Date et heure d’exécution : %3 %4 @@ -2677,7 +2857,7 @@ Entrez SVP un nouveau nom, unique, ou cliquez « %1 » pour d’in SQL editor %1 - Editeur SQL %1 + Éditeur SQL %1 @@ -2698,7 +2878,7 @@ Entrez SVP un nouveau nom, unique, ou cliquez « %1 » pour d’in Clear execution history sql editor - Vider l’historique d’exécution + Vider l’historique d’exécution @@ -2710,81 +2890,85 @@ Entrez SVP un nouveau nom, unique, ou cliquez « %1 » pour d’in Create view from query sql editor - Créer une vue à partir d’une requête + Créer une vue à partir d’une requête - + Previous database Base de données précédente - + Next database Base de données suivante - + Show next tab sql editor - Afficher l’onglet suivant + Afficher l’onglet suivant - + Show previous tab sql editor - Afficher l’onget précédent + Afficher l’onget précédent - + Focus results below sql editor - + Focus SQL editor above sql editor - Focus sur l’éditeur SQL ci-dessus + Focus sur l’éditeur SQL ci-dessus - + Active database (%1/%2) Base de données active (%1/%2) - + Query finished in %1 second(s). Rows affected: %2 - Requête terminée en %1 secondes. Nombre de lignes: %2 + Requête terminée en %1 secondes. Nombre de lignes : %2 - + Query finished in %1 second(s). Requête terminée en %1 seconde(s). - + Clear execution history - Supprimer l’historique d’exécution + Supprimer l’historique d’exécution - + Are you sure you want to erase the entire SQL execution history? This cannot be undone. - Etes vous certain de vouloir supprimer la totalité de l’historique d’exécution SQL? Aucun retour possible. + Êtes vous certain de vouloir supprimer la totalité de l’historique d’exécution SQL ? Aucun retour possible. - + Cannot export, because no export plugin is loaded. - Impossible d’exporter, car aucun plugin d’expertation n’est chargés. + Impossible d’exporter, car aucun plugin d’expertation n’est chargés. - + No database selected in the SQL editor. Cannot create a view for unknown database. - Aucune base de données den sélectionnée dans l’éditeur SQL. Impossible de créer une vue sur une base de données inconnue. + Aucune base de données den sélectionnée dans l’éditeur SQL. Impossible de créer une vue sur une base de données inconnue. + + + + Editor window "%1" has uncommitted data. + - Editor window "%1" has uncommited data. - Fenêtre d’éditeur "%1" n’a pas enregistrer les données. + Fenêtre d’éditeur "%1" n’a pas enregistrer les données. @@ -2797,12 +2981,12 @@ Entrez SVP un nouveau nom, unique, ou cliquez « %1 » pour d’in Following errors occured: - Les erreurs suivantes sont arrivées: + Les erreurs suivantes sont arrivées : Would you like to proceed? - Désirez-vous traiter? + Désirez-vous traiter ? @@ -2815,7 +2999,7 @@ Entrez SVP un nouveau nom, unique, ou cliquez « %1 » pour d’in What do you want to export? - Que voulez-vous exporter? + Que voulez-vous exporter ? @@ -2825,12 +3009,12 @@ Entrez SVP un nouveau nom, unique, ou cliquez « %1 » pour d’in A single table - une simple table + Une table Query results - Résultats de requête + Résultats d’une requête @@ -2855,7 +3039,7 @@ Entrez SVP un nouveau nom, unique, ou cliquez « %1 » pour d’in When this option is unchecked, then only table DDL (CREATE TABLE statement) is exported. - Lorsque cette option n’est contrôlée, alors seulement le DDL de la table (CREATE TABLE...) est exporté. + Lorsque cette option n’est contrôlée, alors seulement le DDL de la table (CREATE TABLE...) est exporté. @@ -2875,7 +3059,7 @@ Entrez SVP un nouveau nom, unique, ou cliquez « %1 » pour d’in Note, that exporting table indexes and triggers may be unsupported by some output formats. - Notez, ces index de table d’exportation et les déclencheurs peuvent être non supportées par quelques formats de sortie. + NB : les index de la table d’exportation et les déclencheurs peuvent ne pas être pris en charge par certains formats d’export. @@ -2901,7 +3085,7 @@ Entrez SVP un nouveau nom, unique, ou cliquez « %1 » pour d’in Database: - Base de données: + Base de données : @@ -2911,7 +3095,7 @@ Entrez SVP un nouveau nom, unique, ou cliquez « %1 » pour d’in Query to be executed for results: - Requête à exécuter pour des résultats: + Requête à exécuter : @@ -2921,7 +3105,7 @@ Entrez SVP un nouveau nom, unique, ou cliquez « %1 » pour d’in Export format - Format d’exportation + Format d’exportation @@ -2931,7 +3115,7 @@ Entrez SVP un nouveau nom, unique, ou cliquez « %1 » pour d’in Exported file path - Chemin du fichier d’exportation + Chemin du fichier d’exportation @@ -2946,7 +3130,7 @@ Entrez SVP un nouveau nom, unique, ou cliquez « %1 » pour d’in Exported text encoding: - Texte encodé exporté: + Texte encodé exporté : @@ -2956,7 +3140,7 @@ Entrez SVP un nouveau nom, unique, ou cliquez « %1 » pour d’in Cancel - annuler + Annuler @@ -2983,27 +3167,27 @@ Entrez SVP un nouveau nom, unique, ou cliquez « %1 » pour d’in You must provide a file name to export to. - Vous devez fournir le nom d’un fichier à exporter. + Vous devez fournir le nom d’un fichier à exporter. Path you provided is an existing directory. You cannot overwrite it. - Le chemin fourni est un répertoire existant. Vous ne pouvez pas l’écraser. + Le chemin fourni est un répertoire existant. Vous ne pouvez pas l’écraser. The directory '%1' does not exist. - Le répertoire « %1 » n’existe pas. + Le répertoire « %1 » n’existe pas. The file '%1' exists and will be overwritten. - Le fichier « %1 » existe et sera écrasé. + Le fichier « %1 » existe et sera écrasé. All files (*) - tous les fichiers(*) + Tous les fichiers(*) @@ -3013,7 +3197,7 @@ Entrez SVP un nouveau nom, unique, ou cliquez « %1 » pour d’in Internal error during export. This is a bug. Please report it. - Erreur interne pendant l’exportation. c’est un bug. SVP veuillez le reporter. + Erreur interne pendant l’exportation. c’est un bug. SVP veuillez le reporter. @@ -3075,13 +3259,13 @@ Entrez SVP un nouveau nom, unique, ou cliquez « %1 » pour d’in Insert new row form view - Insérer nouvelle ligne + Insérer une nouvelle ligne Delete current row form view - Supprimer ligne courante + Supprimer la ligne courante @@ -3094,22 +3278,22 @@ Entrez SVP un nouveau nom, unique, ou cliquez « %1 » pour d’in Function name: - Nom fonction: + Nom fonction : Implementation language: - Langage: + Langage : Type: - Type: + Type : Input arguments - Entrez arguments + Entrez arguments @@ -3129,23 +3313,23 @@ Entrez SVP un nouveau nom, unique, ou cliquez « %1 » pour d’in Register in following databases: - Enregistre les bases de données suivantes: + Enregistre les bases de données suivantes : Initialization code: - Code d’initialisation: + Code d’initialisation : Function implementation code: - Fonction de code d’implémentation: + Fonction de code d’implémentation : Final step implementation code: - Etape finale de code d’implémentaion: + Etape finale de code d’implémentaion : @@ -3185,22 +3369,22 @@ Entrez SVP un nouveau nom, unique, ou cliquez « %1 » pour d’in Rename function argument - Renomme l’argument de la fonction + Renomme l’argument de la fonction Delete function argument - Supprime l’argument de la fonction + Supprime l’argument de la fonction Move function argument up - Monte l’argument de la fonction + Monte l’argument de la fonction Move function argument down - Descend l’argument de la fonction + Descend l’argument de la fonction @@ -3225,12 +3409,12 @@ Entrez SVP un nouveau nom, unique, ou cliquez « %1 » pour d’in Per step code: - Code par étape: + Code par étape : Enter a non-empty implementation code. - Saississez un code d’implémentation non vide. + Saississez un code d’implémentation non vide. @@ -3240,8 +3424,12 @@ Entrez SVP un nouveau nom, unique, ou cliquez « %1 » pour d’in + Functions editor window has uncommitted modifications. + + + Functions editor window has uncommited modifications. - L’éditeur de fonction n’a pas enregistré les modifications. + L’éditeur de fonction n’a pas enregistré les modifications. @@ -3284,12 +3472,12 @@ Entrez SVP un nouveau nom, unique, ou cliquez « %1 » pour d’in Input file: - Fichier: + Fichier : Text encoding: - Texte codé: + Texte codé : @@ -3324,7 +3512,7 @@ Entrez SVP un nouveau nom, unique, ou cliquez « %1 » pour d’in Select import plugin. - Sélectionnez un plugin d’importation. + Sélectionnez un plugin d’importation. @@ -3334,7 +3522,7 @@ Entrez SVP un nouveau nom, unique, ou cliquez « %1 » pour d’in The file '%1' does not exist. - Le fichier « %1 » n’existe pas. + Le fichier « %1 » n’existe pas. @@ -3344,7 +3532,7 @@ Entrez SVP un nouveau nom, unique, ou cliquez « %1 » pour d’in Pick file to import from - Sélectionnez le fichier d’importation + Sélectionnez le fichier d’importation @@ -3356,102 +3544,175 @@ Entrez SVP un nouveau nom, unique, ou cliquez « %1 » pour d’in Index - + On table: - De la table: + De la table : - + Index name: - Nom index: + Nom index : - + Partial index condition - Condition partielle d’index + Condition partielle d’index - + Unique index Index unique - + Column Colonne - + Collation Regroupement - + Sort Tri - + + Delete selected indexed expression + + + + + Moves selected index column up in the order, making it more significant in the index. + + + + + Moves selected index column down in the order, making it less significant in the index. + + + + + Edit selected indexed expression + + + + + Add indexed expression + + + + DDL DDL - + Tried to open index dialog for closed or inexisting database. - Vous tentez d’ouvrir le dialogue de l’index d’une base de données fermée ou inexistante. + Vous tentez d’ouvrir le dialogue de l’index d’une base de données fermée ou inexistante. - + Could not process index %1 correctly. Unable to open an index dialog. - Impossible de définir l’index %1 correctement. Ouvrir un dialogue d’index valide. + Impossible de définir l’index %1 correctement. Ouvrir un dialogue d’index valide. + + + + Unique index cannot have indexed expressions. Either remove expressions from list below, or uncheck this option. + - + Pick the table for the index. - Sélectionnez la table pour l’index. + Sélectionnez la table pour l’index. - + Select at least one column. Selectionnez au moins une colonne. - + Enter a valid condition. Saississez une condition valide. - + default index dialog defaut - + Sort order table constraints - ordre de tri + Ordre de tri - - + + Error index dialog Erreur - + Cannot create unique index, because values in selected columns are not unique. Would you like to execute SELECT query to see problematic values? - Impossible de créer un index, car les valeurs des colonnes sélectionnées ne sont pas uniques. Voulez-vous exécuter une requête SELECT pour voir les valeurs problématiques? + Impossible de créer un index, car les valeurs des colonnes sélectionnées ne sont pas uniques. Voulez-vous exécuter une requête SELECT pour voir les valeurs problématiques ? - + An error occurred while executing SQL statements: %1 - Une erreur survenue à l’exécution de l’SQL: + Une erreur survenue à l’exécution de l’SQL : %1 + + IndexExprColumnDialog + + + Indexed expression + + + + + Expression to index + + + + + This expression is already indexed by the index. + + + + + Column should be indexed directly, not by expression. Either extend this expression to contain something more than just column name, or abort and select this column in index dialog directly. + + + + + Column '%1' does not belong to the table covered by this index. Indexed expressions can refer only to columns from the indexed table. + + + + + It's forbidden to use 'SELECT' statements in indexed expressions. + + + + + Enter an indexed expression. + + + + + Invalid expression. + + + LanguageDialog @@ -3462,7 +3723,7 @@ Entrez SVP un nouveau nom, unique, ou cliquez « %1 » pour d’in Please choose language: - SVP choississez un langage: + SVP choississez un langage : @@ -3470,306 +3731,310 @@ Entrez SVP un nouveau nom, unique, ou cliquez « %1 » pour d’in Database toolbar - Barre d’outils de base de données + Barre d’outils de base de données Structure toolbar - Barre d’outils de structure + Barre d’outils de structure Tools - outils + Barre d’outils des éditeurs Window list - liste fenêtre + Liste des fenêtres ouvertes View toolbar - Barre d’outils vues + Barre d’outils de fenêtrage - + Configuration widgets Configuration widgets - + Syntax highlighting engines Syntaxe surlignée des moteurs - + Data editors - Editeur s de données + Éditeurs de données - + Running in debug mode. Press %1 or use 'Help / Open debug console' menu entry to open the debug console. - Passage en mode débogue. Cliquez %1 ou utilisez l’entrée du menu « l’Aide / Ouvrir la console de débogage ». + Passage en mode débogue. Cliquez %1 ou utilisez l’entrée du menu « l’Aide / Ouvrir la console de débogage ». - + Running in debug mode. Debug messages are printed to the standard output. Passage en mode débogue. Les messages de débogage sont imprimés dans la sortie standard. - + You need to restart application to make the language change take effect. - Vous devez relancer l’application pour que le langage prenne effet. + Vous devez relancer l’application pour que le langage prenne effet. - + Open SQL editor - Ouvrir éditeur SQL + Ouvrir l’éditeur SQL - + Open DDL history - Ouvrir Historique DDL + Ouvrir l’historique DDL - + Open SQL functions editor - Editeur de fonctions SQL + Éditeur de fonctions SQL - + Open collations editor - Ouvrir editeur de collections + Ouvrir l’éditeur de collections - + Import Importer - + Export Exporter - + Open configuration dialog - Ouvrir dialogue de configuration + Préférences - + Tile windows - Organisation des fenêtres + Organisation des fenêtres en grille - + Tile windows horizontally - Organisation des fenêtres horizontalement + Organisation horizontale des fenêtres - + Tile windows vertically - Organisation des fenêtres verticalement + Organisation verticale des fenêtres - + Cascade windows Organisation des fenêtres en cascade - + Next window Fenêtre suivante - + Previous window Fenêtre précédante - + Hide status field - Ca + Cacher le champ d’état - + Close selected window - Fermeture fenêtre sélectionnée + Fermer la fenêtre sélectionnée - + Close all windows but selected - Fermeture de toutes les fenêtres sélectionnées + Fermer toutes les fenêtres sélectionnées - + Close all windows - Fermeture de toutes les fenêtres + Fermer toutes les fenêtres - + Restore recently closed window - Restaure une fenêtre récemment fermée + Restaurer la dernière fenêtre fermée - + Rename selected window - Renomme la fenêtre sélectionnée + Renommer la fenêtre sélectionnée - + Open Debug Console Ouvrir la console de debogage - + Open CSS Console - + Ouvrir la console CSS - + Report a bug - Rapport de bug + Rapporter un bogue - + Propose a new feature - Proposer une nouvelle fonction + Proposer une fonctionnalité - + About À propos de… - + Licenses Licences - + Open home page - Ouvrir la home page + Page d’accueil web - + Open forum page - Ouvrir la page des forums + Forum d’aide - + User Manual - Manuel utilisateurs + Manuel utilisateurs en ligne - + SQLite documentation - Documentation SQLite + Documentation en ligne de SQLite - + Report history - Rapport d’historique + Historique - + Check for updates - Vérification de mises à jour + Vérifier les mises à jour - + Database menubar Base de données - + Structure menubar Structure - + View menubar Vue - + Window list menubar view menu - Liste de fenêtres + Liste des fenêtres - + Tools menubar Outils - + Help Aide - + Could not set style: %1 main window - Impossible de positionner le style: %1 + Impossible de positionner le style : %1 - + Cannot export, because no export plugin is loaded. - Exportation impossible, aucun plugin d’exportation n’est chargé. + Exportation impossible, aucun plugin d’exportation n’est chargé. - + Cannot import, because no import plugin is loaded. - Importation impossible, aucun plugin d’importation n’est chargé. + Importation impossible, aucun plugin d’importation n’est chargé. - + Rename window Renommer la fenêtre - + Enter new name for the window: - Saississez un nouveau nom de fenêtre: + Saississez un nouveau nom de fenêtre : - + New updates are available. <a href="%1">Click here for details</a>. Une nouvelle mise à jour est disponible. <a href="%1"> cliquez ici pour détails</a>. - + You're running the most recent version. No updates are available. Vous utilisez la dernière version. Aucune mise à jour de disponible. - + Database passed in command line parameters (%1) was already on the list under name: %2 - + Database passed in command line parameters (%1) has been temporarily added to the list under name: %2 - La base de données passée en paramètre dans la ligne de commande (%1)a été temporaire ajoutée à la liste sous le nom: %2 + La base de données passée en paramètre dans la ligne de commande (%1)a été temporaire ajoutée à la liste sous le nom : %2 - + Could not add database %1 to list. - Impossible d’ajouter la base de données %1 à la liste. + Impossible d’ajouter la base de données %1 à la liste. MdiWindow - Uncommited changes - Modification non enregistrées + Modification non enregistrées + + + + Uncommitted changes + @@ -3793,12 +4058,12 @@ Entrez SVP un nouveau nom, unique, ou cliquez « %1 » pour d’in Configure editors for this data type - Configurer l’éditeur pour ce type de données + Configurer l’éditeur pour ce type de données Data editor plugin '%1' not loaded, while it is defined for editing '%1' data type. - Plugin d"éditeur de données « %1 » non chargé, ausii il n’ai pas défini pourle type de données « %1 ». + Plugin d"éditeur de données « %1 » non chargé, ausii il n’ai pas défini pour le type de données « %1 ». @@ -3826,7 +4091,7 @@ Entrez SVP un nouveau nom, unique, ou cliquez « %1 » pour d’in Date - Datee + Date @@ -3834,7 +4099,7 @@ Entrez SVP un nouveau nom, unique, ou cliquez « %1 » pour d’in Date & time - Heure & date + date & heure @@ -3889,12 +4154,12 @@ Entrez SVP un nouveau nom, unique, ou cliquez « %1 » pour d’in Undo - Défaire + Annuler Redo - refaire + Rétablir @@ -3917,14 +4182,14 @@ Entrez SVP un nouveau nom, unique, ou cliquez « %1 » pour d’in Primary Key new constraint dialog - Clé primaire + Clef primaire Foreign Key new constraint dialog - Clé étrangère + Clef étrangère @@ -3969,7 +4234,7 @@ Entrez SVP un nouveau nom, unique, ou cliquez « %1 » pour d’in New updates are available! - Les nouvelles mises à jours sont valides! + Les nouvelles mises à jours sont valides ! @@ -3994,12 +4259,12 @@ Entrez SVP un nouveau nom, unique, ou cliquez « %1 » pour d’in Update to new version! - Mettre à jour la nouvelle version! + Mettre à jour la nouvelle version ! The update will be automatically downloaded and installed. This will also restart application at the end. - La mise à jour sera automatiquement téléchargée et installée. Un redémarrage de l’application sera aussi effectué à la fin. + La mise à jour sera automatiquement téléchargée et installée. Un redémarrage de l’application sera aussi effectué à la fin. @@ -4050,7 +4315,7 @@ Entrez SVP un nouveau nom, unique, ou cliquez « %1 » pour d’in Number of rows to populate: - Nombre de lignes à peupler: + Nombre de lignes à peupler : @@ -4094,17 +4359,17 @@ Entrez SVP un nouveau nom, unique, ou cliquez « %1 » pour d’in Cannot edit columns that are result of compound %1 statements (one that includes %2, %3 or %4 keywords). - impossible d’éditer les colonnes qui ont le résultat composé des déclarations %1 (inclus %2, %3 ou %4 mots-clés). + impossible d’éditer les colonnes qui ont le résultat composé des déclarations %1 (inclus %2, %3 ou %4 mots-clefs). The query execution mechanism had problems with extracting ROWID's properly. This might be a bug in the application. You may want to report this. - Le mécanisme d’exécution de la requête a eu des problèmes avec l’extraction du ROWID’S. Ceci pourrait être un bogue de l’application. Vous pouvez le rapporter. + Le mécanisme d’exécution de la requête a eu des problèmes avec l’extraction du ROWID’S. Ceci pourrait être un bogue de l’application. Vous pouvez le rapporter. Requested column is a result of SQL expression, instead of a simple column selection. Such columns cannot be edited. - La colonne demandée est un résultat d’expression de SQL, au lieu d’une sélection de colonne simple. De telles colonnes ne peuvent pas être éditées. + La colonne demandée est un résultat d’expression de SQL, au lieu d’une sélection de colonne simple. De telles colonnes ne peuvent pas être éditées. @@ -4114,22 +4379,22 @@ Entrez SVP un nouveau nom, unique, ou cliquez « %1 » pour d’in Cannot edit results of query other than %1. - Impossible d’éditer les résultats de la requëte autrement que %1. + Impossible d’éditer les résultats de la requëte autrement que %1. Cannot edit columns that are result of aggregated %1 statements. - Impossible d’éditer les colonnes qui sont le résultat de déclarations agrégées %1. + Impossible d’éditer les colonnes qui sont le résultat de déclarations agrégées %1. Cannot edit columns that are result of %1 statement. - Impossible d’éditer les colonnesqui sont le résultat de déclaration %1. + Impossible d’éditer les colonnesqui sont le résultat de déclaration %1. Cannot edit columns that are result of common table expression statement (%1). - Impossible d’éditer les colonnes qui sont le résultat de table commune de déclaration (%1). + Impossible d’éditer les colonnes qui sont le résultat de table commune de déclaration (%1). @@ -4138,7 +4403,7 @@ Entrez SVP un nouveau nom, unique, ou cliquez « %1 » pour d’in on conflict: %1 data view tooltip - Sur conflit %1 + Sur conflit : %1 @@ -4150,136 +4415,136 @@ Entrez SVP un nouveau nom, unique, ou cliquez « %1 » pour d’in condition: %1 data view tooltip - Condition: %1 + Condition : %1 collation name: %1 data view tooltip - Nom de collation: %1 + Nom de collation : %1 - + Data grid view Vue de tableau de données - + Copy cell(s) contents to clipboard Copie le contenu de cellule(s) dans le presse-papier - + Paste cell(s) contents from clipboard Colle - + Set empty value to selected cell(s) Efface le contenu de cellule(s) - + Set NULL value to selected cell(s) Met à NULL les cellules séléctionnées - + Commit changes to cell(s) contents Enregistre les modifications de cellule(s) - + Rollback changes to cell(s) contents Annule les modifications de cellule(s) - + Delete selected data row - Supprimeles données de la ligne sélectionnée + Supprime les données de la ligne sélectionnée - + Insert new data row Insére une nouvelle ligne de données - + Open contents of selected cell in a separate editor Contenu ouvert de cellule choisie dans un éditeur séparé - + Total pages available: %1 - Total de pages: %1 + Nombre de pages disponibles : %1 - + Total rows loaded: %1 - Total dee lignes chargées: %1 + Nombre de lignes chargées : %1 - + Data view (both grid and form) - Vue de données (tableau et formulaire) + Vue des données (tableau et formulaire) - + Refresh data Actualisation des données - + Switch to grid view of the data - Basculer sur la vue tableau de données + Basculer sur la vue des données en table - + Switch to form view of the data - Basculer sur la vue formulaire de données + Basculer sur la vue des données en formulaire - + Database list Liste de bases de données - + Delete selected item - Suppression de l’item sélectionné + Suppression de l’item sélectionné - + Clear filter contents Effacer le contenu du filtre - + Refresh schema Actualiser le schéma - + Refresh all schemas Actualiser tous les schémas - + Add database - Ajouter une base de donnés + Ajouter une base de données - + Select all items - Séléctionner tous les items + Séléctionner tous les éléments - + Copy selected item(s) - Copie d’item(s) sélectionné(s) + Copie d’item(s) sélectionné(s) - + Paste from clipboard @@ -4363,7 +4628,7 @@ Entrez SVP un nouveau nom, unique, ou cliquez « %1 » pour d’in Open SQL editor - Ouvrir l’éditeur SQL + Ouvrir l’éditeur SQL @@ -4378,12 +4643,12 @@ Entrez SVP un nouveau nom, unique, ou cliquez « %1 » pour d’in Hide status area - Cacher la barre de status + Cacher la barre d’état Open configuration dialog - Ouvrir le dialogue de configuration + Préférences @@ -4393,12 +4658,12 @@ Entrez SVP un nouveau nom, unique, ou cliquez « %1 » pour d’in Open CSS Console - + Ouvrir la console CSS Cell text value editor - Editeur de texte de cellule + Éditeur de cellule @@ -4422,23 +4687,23 @@ Entrez SVP un nouveau nom, unique, ou cliquez « %1 » pour d’in Undo - Défaire + Annuler Redo - Refaire + Rétablir SQL editor input field - Editeur SQL saisie de champ + Éditeur SQL saisie de champ Select whole editor contents - Sélectionnez le contenu entier de l’éditeur + Sélectionnez le contenu entier de l’éditeur @@ -4448,7 +4713,7 @@ Entrez SVP un nouveau nom, unique, ou cliquez « %1 » pour d’in Load contents from a file - Charger le contenu d’un fichier + Charger le contenu d’un fichier @@ -4458,12 +4723,12 @@ Entrez SVP un nouveau nom, unique, ou cliquez « %1 » pour d’in Find next - Recherche suivante + Occurence suivante Find previous - Recherche précédente + Occurence précédente @@ -4488,27 +4753,32 @@ Entrez SVP un nouveau nom, unique, ou cliquez « %1 » pour d’in Move selected block of text one line down - Déplacer le block de texte sélectionné à la ligne inférieure + Déplacer le bloc de texte sélectionné à la ligne inférieure Move selected block of text one line up - Déplacer le block de texte sélectionné à la ligne supérieure + Déplacer le bloc de texte sélectionné à la ligne supérieure Copy selected block of text and paste it a line below - Copier le block de texte sélectionné à la ligne au dessus + Copier le bloc de texte sélectionné à la ligne au-dessus Copy selected block of text and paste it a line above - Copier le block de texte sélectionné à la ligne au dessous + Copier le bloc de texte sélectionné à la ligne au-dessous + + + + Toggle comment + All SQLite databases - Tius les bases de données SQLite + Toutes les bases de données SQLite @@ -4524,17 +4794,17 @@ Entrez SVP un nouveau nom, unique, ou cliquez « %1 » pour d’in Reports history window - Fenêtre d’historique + Fenêtre d’historique Delete selected entry - Effacer l’entrée sélectionnée + Effacer l’entrée sélectionnée SQL editor window - Fenêtre de l’éditeur SQL + Fenêtre de l’éditeur SQL @@ -4559,12 +4829,12 @@ Entrez SVP un nouveau nom, unique, ou cliquez « %1 » pour d’in Go to next editor tab - Aller à l’onglet d’éditeur suivant + Aller à l’onglet d’éditeur suivant Go to previous editor tab - Aller à l’onglet d’éditeur précédent + Aller à l’onglet d’éditeur précédent @@ -4577,109 +4847,109 @@ Entrez SVP un nouveau nom, unique, ou cliquez « %1 » pour d’in Déplacement au-dessous du focus des résultats de vue par les touches - + Table window Fenêtre de table - + Refresh table structure Actualiser la structure de la table - + Add new column - Ajout nouvelle colonne + Ajouter une nouvelle colonne - + Edit selected column Modifier la colonne sélectionnée - + Delete selected column Supprime la colonne sélectionnée - + Export table data Exporte les données de table - + Import data to the table Importe les données de table - + Add new table constraint Ajoute une nouvelle contrainte à la table - + Edit selected table constraint Modifie la contrainte de la table sélectionnée - + Delete selected table constraint Supprime la contrainte de la table sélectionnée - + Refresh table index list - Actualise la liste des index de table + Actualise la liste des index de la table - + Add new index Ajoute un nouvel index - + Edit selected index - Modifie l’index sélectionné + Modifie l’index sélectionné - + Delete selected index - Supprime l’index sélectionné + Supprime l’index sélectionné - + Refresh table trigger list Actualise la liste des déclencheurs de la table - + Add new trigger Ajoute un nouveau déclencheur - + Edit selected trigger Modifie le déclencheur sélectionné - + Delete selected trigger Supprime le déclencheur sélectionné - + Go to next tab - Aller à l’onglet suivant + Aller à l’onglet suivant - + Go to previous tab - Aller à l’onglet précédent + Aller à l’onglet précédent @@ -4689,22 +4959,26 @@ Entrez SVP un nouveau nom, unique, ou cliquez « %1 » pour d’in Refresh view trigger list - Actualise l’affichage de la liste des déclencheur + Actualise l’affichage de la liste des déclencheurs QuitConfirmDialog - Uncommited changes - modifications non enregistrées + modifications non enregistrées + + + + Uncommitted changes + Are you sure you want to quit the application? Following items are pending: - Confirmez la fermeture de l’application: + Confirmez la fermeture de l’application ? @@ -4717,12 +4991,12 @@ Following items are pending: Find: - Trouvé: + Trouvé : Case sensitive - Case sensiible + Sensible à la casse @@ -4732,7 +5006,7 @@ Following items are pending: Regular expression matching - Correspondance d’expression régulière + Correspondance d’expression régulière @@ -4744,7 +5018,7 @@ recherche suivant Replace with: - Remplacer par: + Remplacer par : @@ -4795,173 +5069,179 @@ recherche suivant SqlEditor - + Cut sql editor Couper - + Copy sql editor Copier - + Paste sql editor Coller - + Delete sql editor Supprimer - + Select all sql editor Tout sélectionner - + Undo sql editor - Défaire + Annuler - + Redo sql editor - Refaire + Rétablir - + Complete sql editor Complet - + Format SQL sql editor Format SQL - + Save SQL to file sql editor Enregistrer le SQL - + Select file to save SQL sql editor - + Load SQL from file sql editor Charger le SQL - + Delete line sql editor Ligne suppimée - + Move block down sql editor - Descendre le block + Descendre le bloc - + Move block up sql editor - Monter le block + Monter le bloc - + Copy block down sql editor - Copier block au-dessus + Copier bloc au-dessus - + Copy up down sql editor - Copier block au-dessous + Copier bloc au-dessous - + Find sql editor Chercher - + Find next sql editor Chercher suivant - + Find previous sql editor Chercher précédent - + Replace sql editor Remplacer - + + Toggle comment + sql editor + + + + Saved SQL contents to file: %1 - + Syntax completion can be used only when a valid database is set for the SQL editor. - L’achèvement de syntaxe peut être utilisé seulement quand une base de données valable est utilisée dans l’éditeur SQL. + L’achèvement de syntaxe peut être utilisé seulement quand une base de données valable est utilisée dans l’éditeur SQL. - + Contents of the SQL editor are huge, so errors detecting and existing objects highlighting are temporarily disabled. - Le contenu l’éditeur SQL est important, aussi la détectiond’objets en erreur est temporairement mise hors de service. + Le contenu l’éditeur SQL est important, aussi la détectiond’objets en erreur est temporairement mise hors de service. - + Save to file Sauvegarder - + Could not open file '%1' for writing: %2 - Impossible d’ouvrir en écriture le fichier « %1 » : %2 + Impossible d’ouvrir en écriture le fichier « %1 » : %2 - + SQL scripts (*.sql);;All files (*) - Scripts SQL (*.sql);;tous fichiers (*) + Scripts SQL (*.sql);;Tous les fichiers (*) - + Open file Fichier ouvert - + Could not open file '%1' for reading: %2 - Impossible d’ouvrir en lecture le fichier « %1 » : %2 + Impossible d’ouvrir en lecture le fichier « %1 » : %2 - + Reached the end of document. Hit the find again to restart the search. Fin de document atteint. Saississez de nouveau la recherche pour relancer la recherche. @@ -4969,213 +5249,272 @@ recherche suivant SqlQueryItem - + Column: data view tooltip - Colonne: + Colonne : - + Data type: data view - Type de données: + Type de données : - + Table: data view tooltip - Table: + Table : - + Constraints: data view tooltip - Contrainte: + Contrainte : - This cell is not editable, because: %1 - Cette cellule n’est pas modifiable: %1 + Cette cellule n’est pas modifiable : %1 - + Cannot load the data for a cell that refers to the already closed database. - Impossible de charger les données pour une cellule référantà une base de données fermée. + Impossible de charger les données pour une cellule référant à une base de données fermée. SqlQueryItemDelegate - - Cannot edit this cell. Details: %2 - impossible de modifier cette cellule. détails: %2 + Impossible de modifier cette cellule. Détails : %2 - + The row is marked for deletion. - La ligne est marquée poureffacement. + La ligne est marquée pour effacement. + + + + + + + + Cannot edit this cell. Details: %1 + Impossible de modifier cette cellule. Détails : %1 + + + + + Structure of this table has changed since last data was loaded. Reload the data to proceed. + + + + + Editing a huge contents in an inline cell editor is not a good idea. It can become slow and inconvenient. It's better to edit such big contents in a Form View, or in popup editor (available under rick-click menu). + + + + + Foreign key for column %2 has more than %1 possible values. It's too much to display in drop down list. You need to edit value manually. + SqlQueryModel - - + + Only one query can be executed simultaneously. Uniquement une seule requête peut être exécutée à la fois. - Uncommited data - Données non enregistrées + Données non enregistrées - - There are uncommited data changes. Do you want to proceed anyway? All uncommited changes will be lost. - - - - + Cannot commit the data for a cell that refers to the already closed database. - Impossible d’enregistrer les données pour la cell qui référe à une base de données déjà fermée. + Impossible d’enregistrer les données pour la celle qui référe à une base de données déjà fermée. - + Could not begin transaction on the database. Details: %1 - Impossible de lancer la transaction sur la base de données. Détails: %1 + Impossible de lancer la transaction sur la base de données. Détails : %1 - An error occurred while commiting the transaction: %1 - Une erreur est survenuelors de l’enregistrement de la transaction: %1 + Une erreur est survenuelors de l’enregistrement de la transaction : %1 - + An error occurred while rolling back the transaction: %1 - Une erreur est survenuelors de l’annulation de la transaction: %1 + Une erreur est survenuelors de l’annulation de la transaction : %1 - + Tried to commit a cell which is not editable (yet modified and waiting for commit)! This is a bug. Please report it. - Tentative d’enregistrement d’une une cellule qui n’est pas modifiable! Ceci est un bogue. Rapportez-le SVP. + Tentative d’enregistrement d’une une cellule qui n’est pas modifiable ! Ceci est un bogue. Rapportez-le SVP. - An error occurred while commiting the data: %1 - Une erreur est survenuelors de l’enregistrement des données: %1 + Une erreur est survenuelors de l’enregistrement des données : %1 + + + + Uncommitted data + + + + + There are uncommitted data changes. Do you want to proceed anyway? All uncommitted changes will be lost. + - - + + An error occurred while committing the transaction: %1 + + + + + An error occurred while committing the data: %1 + + + + + Error while executing SQL query on database '%1': %2 - Erreur pendant l’exécution de la requête sur la base de données « %1 » : %2 + Erreur pendant l’exécution de la requête sur la base de données « %1 » : %2 - + Error while loading query results: %1 - Erreur lors du chargement des résultats de la requête: %1 + Erreur lors du chargement des résultats de la requête : %1 - + Insert multiple rows Insérer plusieurs lignes - + Number of rows to insert: - Nombre de lignes à inserrer: + Nombre de lignes à inserer : SqlQueryView - + + Go to referenced row in... + + + + Copy Copier - + Copy as... - Copier comme ... + Copier comme… - + Paste Coller - + Paste as... - Coller comme ... + Coller comme… - + Set NULL values Valeurs NULL positionnées - + Erase values valeurs écrasées - + Edit value in editor - Valeur modifiée par l’éditeur + Valeur modifiée par l’éditeur - + Commit Enregistrer - + Rollback Annuler - + Commit selected cells Enregistrer les cellules sélectionnées - + Rollback selected cells Annuler les modifications des cellules sélectionnées - + Define columns to sort by Définit les colonnes triées par - + Remove custom sorting Enléve le tri personnalisé - + Insert row Insérer une ligne - + Insert multiple rows Insérer plusieurs lignes - + Delete selected row Supprimer les lignes sélectionnées - + + Generate query for selected cells + + + + No items selected to paste clipboard contents to. - + + Go to referenced row in table '%1' + + + + + table '%1' + + + + + Referenced row (%1) + + + + Edit value Modifier la valeur @@ -5183,14 +5522,18 @@ recherche suivant SqlTableModel - Error while commiting new row: %1 - Erreur à l’nregistrement d’une nouvelle ligne: %1 + Erreur à l’enregistrement d’une nouvelle ligne : %1 - + + Error while committing new row: %1 + + + + Error while deleting row from table %1: %2 - Erreur à la suppression d’une ligne de la table %1: %2 + Erreur à la suppression d’une ligne de la table %1 : %2 @@ -5198,12 +5541,12 @@ recherche suivant Status - Status + Barre d’état Copy - Cipier + Copier @@ -5237,13 +5580,13 @@ recherche suivant Foreign table: - Table étrangère: + Table étrangère : SQLite 2 does not support foreign keys officially, but it's okay to use them anyway. - SQLite 2 ne supporte pas officielement les clés étrangères, mais vous pouvez les utilisées tout de même. + SQLite 2 ne supporte pas officielement les clefs étrangères, mais vous pouvez les utilisées tout de même. @@ -5273,7 +5616,7 @@ but it's okay to use them anyway. Named constraint - Nommer la contrainte + Contrainte nommée @@ -5337,7 +5680,7 @@ but it's okay to use them anyway. Autoincrement - Autoincrémentation + Auto-incrémentation @@ -5380,19 +5723,58 @@ but it's okay to use them anyway. TableStructureModel - + Name table structure columns Nom - + Data type table structure columns Type de données + + + Primary +Key + table structure columns + + + + + Foreign +Key + table structure columns + + + + + Unique + table structure columns + Unique + + + + Check + table structure columns + Contrôle + + + + Not +NULL + table structure columns + + + Collate + table structure columns + + + + Default value table structure columns Valeur par défaut @@ -5408,10 +5790,11 @@ but it's okay to use them anyway. Table name: - Nom de la table: + Nom de la table : + Data Données @@ -5436,409 +5819,444 @@ but it's okay to use them anyway. DDL - + Export table table window Exporter une table - + Import data to table table window - Importer les données d’une table + Importer les données d’une table - + Populate table table window Peupler une table - + Refresh structure table window Actualiser la structure - + Commit structure changes table window - Enregistrer les modification de la structure + Enregistrer les modifications de la structure - + Rollback structure changes table window - Annuler les modification de la structure + Annuler les modifications de la structure - + Add column table window Ajouter une colonne - + Edit column table window Modifier une colonne - - + + Delete column table window Supprimer une colonne - + Move column up table window Monter la colonne - + Move column down table window Descendre la colonne - + Create similar table table window Créer une table identique - + Reset autoincrement value table window - Réinitialisation de l’incrémentation + Réinitialisation de l’incrémentation - + Add table constraint table window Ajouter une contrainte de table - + Edit table constraint table window Modifier la contrainte de table - + Delete table constraint table window Supprimer la contrainte de table - + Move table constraint up table window Monter la contrainte de table - + Move table constraint down table window Descendre la contrainte de table - + Add table primary key table window - Ajouter une clé primaire à la table + Ajouter une clef primaire à la table - + Add table foreign key table window - Ajouter une clé étrangère à la table + Ajouter une clef étrangère à la table - + Add table unique constraint table window - Ajouter une contrainte clé unique à la table + Ajouter une contrainte clef unique à la table - + Add table check constraint table window Ajouter une contrainte de contrôle à la table - + Refresh index list table window - Actualiser la liste d’index + Actualiser la liste des index - + Create index table window Créer un index - + Edit index table window Modifier un index - + Delete index table window Supprimer un index - + Refresh trigger list table window - Actualiser la liste d’index + Actualiser la liste des déclencheurs - + Create trigger table window Créer un déclencheur - + Edit trigger table window Modifier un déclencheur - + Delete trigger table window Supprimer un déclencheur - + Are you sure you want to delete column '%1'? table window - Etes-vous certain de vouloir supprimer la colonne : « %1 » ? + Êtes-vous certain de vouloir supprimer la colonne : « %1 » ? - + Following problems will take place while modifying the table. Would you like to proceed? table window Des problèmes suivants auront lieu en modifiant la table. -Voudriez-vous procéder? +Voudriez-vous procéder ? - + Table modification table window Modification de la table - + Could not load data for table %1. Error details: %2 - Impossible de charger les données de table %1. Détails d’ erreur: %2 + Impossible de charger les données de table %1. Détails d’ erreur : %2 - + Could not process the %1 table correctly. Unable to open a table window. - Impossible de lancer correctement la table %1. Impossible d’ouvrir la fenêtre de table. + Impossible de lancer correctement la table %1. Impossible d’ouvrir la fenêtre de table. - + Could not restore window %1, because no database or table was stored in session for this window. - + Could not restore window '%1', because no database or table was stored in session for this window. - + Could not restore window '%1', because database %2 could not be resolved. - + Could not restore window '%1'', because the table %2 doesn't exist in the database %3. + + + Committed changes for table '%1' successfully. + + + + + Committed changes for table '%1' (named before '%2') successfully. + + + + + Autoincrement value for table '%1' has been reset successfully. + + + + + Uncommitted changes + + + + + There are uncommitted structure modifications. You cannot browse or edit data until you have table structure settled. +Do you want to commit the structure, or do you want to go back to the structure tab? + + + + + Table window "%1" has uncommitted structure modifications and data. + + + + + Table window "%1" has uncommitted data. + + + + + Table window "%1" has uncommitted structure modifications. + + Could not restore window, because database %1 could not be resolved. Impossible de restaurer la fenêtre, car la base de données %1 ne peut ëtre résolue. Could not restore window, because the table %1 doesn't exist in the database %2. - Impossible de restaurer la fenêtre, car la vue %1 n’existe pas dans la base de données %2.. + Impossible de restaurer la fenêtre, car la vue %1 n’existe pas dans la base de données %2.. - - + + New table %1 Nouvelle table %1 - + Could not commit table structure. Error message: %1 table window - Impossible d’enregistrer la structure de table. Message d’erreur: %1 + Impossible d’enregistrer la structure de table. Message d’erreur : %1 - + Reset autoincrement - Réinitialisation de l’incrémentation + Réinitialisation de l’incrémentation - + Are you sure you want to reset autoincrement value for table '%1'? - Etes-vous certain de vouloir réinitialiser l’autoincrémentation de la table %1? + Êtes-vous certain de vouloir réinitialiser l’auto-incrémentation de la table %1 ? - + An error occurred while trying to reset autoincrement value for table '%1': %2 - Une erreur est survenue pendant la réinitialisation de la valeur de l’autoincrémentation de la table « %1 »: %2 + Une erreur est survenue pendant la réinitialisation de la valeur de l’auto-incrémentation de la table « %1 » : %2 - Autoincrement value for table '%1' has been reset successfly. - La valeur de l’autoincrémentaion de la table %1 a été réinitialisé avec succès. + La valeur de l’auto-incrémentaion de la table %1 a été réinitialisé avec succès. - + Empty name Nom vide - + A blank name for the table is allowed in SQLite, but it is not recommended. Are you sure you want to create a table with blank name? Un nom vide pour la vue dans SQLITE est admis, mais on ne le recommande pas. Êtes-vous sûrs que vous voulez créer une vue avec le nom vide ? - + Cannot create a table without at least one column. Impossible de créer une table sans au moins une colonne. - + Cannot create table %1, if it has no primary key defined. Either uncheck the %2, or define a primary key. - Impossible de créer la table %1, s’il n’y a pas de clé primaire de définie. Toute fois ne pas contrôler %2 ou définir une clé primaire. + Impossible de créer la table %1, s’il n’y a pas de clef primaire de définie. Toutefois ne pas contrôler %2 ou définir une clef primaire. - + Cannot use autoincrement for primary key when %1 clause is used. Either uncheck the %2, or the autoincrement in a primary key. - Impossible d’utiliser l’autoincrémentation pour une clé primaire quand la clause %1 est utilisée. Toute fois ne pas contrôler %2, ou utiliser l’autoincrémentation sur une clé primaire. + Impossible d’utiliser l’auto-incrémentation pour une clef primaire quand la clause %1 est utilisée. Toutefois ne pas contrôler %2, ou utiliser l’auto-incrémentation sur une clef primaire. - + Are you sure you want to delete table constraint '%1'? table window - Etes-vous sûr de vouloir supprimer la contrainte « %1 » ? + Êtes-vous sûr de vouloir supprimer la contrainte « %1 » ? - + Delete constraint table window Supprimer la contrainte - + Cannot export, because no export plugin is loaded. - Export impossible, car aucun plugin d’import n’est chargé. + Export impossible, car aucun plugin d’import n’est chargé. - + Cannot import, because no import plugin is loaded. - Import impossible, car aucun plugin d’import n’est chargé. + Import impossible, car aucun plugin d’import n’est chargé. - Uncommited changes - Modification non enregistrées + Modification non enregistrées - There are uncommited structure modifications. You cannot browse or edit data until you have table structure settled. Do you want to commit the structure, or do you want to go back to the structure tab? - Il ya des modifications de structure non enregistrées. Vous ne pouvez pas naviguer ou modifier des données jusqu’à ce que vous ailliez installer la structure de table. -Voulez-vous enregistrer la structure, ou voulez-vous retourner à l’onglet de structure ? + Il ya des modifications de structure non enregistrées. Vous ne pouvez pas naviguer ou modifier des données jusqu’à ce que vous ailliez installer la structure de table. +Voulez-vous enregistrer la structure, ou voulez-vous retourner à l’onglet de structure ? - + Go back to structure tab - Retour à l’onglet de structure + Retour à l’onglet de structure - + Commit modifications and browse data. - Enregistrer les modifications et naviger dans les données. + Enregistrer les modifications et continuer - + Name table window indexes Nom - + Unique table window indexes Unique - + Columns table window indexes Colonnes - + Partial index condition table window indexes - Condition partielle d’index + Condition partielle d’index - + Name table window triggers Nom - + Event table window triggers Événement - + Condition table window triggers Condition - + Details table window triggers Details - Table window "%1" has uncommited structure modifications and data. - La fenêtre de table "%1" n’a pas enregistré les modifications de structure et de données. + La fenêtre de table "%1" n’a pas enregistré les modifications de structure et de données. - Table window "%1" has uncommited data. - La fenêtre de table "%1" n’a pas enregistrer les données. + La fenêtre de table "%1" n’a pas enregistrer les données. - Table window "%1" has uncommited structure modifications. - La fenêtre de table "%1" n’a pas enregistré les modifications de structure. + La fenêtre de table "%1" n’a pas enregistré les modifications de structure. @@ -5851,7 +6269,17 @@ Voulez-vous enregistrer la structure, ou voulez-vous retourner à l’onglet Triggering columns: - Colonnes avec déclencheurs: + Colonnes avec déclencheurs : + + + + Select all + Tout sélectionner + + + + Deselect all + Tout désélectionner @@ -5865,12 +6293,12 @@ Voulez-vous enregistrer la structure, ou voulez-vous retourner à l’onglet On table: - Sur table: + Sur table : Action: - Action: + Action : @@ -5881,37 +6309,37 @@ Voulez-vous enregistrer la structure, ou voulez-vous retourner à l’onglet Pre-condition: - Précondition: + Précondition : The scope is still not fully supported by the SQLite database. - La portée n’est toujours pas entièrement supportée par la base de données SQLITE. + La portée n’est toujours pas entièrement supportée par la base de données SQLITE. Trigger name: - Nom du déclencheur: + Nom du déclencheur : When: - Quand: + Quand : List of columns for UPDATE OF action. - Liste des colonnes pour l’action UPDATE OF. + Liste des colonnes pour l’action UPDATE OF. Scope: - Portée: + Portée : Code: - Code: + Code : @@ -5926,12 +6354,12 @@ Voulez-vous enregistrer la structure, ou voulez-vous retourner à l’onglet On view: - Sur vue: + Sur vue : Could not process trigger %1 correctly. Unable to open a trigger dialog. - Impossible d’exécuter correctement le déclencheur %1. Ouverture invalide du dialogue de déclencheur. + Impossible d’exécuter correctement le déclencheur %1. Ouverture invalide du dialogue de déclencheur. @@ -5944,16 +6372,16 @@ Voulez-vous enregistrer la structure, ou voulez-vous retourner à l’onglet Saisissez un code de déclencheur valide. - + Error trigger dialog Erreur - + An error occurred while executing SQL statements: %1 - Une erreur survenue lors de l’exécution de l’intruction SQL: %1 + Une erreur survenue lors de l’exécution de l’intruction SQL : %1 @@ -5966,7 +6394,7 @@ Voulez-vous enregistrer la structure, ou voulez-vous retourner à l’onglet Following changes to the SQL statements will be made: - Des modifications suivantes aux déclarations SQL seront faits: + Des modifications suivantes aux déclarations SQL seront faits : @@ -5989,20 +6417,26 @@ Voulez-vous enregistrer la structure, ou voulez-vous retourner à l’onglet View name: - Nom de la vue: + Nom de la vue : - + + Output column names + + + + + Data Données - + Triggers Déclencheur - + DDL DDL @@ -6016,194 +6450,284 @@ Voulez-vous enregistrer la structure, ou voulez-vous retourner à l’onglet Could not restore window, because the view %1 doesn't exist in the database %2. - Impossible de restaurer la fenêtre, car la vue %1 n’existe pas dans la base de données %2.. + Impossible de restaurer la fenêtre, car la vue %1 n’existe pas dans la base de données %2.. - - + + Could not restore window '%1', because no database or view was stored in session for this window. - + Could not restore window '%1', because database %2 could not be resolved. - + Could not restore window '%1', because database %2 could not be open. - + Could not restore window '%1', because the view %2 doesn't exist in the database %3. - - + + New view %1 Nouvelle vue %1 - + Refresh the view view window Actualisation de la vue - + Commit the view changes view window Enregistrement des changements dans la vue - + Rollback the view changes view window Annulation des changements dans la vue - + + Explicit column names + + + + + Generate output column names automatically basing on result columns of the view. + + + + + Add column + view window + Ajouter une colonne + + + + Edit column + view window + Modifier une colonne + + + + Delete column + view window + Supprimer une colonne + + + + Move column up + view window + + + + + Move column down + view window + + + + Refresh trigger list view window Actualisation de la liste des déclencheurs - + Create new trigger view window - Création d’un nouveau déclencheur + Création d’un nouveau déclencheur - + Edit selected trigger view window Modification du déclencheur sélectionné - + Delete selected trigger view window Suppression du déclencheur sélectionné - + + View window "%1" has uncommitted structure modifications and data. + + + + + View window "%1" has uncommitted data. + + + + + View window "%1" has uncommitted structure modifications. + + + + + Uncommitted changes + + + + + There are uncommitted structure modifications. You cannot browse or edit data until you have the view structure settled. +Do you want to commit the structure, or do you want to go back to the structure tab? + + + + + Committed changes for view '%1' successfully. + + + + + Committed changes for view '%1' (named before '%2') successfully. + + + View window "%1" has uncommited structure modifications and data. - La fenêtre de la vue "%1" n’a pas enregistré les modifications de structure et de données. + La fenêtre de la vue "%1" n’a pas enregistré les modifications de structure et de données. - View window "%1" has uncommited data. - La fenêtre de la vue "%1" n’a pas enregistré les modifications de données. + La fenêtre de la vue "%1" n’a pas enregistré les modifications de données. - View window "%1" has uncommited structure modifications. - La fenêtre de la vue "%1" n’a pas enregistré les modifications de structure. + La fenêtre de la vue "%1" n’a pas enregistré les modifications de structure. - + Could not load data for view %1. Error details: %2 - Impossible de charher les données de vue %1. Détails d’ erreur: %2 + Impossible de charher les données de vue %1. Détails d’ erreur : %2 - Uncommited changes - Modifications non enregistrées + Modifications non enregistrées - There are uncommited structure modifications. You cannot browse or edit data until you have the view structure settled. Do you want to commit the structure, or do you want to go back to the structure tab? - Des modifications de structure n’ont pa été enregistrées. - Vous ne pouvez pas naviger ou éditer des données jusqu’à ce que vous installliez la structure de vue. -Voulez-vous enregistrer la structure, ou voulez-vous retourner à l’onglet de structure ? + Des modifications de structure n’ont pa été enregistrées. + Vous ne pouvez pas naviguer ou éditer des données jusqu’à ce que vous installliez la structure de vue. +Voulez-vous enregistrer la structure, ou voulez-vous retourner à l’onglet de structure ? - + Go back to structure tab - Retour à l’onlet de structure + Retour à l’onlet de structure - + Commit modifications and browse data. Enregistrement des modifications et navigation des données. - + Could not commit view changes. Error message: %1 view window - Impossible d’enregistrer les modifivations de vue. Message d’erreur: %1 + Impossible d’enregistrer les modifications de vue. Message d’erreur : %1 + + + + Override columns + - + + Currently defined columns will be overriden. Do you want to continue? + + + + + Could not determinate columns returned from the view. The query is problably incomplete or contains errors. + + + + Name view window triggers Nom - + Instead of view window triggers - A la place de + À la place de - + Condition view window triggers Condition - + Details table window triggers Détails - + Could not process the %1 view correctly. Unable to open a view window. - Impossible de lancer correctement la vue %1. Impossible d’ouvrir la fenêtre de vue. + Impossible de lancer correctement la vue %1. Impossible d’ouvrir la fenêtre de vue. - + Empty name - Nom vode + Nom absent - + A blank name for the view is allowed in SQLite, but it is not recommended. Are you sure you want to create a view with blank name? Un nom vide pour la vue dans SQLITE est admis, mais on ne le recommande pas. Êtes-vous sûrs que vous voulez créer une vue avec le nom vide ? - + The SELECT statement could not be parsed. Please correct the query and retry. Details: %1 - La déclaration SELECT ne peut être analysé. SVP corrigez la requête et réessayez. -Details: %1 + La déclaration SELECT ne peut être analysé. Veuillez corriger la requête et réessayer. +Details : %1 - + The view could not be modified due to internal SQLiteStudio error. Please report this! - La vue ne peut être modifiée a cause d’une erreur interne de SQLiteStudio. SVP repportez l’erreur! + La vue ne peut être modifiée a cause d’une erreur interne de SQLiteStudio. SVP repportez l’erreur ! + + + + The view code could not be parsed properly for execution. This is a SQLiteStudio's bug. Please report it. + - - The view code could not be parsed properly for execution. This is a SQLiteStudio’s bug. Please report it. - La vue ne être correctement analysée avant exécution.Cest un bug SQLiteStudion. SVP reporter le. + The view code could not be parsed properly for execution. This is a SQLiteStudio’s bug. Please report it. + La vue ne peut être correctement analysée avant exécution. Cest un bug SQLiteStudio. Veuillez le signaler. - + Following problems will take place while modifying the view. Would you like to proceed? view window Des problèmes suivants auront lieu en modifiant la vue. -Voudriez-vous procéder? +Veulez-vous continuer ? - + View modification view window Fenêtre vue @@ -6214,7 +6738,7 @@ Voudriez-vous procéder? Interrupt - Inperruption + Interruption diff --git a/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_it.ts b/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_it.ts index 2803575..aaac2b6 100644 --- a/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_it.ts +++ b/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_it.ts @@ -1,6 +1,6 @@ - + AboutDialog @@ -429,7 +429,7 @@ - Collations editor window has uncommited modifications. + Collations editor window has uncommitted modifications. @@ -903,7 +903,7 @@ but it's okay to use it. ConfigDialog - + Configuration @@ -993,215 +993,215 @@ but it's okay to use it. - + Number of data rows per page: - - + + <p>When the data is read into grid view columns width is automatically adjusted. This value limits the initial width for the adjustment, but user can still resize the column manually over this limit.</p> - + Limit initial data column width to (in pixels): - + <p>When this is enabled and user holds mouse pointer over a cell in any data view (query results, a table data, a view data) a tooltip will appear with details about the cell - it includes details like column data type, constraints, ROWID and others.</p> - + Show column and row details tooltip in data view - + + <p>When editing a cell which used to have NULL value and entering empty string as new value, then this option determinates whether the new value should remain NULL (have this option enabled), or should it be overwritten with empty string value (have this option disabled).</p> + + + + Inserting new row in data grid - + Before currently selected row - + After currently selected row - + At the end of data view - + <p>When enabled, Table Windows will show up with the data tab, instead of the structure tab.</p> - + <p>When enabled the "Data" tab will be placed as first tab in every Table Window, instead of being at second place.</p> - + Place data tab as first tab in a Table Window - + <p>When enabled, View Windows will show up with the data tab, instead of the structure tab.</p> - + <p>When enabled the "Data" tab will be placed as first tab in every View Window, instead of being at second place.</p> - + Place data tab as first tab in a View Window - + Data types - + Available editors: - + Editors selected for this data type: - + Schema editing - + Number of DDL changes kept in history. - + DDL history size: - - Don't show DDL preview dialog when commiting schema changes - - - - + SQL queries - - + + Number of queries kept in the history. - + History size: - + <p>If there is more than one query in the SQL editor window, then (if this option is enabled) only a single query will be executed - the one under the keyboard insertion cursor. Otherwise all queries will be executed. You can always limit queries to be executed by selecting those queries before calling to execute.</p> - + Execute only the query under the cursor - + Updates - + Automatically check for updates at startup - + Session - + Restore last session (active MDI windows) after startup - + Status Field - + <p>When user manually closes the Status panel, this option makes sure that if any new message is printed in the Status panel it will be reopened. If it's disabled, then Status panel can only be open manually by the user from the "View" menu.</p> - + Always open Status panel when new message is printed - + Filter shortcuts by name or key combination - + Action - + Key combination - - + + Language - + Changing language requires application restart to take effect. - + Compact layout - + <p>Compact layout reduces all margins and spacing on the UI to minimum, making space for displaying more data. It makes the interface a little bit less aesthetic, but allows to display more data at once.</p> - + Use compact layout @@ -1277,242 +1277,262 @@ but it's okay to use it. - + + Keep NULL value when entering empty value + + + + + <html><head/><body><p>Enable this to always enforce DEFAULT value when committing a NULL value for a column that has DEFAULT value defined, even though the column is allowed to contain NULL values.</p><p>Disable this option to use DEFAULT value exclusively when NULL value is committed for column with NOT NULL constraint.</p></body></html> + + + + + Use DEFAULT value (if defined), when committing NULL value + + + + Table windows - + Open Table Windows with the data tab for start - + View windows - + Open View Windows with the data tab for start - + + Don't show DDL preview dialog when committing schema changes + + + + Main window dock areas - + Left and right areas occupy corners - + Top and bottom areas occupy corners - + Hide built-in plugins - + Current style: - + Preview - + Enabled - + Disabled - + Active formatter plugin - + SQL editor font - + Database list font - + Database list additional label font - + Data view font - + Status field font - + SQL editor colors - + Current line background - + <p>SQL strings are enclosed with single quote characters.</p> - + String foreground - + <p>Bind parameters are placeholders for values yet to be provided by the user. They have one of the forms:</p><ul><li>:param_name</li><li>$param_name</li><li>@param_name</li><li>?</li></ul> - + Bind parameter foreground - + Highlighted parenthesis background - + <p>BLOB values are binary values represented as hexadecimal numbers, like:</p><ul><li>X'12B4'</li><li>x'46A2F4'</li></ul> - + BLOB value foreground - + Regular foreground - + Line numbers area background - + Keyword foreground - + Number foreground - + Comment foreground - + <p>Valid objects are name of tables, indexes, triggers, or views that exist in the SQLite database.</p> - + Valid objects foreground - + Data view colors - - <p>Any data changes will be outlined with this color, until they're commited to the database.</p> + + <p>Any data changes will be outlined with this color, until they're committed to the database.</p> - - Uncommited data outline color + + Uncommitted data outline color - - <p>In case of error while commiting data changes, the problematic cell will be outlined with this color.</p> + + <p>In case of error while committing data changes, the problematic cell will be outlined with this color.</p> - + Commit error outline color - + NULL value foreground - + Deleted row background - + Database list colors - + <p>Additional labels are those which tell you SQLite version, number of objects deeper in the tree, etc.</p> - + Additional labels foreground - + Status field colors - + Information message foreground - + Warning message foreground - + Error message foreground @@ -2004,7 +2024,7 @@ Browsing other pages will be possible after the row counting is done. - + File @@ -2019,48 +2039,38 @@ Browsing other pages will be possible after the row counting is done. - - Generate name basing on file path - - - - - Generate automatically - - - - + Options - + <p>Enable this if you want the database to be stored in configuration file and restored every time SQLiteStudio is started.</p> aasfd - + Permanent (keep it in configuration) - + Test connection - + Browse for existing database file on local computer - + Browse - + Enter an unique database name. @@ -2070,28 +2080,23 @@ Browsing other pages will be possible after the row counting is done. - - Enter a database file path. - - - - - This database is already on the list under name: %1 + + <p>Automatic name generation was disabled, becuase the name was edited manually. To restore automatic generation please erase contents of the name field.</p> - - Select a database type. + + Enter a database file path. - - Auto-generated + + This database is already on the list under name: %1 - - Type the name + + Select a database type. @@ -2379,7 +2384,7 @@ Browsing other pages will be possible after the row counting is done. - + Erase table data @@ -2400,127 +2405,127 @@ Browsing other pages will be possible after the row counting is done. - - + + Create group - + Group name - + Entry with name %1 already exists in group %2. - + Delete group - + Are you sure you want to delete group %1? All objects from this group will be moved to parent group. - + Are you sure you want to remove database '%1' from the list? - + Are you sure you want to remove following databases from the list: %1 - + Remove database - + Vacuum (%1) - - - Cannot import, because no import plugin is loaded. + + Autoincrement value for table '%1' has been reset successfully. - - - Cannot export, because no export plugin is loaded. + + Are you sure you want to delete all data from table(s): %1? - - Integrity check (%1) + + + Cannot import, because no import plugin is loaded. - - Reset autoincrement + + + Cannot export, because no export plugin is loaded. - - Are you sure you want to reset autoincrement value for table '%1'? + + Integrity check (%1) - An error occurred while trying to reset autoincrement value for table '%1': %2 + Reset autoincrement - - Autoincrement value for table '%1' has been reset successfly. + + Are you sure you want to reset autoincrement value for table '%1'? - - Are you sure you want to delete all data from table '%1'? + + An error occurred while trying to reset autoincrement value for table '%1': %2 - + An error occurred while trying to delete data from table '%1': %2 - + All data has been deleted for table '%1'. - + Following objects will be deleted: %1. - + Following databases will be removed from list: %1. - + Remainig objects from deleted group will be moved in place where the group used to be. - + %1<br><br>Are you sure you want to continue? - + Delete objects @@ -2784,77 +2789,77 @@ Please enter new, unique name, or press '%1' to abort the operation: - + Previous database - + Next database - + Show next tab sql editor - + Show previous tab sql editor - + Focus results below sql editor - + Focus SQL editor above sql editor - + Active database (%1/%2) - + Query finished in %1 second(s). Rows affected: %2 - + Query finished in %1 second(s). - + Clear execution history - + Are you sure you want to erase the entire SQL execution history? This cannot be undone. - + Cannot export, because no export plugin is loaded. - + No database selected in the SQL editor. Cannot create a view for unknown database. - - Editor window "%1" has uncommited data. + + Editor window "%1" has uncommitted data. @@ -3311,7 +3316,7 @@ Please enter new, unique name, or press '%1' to abort the operation: - Functions editor window has uncommited modifications. + Functions editor window has uncommitted modifications. @@ -3911,7 +3916,7 @@ Please enter new, unique name, or press '%1' to abort the operation:MdiWindow - Uncommited changes + Uncommitted changes @@ -4844,7 +4849,7 @@ Please enter new, unique name, or press '%1' to abort the operation:QuitConfirmDialog - Uncommited changes + Uncommitted changes @@ -4942,179 +4947,179 @@ find next SqlEditor - + Cut sql editor - + Copy sql editor - + Paste sql editor - + Delete sql editor - + Select all sql editor - + Undo sql editor - + Redo sql editor - + Complete sql editor - + Format SQL sql editor - + Save SQL to file sql editor - + Select file to save SQL sql editor - + Load SQL from file sql editor - + Delete line sql editor - + Move block down sql editor - + Move block up sql editor - + Copy block down sql editor - + Copy up down sql editor - + Find sql editor - + Find next sql editor - + Find previous sql editor - + Replace sql editor - + Toggle comment sql editor - + Could not open file '%1' for writing: %2 - + Saved SQL contents to file: %1 - + Syntax completion can be used only when a valid database is set for the SQL editor. - + Contents of the SQL editor are huge, so errors detecting and existing objects highlighting are temporarily disabled. - + Save to file - + SQL scripts (*.sql);;All files (*) - + Open file - + Could not open file '%1' for reading: %2 - + Reached the end of document. Hit the find again to restart the search. @@ -5146,12 +5151,7 @@ find next - - This cell is not editable, because: %1 - - - - + Cannot load the data for a cell that refers to the already closed database. @@ -5159,18 +5159,32 @@ find next SqlQueryItemDelegate - - - Cannot edit this cell. Details: %2 + + The row is marked for deletion. - - The row is marked for deletion. + + + + + + Cannot edit this cell. Details: %1 + + + + + + Structure of this table has changed since last data was loaded. Reload the data to proceed. + + + + + Editing a huge contents in an inline cell editor is not a good idea. It can become slow and inconvenient. It's better to edit such big contents in a Form View, or in popup editor (available under rick-click menu). - + Foreign key for column %2 has more than %1 possible values. It's too much to display in drop down list. You need to edit value manually. @@ -5178,69 +5192,69 @@ find next SqlQueryModel - - + + Only one query can be executed simultaneously. - - Uncommited data + + Cannot commit the data for a cell that refers to the already closed database. - - There are uncommited data changes. Do you want to proceed anyway? All uncommited changes will be lost. + + Could not begin transaction on the database. Details: %1 - - Cannot commit the data for a cell that refers to the already closed database. + + An error occurred while rolling back the transaction: %1 - - Could not begin transaction on the database. Details: %1 + + Tried to commit a cell which is not editable (yet modified and waiting for commit)! This is a bug. Please report it. - - An error occurred while commiting the transaction: %1 + + Uncommitted data - - An error occurred while rolling back the transaction: %1 + + There are uncommitted data changes. Do you want to proceed anyway? All uncommitted changes will be lost. - - Tried to commit a cell which is not editable (yet modified and waiting for commit)! This is a bug. Please report it. + + An error occurred while committing the transaction: %1 - - An error occurred while commiting the data: %1 + + An error occurred while committing the data: %1 - - + + Error while executing SQL query on database '%1': %2 - + Error while loading query results: %1 - + Insert multiple rows - + Number of rows to insert: @@ -5248,117 +5262,117 @@ find next SqlQueryView - + Go to referenced row in... - + Copy - + Copy as... - + Paste - + Paste as... - + Set NULL values - + Erase values - + Edit value in editor - + Commit - + Rollback - + Commit selected cells - + Rollback selected cells - + Define columns to sort by - + Remove custom sorting - + Insert row - + Insert multiple rows - + Delete selected row - + Generate query for selected cells - + No items selected to paste clipboard contents to. - + Go to referenced row in table '%1' - + table '%1' - + Referenced row (%1) - + Edit value @@ -5366,12 +5380,12 @@ find next SqlTableModel - - Error while commiting new row: %1 + + Error while committing new row: %1 - + Error while deleting row from table %1: %2 @@ -5634,7 +5648,7 @@ NULL - + Data @@ -5659,409 +5673,409 @@ NULL - + Export table table window - + Import data to table table window - + Populate table table window - + Refresh structure table window - + Commit structure changes table window - + Rollback structure changes table window - + Add column table window - + Edit column table window - - + + Delete column table window - + Move column up table window - + Move column down table window - + Create similar table table window - + Reset autoincrement value table window - + Add table constraint table window - + Edit table constraint table window - + Delete table constraint table window - + Move table constraint up table window - + Move table constraint down table window - + Add table primary key table window - + Add table foreign key table window - + Add table unique constraint table window - + Add table check constraint table window - + Refresh index list table window - + Create index table window - + Edit index table window - + Delete index table window - + Refresh trigger list table window - + Create trigger table window - + Edit trigger table window - + Delete trigger table window - + Are you sure you want to delete column '%1'? table window - + Following problems will take place while modifying the table. Would you like to proceed? table window - + Table modification table window - + Could not load data for table %1. Error details: %2 - + Could not process the %1 table correctly. Unable to open a table window. - + Could not restore window %1, because no database or table was stored in session for this window. - + Could not restore window '%1', because no database or table was stored in session for this window. - + Could not restore window '%1', because database %2 could not be resolved. - + Could not restore window '%1'', because the table %2 doesn't exist in the database %3. - + New table %1 - - Commited changes for table '%1' successfly. + + Committed changes for table '%1' successfully. - - Commited changes for table '%1' (named before '%2') successfly. + + Committed changes for table '%1' (named before '%2') successfully. - + + Autoincrement value for table '%1' has been reset successfully. + + + + + Uncommitted changes + + + + + There are uncommitted structure modifications. You cannot browse or edit data until you have table structure settled. +Do you want to commit the structure, or do you want to go back to the structure tab? + + + + + Table window "%1" has uncommitted structure modifications and data. + + + + + Table window "%1" has uncommitted data. + + + + + Table window "%1" has uncommitted structure modifications. + + + + Could not commit table structure. Error message: %1 table window - + Reset autoincrement - + Are you sure you want to reset autoincrement value for table '%1'? - + An error occurred while trying to reset autoincrement value for table '%1': %2 - - Autoincrement value for table '%1' has been reset successfly. - - - - + Empty name - + A blank name for the table is allowed in SQLite, but it is not recommended. Are you sure you want to create a table with blank name? - + Cannot create a table without at least one column. - + Cannot create table %1, if it has no primary key defined. Either uncheck the %2, or define a primary key. - + Cannot use autoincrement for primary key when %1 clause is used. Either uncheck the %2, or the autoincrement in a primary key. - + Are you sure you want to delete table constraint '%1'? table window - + Delete constraint table window - + Cannot export, because no export plugin is loaded. - + Cannot import, because no import plugin is loaded. - - Uncommited changes - - - - - There are uncommited structure modifications. You cannot browse or edit data until you have table structure settled. -Do you want to commit the structure, or do you want to go back to the structure tab? - - - - + Go back to structure tab - + Commit modifications and browse data. - + Name table window indexes - + Unique table window indexes - + Columns table window indexes - + Partial index condition table window indexes - + Name table window triggers - + Event table window triggers - + Condition table window triggers - + Details table window triggers - - - Table window "%1" has uncommited structure modifications and data. - - - - - Table window "%1" has uncommited data. - - - - - Table window "%1" has uncommited structure modifications. - - TriggerColumnsDialog @@ -6075,6 +6089,16 @@ Do you want to commit the structure, or do you want to go back to the structure Triggering columns: + + + Select all + + + + + Deselect all + + TriggerDialog @@ -6166,13 +6190,13 @@ Do you want to commit the structure, or do you want to go back to the structure - + Error trigger dialog - + An error occurred while executing SQL statements: %1 @@ -6220,7 +6244,7 @@ Do you want to commit the structure, or do you want to go back to the structure - + Data @@ -6262,224 +6286,224 @@ Do you want to commit the structure, or do you want to go back to the structure - + Refresh the view view window - + Commit the view changes view window - + Rollback the view changes view window - + Explicit column names - + Generate output column names automatically basing on result columns of the view. - + Add column view window - + Edit column view window - + Delete column view window - + Move column up view window - + Move column down view window - + Refresh trigger list view window - + Create new trigger view window - + Edit selected trigger view window - + Delete selected trigger view window - - - View window "%1" has uncommited structure modifications and data. - - - View window "%1" has uncommited data. + View window "%1" has uncommitted structure modifications and data. - View window "%1" has uncommited structure modifications. + View window "%1" has uncommitted data. - - Could not load data for view %1. Error details: %2 + + View window "%1" has uncommitted structure modifications. - - Uncommited changes + + Uncommitted changes - - There are uncommited structure modifications. You cannot browse or edit data until you have the view structure settled. + + There are uncommitted structure modifications. You cannot browse or edit data until you have the view structure settled. Do you want to commit the structure, or do you want to go back to the structure tab? - - Go back to structure tab + + Committed changes for view '%1' successfully. - - Commit modifications and browse data. + + Committed changes for view '%1' (named before '%2') successfully. - - Commited changes for view '%1' successfly. + + Could not load data for view %1. Error details: %2 - - Commited changes for view '%1' (named before '%2') successfly. + + Go back to structure tab - + + Commit modifications and browse data. + + + + Could not commit view changes. Error message: %1 view window - + Override columns - + Currently defined columns will be overriden. Do you want to continue? - + Could not determinate columns returned from the view. The query is problably incomplete or contains errors. - + Name view window triggers - + Instead of view window triggers - + Condition view window triggers - + Details table window triggers - + Could not process the %1 view correctly. Unable to open a view window. - + Empty name - + A blank name for the view is allowed in SQLite, but it is not recommended. Are you sure you want to create a view with blank name? - + The SELECT statement could not be parsed. Please correct the query and retry. Details: %1 - + The view could not be modified due to internal SQLiteStudio error. Please report this! - + The view code could not be parsed properly for execution. This is a SQLiteStudio's bug. Please report it. - + Following problems will take place while modifying the view. Would you like to proceed? view window - + View modification view window diff --git a/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_pl.qm b/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_pl.qm index dfc8b5e..0adb64a 100644 Binary files a/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_pl.qm and b/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_pl.qm differ diff --git a/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_pl.ts b/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_pl.ts index 50dd7ce..ad6aaf3 100644 --- a/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_pl.ts +++ b/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_pl.ts @@ -1,6 +1,6 @@ - + AboutDialog @@ -431,9 +431,13 @@ - Collations editor window has uncommited modifications. + Collations editor window has uncommitted modifications. Okno edytora zestawień ma niezatwierdzone zmiany. + + Collations editor window has uncommited modifications. + Okno edytora zestawień ma niezatwierdzone zmiany. + ColorButton @@ -906,7 +910,7 @@ ale można go używać. ConfigDialog - + Configuration Konfiguracja @@ -971,154 +975,153 @@ ale można go używać. Przeglądanie i edycja danych - + Number of data rows per page: Liczba wierszy danych na stronie: - - + + <p>When the data is read into grid view columns width is automatically adjusted. This value limits the initial width for the adjustment, but user can still resize the column manually over this limit.</p> <p>Kiedy dane są wczytane do widoku siatki, szerokość kolumn jest automatycznie dostosowywana. Ta wartość ogranicza początkową szerokość tego dostosowywania, ale użytkownik nadal może rozszerzać kolumnę ręcznie poza ten limit.</p> - + Limit initial data column width to (in pixels): Ogranicz początkową szerokość kolumn danych (w pikselach): - + Inserting new row in data grid Wstawianie nowego wiersza w widoku siatki danych. - + Before currently selected row Przed aktualnie wybranym wierszem - + After currently selected row Po aktualnie wybranym wierszu. - + At the end of data view Na końcu widoku siatki danych - + Data types Type danych - + Available editors: Dostępne edytory: - + Editors selected for this data type: Edytory wybrane dla tego typu danych: - + Schema editing Edycja schematu - + Number of DDL changes kept in history. Liczba zmian DDL trzymanych w historii. - + DDL history size: Rozmiar historii DDL: - Don't show DDL preview dialog when commiting schema changes - Nie pokazuj okna podglądu DDL podczas zatwierdzania zmian schematu + Nie pokazuj okna podglądu DDL podczas zatwierdzania zmian schematu - + SQL queries Zapytania SQL - - + + Number of queries kept in the history. Liczba zapytań trzymana w historii. - + History size: Rozmiar historii: - + <p>If there is more than one query in the SQL editor window, then (if this option is enabled) only a single query will be executed - the one under the keyboard insertion cursor. Otherwise all queries will be executed. You can always limit queries to be executed by selecting those queries before calling to execute.</p> <p>Jeśli w oknie edytora SQL jest więcej niż jedno zapytanie, to (jeśli ta opcja jest włączona) tylko jedno zapytanie będzie wykonana - to, które znajduje się pod kursorem pisania. W przeciwnym wypadku wszystkie zapytania będą wykonywane. Zawsze możesz ograniczyć zapytania do wywołania przez zaznaczenie tych zapytań, które chcesz wywołać.</p> - + Execute only the query under the cursor Wykonuj tylko zapytania będące pod kursorem - + Updates Aktualizacje - + Automatically check for updates at startup Sprawdzaj aktualizacje automatycznie przy starcie - + Session Sesje - + Restore last session (active MDI windows) after startup Przywróć ostatnią sesję (aktywne okna MDI) po starcie - + Filter shortcuts by name or key combination Filtruj skróty po nazwie, lub kombinacji klawiszy - + Action Akcja - + Key combination Kombinacja klawiszy - + Changing language requires application restart to take effect. Zmiana języka wymaga restartu aplikacji, aby zadziałać. - + Compact layout Układ kompaktowy - + <p>Compact layout reduces all margins and spacing on the UI to minimum, making space for displaying more data. It makes the interface a little bit less aesthetic, but allows to display more data at once.</p> <p>Układ kompaktowy zmniejsza wszystkie marginesy i odstępy na interfejsie do minimum, robiąc więcej miejsca na wyświetlanie danych. Powoduje to, że interfejs jest nieco mniej estetyczny, ale pozwala to na prezentację większej ilości danych naraz.</p> - + Use compact layout Użyj układu kompaktowego @@ -1194,7 +1197,7 @@ ale można go używać. Wyświetlaj tabele i indeksy systemowe na liście - + Table windows Okna tabel @@ -1203,12 +1206,12 @@ ale można go używać. Gdy włączone, Okna Tabel będą się pokazywać z zakładką danych, zamiast z zakładką struktury. - + Open Table Windows with the data tab for start Otwieraj Okna Tabeli z zakładką danych na początek - + View windows Okna Widoków @@ -1217,42 +1220,42 @@ ale można go używać. Gdy włączone, Okna Widoków będą się pokazywać z zakładką danych, zamiast z zakładką struktury. - + Open View Windows with the data tab for start Otwieraj Okna Widoku z zakładką danych na początek - + Main window dock areas Strefy dokowania głównego okna - + Left and right areas occupy corners Lewa i prawa strefa zajmują rogi - + Top and bottom areas occupy corners Górna i dolna strefa zajmują rogi - + Hide built-in plugins Ukryj wtyczki wbudowane - + Current style: Aktualny styl: - + Preview Podgląd - + Enabled Włączone @@ -1261,13 +1264,13 @@ ale można go używać. Kolumna - + Disabled Wyłączone - - + + Language Język @@ -1297,237 +1300,274 @@ ale można go używać. Próbuj całkowicie pomijać dialog podczas upuszczania pliku bazy na listę - + + Keep NULL value when entering empty value + Zachowaj wartość NULL gdy wstawiania jest pusta wartość + + + <p>When this is enabled and user holds mouse pointer over a cell in any data view (query results, a table data, a view data) a tooltip will appear with details about the cell - it includes details like column data type, constraints, ROWID and others.</p> <p>Gdy to jest włączone i użytkownik zatrzyma kursor myszy nad komórką w widoku siatki danych (wyniki zapytania, dane tabeli, dane widoku), to pojawi się podpowiedź ze szczegółami odnośnie komórki - zawiera ona szczegóły , jak typ danych kolumny, ograniczenia, ROWID i inne.</p> - + Show column and row details tooltip in data view Pokazuj podpowiedź ze szczegółami o kolumnie i wierszu w widoku siatki danych - + + <p>When editing a cell which used to have NULL value and entering empty string as new value, then this option determinates whether the new value should remain NULL (have this option enabled), or should it be overwritten with empty string value (have this option disabled).</p> + <p>Kiedy edytowana jest komórka, która miała wartość NULL, a nowa wartość wprowadzona jest pusta, to ta opcja decyduje o tym, czy wartość powinna pozostać NULL (gdy ta opcja jest włączona), czy powinna być nadpisana pustym łańcuchem znaków (gdy ta opcja wyłączona).</p> + + + + <html><head/><body><p>Enable this to always enforce DEFAULT value when committing a NULL value for a column that has DEFAULT value defined, even though the column is allowed to contain NULL values.</p><p>Disable this option to use DEFAULT value exclusively when NULL value is committed for column with NOT NULL constraint.</p></body></html> + <html><head/><body><p>Włącz to, aby wymusić wartość DEFAULT podczas zatwierdzania wartości NULL dla kolumn, które mają zdefiniowaną wartość DEFAULT, nawet jeśli kolumna dopuszcza wartości NULL.</p><p>Wyłącz tą opcję aby używać wartości DEFAULT tylko i wyłącznie, gdy wartość NULL jest zatwierdzana dla kolumny z ograniczeniem NOT NULL.</p></body></html> + + + + Use DEFAULT value (if defined), when committing NULL value + Używaj wartości DEFAULT (jeśli zdefiniowana), gdy zatwierdzana jest wartość NULL + + + <p>When enabled, Table Windows will show up with the data tab, instead of the structure tab.</p> <p>Gdy włączone, Okna Tabeli będą się otwierać na zakładce danych, zamiast na zakładce struktury.</p> - + <p>When enabled the "Data" tab will be placed as first tab in every Table Window, instead of being at second place.</p> <p>Gdy włączone, to zakładka "Dane" będzie umieszczona jako pierwsza w każdym Oknie Tabeli, zamiast jako druga.</p> - + Place data tab as first tab in a Table Window Ustaw zakładkę danych jako pierwszą w Oknie Tabeli - + <p>When enabled, View Windows will show up with the data tab, instead of the structure tab.</p> <p>Gdy włączone, Okna Widoku będą się otwierać na zakładce danych, zamiast na zakładce struktury.</p> - + <p>When enabled the "Data" tab will be placed as first tab in every View Window, instead of being at second place.</p> <p>Gdy włączone, to zakładka "Dane" będzie umieszczona jako pierwsza w każdym Oknie Widoku, zamiast jako druga.</p> - + Place data tab as first tab in a View Window Ustaw zakładkę danych jako pierwszą w Oknie Widoku - + + Don't show DDL preview dialog when committing schema changes + Nie pokazuj okna podglądu DDL podczas zatwierdzania zmian struktury + + + Status Field Pole Statusu - + <p>When user manually closes the Status panel, this option makes sure that if any new message is printed in the Status panel it will be reopened. If it's disabled, then Status panel can only be open manually by the user from the "View" menu.</p> <p>Kiedy użytkownik ręcznie zamyka panel Statusu, ta opcja zapewnia, że zostanie ono otwarte ponownie, gdy jest wyświetlona nowa wiadomość. Jeśli jest ona wyłączona, to panel Statusu może być otwarte tylko ręcznie z menu "Widok".</p> - + Always open Status panel when new message is printed Zawsze otwieraj panel Statusu, gdy wyświetlona jest nowa wiadomość - + Active formatter plugin Aktywna wtyczka formatera - + SQL editor font Czcionka edytora SQL - + Database list font Czcionka listy baz danych - + Database list additional label font Czcionka dodatkowych etykiety listy baz danych - + Data view font Czcionka widoku danych - + Status field font Czcionka pola statusu - + SQL editor colors Kolory edytora SQL - + Current line background Tło bieżącej linii - + <p>SQL strings are enclosed with single quote characters.</p> <p>Łańcuchy znaków SQL są zamknięte pomiędzy znakami apostrofu.</p> - + String foreground Czcionka łańcucha znaków - + <p>Bind parameters are placeholders for values yet to be provided by the user. They have one of the forms:</p><ul><li>:param_name</li><li>$param_name</li><li>@param_name</li><li>?</li></ul> <b>Parametry wiążące to wyrażenia zastępcze dla wartości, które mają być dopiero dostarczone przez użytkownika. Mają one jedną z form: </p><ul><li>:nazwa_parametru</li><li>$nazwa_parametru</li><li>@nazwa_parametru</li><li>?</li></ul> - + Bind parameter foreground Czcionka parametru wiążącego - + Highlighted parenthesis background Tło podświetlonych nawiasów - + <p>BLOB values are binary values represented as hexadecimal numbers, like:</p><ul><li>X'12B4'</li><li>x'46A2F4'</li></ul> <p>Wartości BLOB są wartościami binarnymi, reprezentowanymi jako liczby heksadecymalne, jak np:</p><ul><li>X'12B4'</li><li>x'46A2F4'</li></ul> - + BLOB value foreground - + Regular foreground Standardowa czcionka - + Line numbers area background Tło obszaru numerów linii - + Keyword foreground Czcionka słowa kluczowego - + Number foreground Czcionka liczby - + Comment foreground Czcionka komentarza - + <p>Valid objects are name of tables, indexes, triggers, or views that exist in the SQLite database.</p> <p>Poprawne obiekty to nazwy tabel, indekstów, wyzwalaczy i widoków, które istnieją w basie SQLite.</p> - + Valid objects foreground Czcionka poprawnych obiektów - + Data view colors Kolory widoku danych - + + <p>Any data changes will be outlined with this color, until they're committed to the database.</p> + <p>Jakiekolwiek zmiany danych będą otoczone ramką w tym kolorze, dopóki nie zostaną zatwierdzone do bazy.</p> + + + + Uncommitted data outline color + Kolor obramowania niezatwierdzonych danych + + + + <p>In case of error while committing data changes, the problematic cell will be outlined with this color.</p> + <p>W razie błędu podczas zatwierdzania zmian w danych, komórki sprawiające problem będą obramowane tym kolorem.</p> + + <p>Any data changes will be outlined with this color, until they're commited to the database.</p> - <p>Jakakolwiek zmiana danych będzie obrysowana tym kolorem, dopóki nie zostanie zatwierdzona do bazy danych.</p> + <p>Jakakolwiek zmiana danych będzie obrysowana tym kolorem, dopóki nie zostanie zatwierdzona do bazy danych.</p> - Uncommited data outline color - Kolor obrysu niezatwierdzonych danych + Kolor obrysu niezatwierdzonych danych - <p>In case of error while commiting data changes, the problematic cell will be outlined with this color.</p> - <p>W przypadku błędu podczas zatwierdzania zmian danych, komórka będąca przyczyną problemu zostanie obrysowana tym kolorem.</p> + <p>W przypadku błędu podczas zatwierdzania zmian danych, komórka będąca przyczyną problemu zostanie obrysowana tym kolorem.</p> - + Commit error outline color Kolor obrysu błędu zatwierdzania - + NULL value foreground Kolor czcionki wartości NULL - + Deleted row background Tło wiersza usuniętego - + Database list colors Kolory listy baz danych - + <p>Additional labels are those which tell you SQLite version, number of objects deeper in the tree, etc.</p> <p>Dodatkowe etykiety to te, które mówią o wersji SQLite, liczbie obiektów w głębszych częściach drzewa, itp.</p> - + Additional labels foreground Czcionka dodatkowych etykiet - + Status field colors Kolory pola statusu - + Information message foreground Czcionka wiadomości informującej - + Warning message foreground Czcionka wiadomości ostrzegającej - + Error message foreground Czcionka wiadomości błędu @@ -2019,22 +2059,21 @@ Przeglądanie pozostałych stron będzie możliwe kiedy liczenie wierszy zostani Sterownik bazy danych - Generate automatically - Generuj automatycznie + Generuj automatycznie - + Options Opcje - + Permanent (keep it in configuration) Trwała (trzymaj w konfiguracji) - + Test connection Testuj połączenie @@ -2057,7 +2096,7 @@ Przeglądanie pozostałych stron będzie możliwe kiedy liczenie wierszy zostani - + File Plik @@ -2067,16 +2106,15 @@ Przeglądanie pozostałych stron będzie możliwe kiedy liczenie wierszy zostani Nazwa (na liście) - Generate name basing on file path - Generuj nazwę bazując na ścieżce do pliku + Generuj nazwę bazując na ścieżce do pliku Permanent Trwała - + <p>Enable this if you want the database to be stored in configuration file and restored every time SQLiteStudio is started.</p> aasfd <p>Włącz to, jeśli chcesz aby baza danych była przechowywana w pliku konfiguracji i przywracana za każdym razem, gdy startuje SQLiteStudio.</p> @@ -2086,17 +2124,17 @@ Przeglądanie pozostałych stron będzie możliwe kiedy liczenie wierszy zostani Testuj połączenie z bazą - + Browse for existing database file on local computer Przeglądaj lokalny komputer w poszukiwaniu istniejącej bazy - + Browse Przeglądaj - + Enter an unique database name. Wprowadź unikalną nazwę bazy danych. @@ -2106,33 +2144,36 @@ Przeglądanie pozostałych stron będzie możliwe kiedy liczenie wierszy zostani Ta nazwa jest już w użyciu. Proszę wprowadzić unikalną nazwę. - + + <p>Automatic name generation was disabled, becuase the name was edited manually. To restore automatic generation please erase contents of the name field.</p> + <p>Automatyczne generowanie nazwy zostało wyłączone, ponieważ nazwa była edytowana ręcznie. Aby przywrócić automatyczne generowanie, proszę wyczyścić pole nazwy.</p> + + + Enter a database file path. Wprowadź ścieżkę do pliku bazy danych. - + This database is already on the list under name: %1 Ta baza jest już na liście pod nazwą: %1 - + Select a database type. Wybierz typ bazy danych. - Auto-generated - Auto-generowana + Auto-generowana The name will be auto-generated Nazwa będzie generowana automatycznie - Type the name - Wprowadź nazwę + Wprowadź nazwę @@ -2314,32 +2355,42 @@ Przeglądanie pozostałych stron będzie możliwe kiedy liczenie wierszy zostani Generuj zapytanie dla tabeli - + Entry with name %1 already exists in group %2. Pozycja o nazwie %1 istnieje już w grupie %2. - + Are you sure you want to remove database '%1' from the list? Czy napewno chcesz wycofać bazę '%1' z listy? - + Are you sure you want to remove following databases from the list: %1 Czy na pewno chcesz wycofać następujące bazy z listy: %1 - + Remove database Wycofaj bazę - + Vacuum (%1) Odkurz (%1) + + + Autoincrement value for table '%1' has been reset successfully. + Wartość automatycznej inkrementacji dla tabeli '%1' została zresetowana. + + + + Are you sure you want to delete all data from table(s): %1? + Czy na pewno chcesz usunąć wszystkie dane z tabel(i): %1? + Drop the table Porzuć tabelę @@ -2468,7 +2519,7 @@ Przeglądanie pozostałych stron będzie możliwe kiedy liczenie wierszy zostani - + Erase table data Wymaż dane tabeli @@ -2484,23 +2535,23 @@ Przeglądanie pozostałych stron będzie możliwe kiedy liczenie wierszy zostani Grupowanie - - + + Create group Utwórz grupę - + Group name Nazwa grupy - + Delete group Usuń grupę - + Are you sure you want to delete group %1? All objects from this group will be moved to parent group. Czy na pewno chcesz usunąć grupę %1? @@ -2515,14 +2566,14 @@ Wszystkie obiekty z tej grupy zostaną przeniesione do nadrzędnej grupy.Czy na pewno chcesz usunąć bazę danych '%1'? - - + + Cannot import, because no import plugin is loaded. Nie można zaimportować, ponieważ żadna wtyczka importu nie została załadowana. - - + + Cannot export, because no export plugin is loaded. Nie można wyeksportować, ponieważ żadna wtyczka eksportu nie została załadowana. @@ -2535,67 +2586,65 @@ Wszystkie obiekty z tej grupy zostaną przeniesione do nadrzędnej grupy.Wykonanie VACUUM przebiegło pomyślnie. - + Integrity check (%1) Sprawdzanie spójności (%1) - + Reset autoincrement Wyzeruj autoinkrementację - + Are you sure you want to reset autoincrement value for table '%1'? Czy na pewno chcesz wyzerować wartość autoinkrementacji dla tabeli '%1'? - + An error occurred while trying to reset autoincrement value for table '%1': %2 Wystąpił błąd podczas próby wyzerowania wartości autoinkrementacji dla tabeli '%1': %2 - Autoincrement value for table '%1' has been reset successfly. - Wartość autoinkrementacji dla tabeli '%1' została pomyślnie wyzerowana. + Wartość autoinkrementacji dla tabeli '%1' została pomyślnie wyzerowana. - Are you sure you want to delete all data from table '%1'? - Czy na pewno chcesz usunąć wszystkie dane z tabeli '%1'? + Czy na pewno chcesz usunąć wszystkie dane z tabeli '%1'? - + An error occurred while trying to delete data from table '%1': %2 Wystąpił błąd podczas próby usunięcia danych z tabeli '%1': %2 - + All data has been deleted for table '%1'. Wszystkie dane z tabeli '%1' zostały usunięte. - + Following objects will be deleted: %1. Następujące obiekty zostaną usunięte: %1 - + Following databases will be removed from list: %1. Następujące bazy danych zostaną usunięte z listy: %1 - + Remainig objects from deleted group will be moved in place where the group used to be. Pozostałe obiekty z usuniętej grupy będą przeniesione w miejsce, gdzie dotychczas była ta grupa. - + %1<br><br>Are you sure you want to continue? %1<br><br>Czy na pewno chcesz kontynuować? - + Delete objects Usuń obiekty @@ -2868,82 +2917,86 @@ Proszę podać nową, unikalną nazwę, lub nacisnąć '%1', aby przer Utwórz widok z zapytania - + Previous database Poprzednia baza danych - + Next database Następna baza danych - + Show next tab sql editor Pokaż następną kartę - + Show previous tab sql editor Pokaż poprzednią kartę - + Focus results below sql editor Aktywuj wyniki poniżej - + Focus SQL editor above sql editor Aktywuj edytor SQL powyżej - + Active database (%1/%2) Aktywna baza danych (%1/%2) - + Query finished in %1 second(s). Rows affected: %2 Zapytanie ukończone w %1 sekund(y). Liczba przetworzonych wierszy: %2 - + Query finished in %1 second(s). Zapytanie ukończone w %1 sekund(y). + + + Editor window "%1" has uncommitted data. + Okno edytora "%1" ma niezatwierdzone dane. + Query finished in %2 second(s). Zapytanie ukończone w %2 sekund(y). - + Clear execution history Wymaż historię zapytań - + Are you sure you want to erase the entire SQL execution history? This cannot be undone. Czy na pewno chcesz wymazać całą historię zapytań SQL? Tego nie można odwrócić. - + Cannot export, because no export plugin is loaded. Nie można wyeksportować, ponieważ żadna wtyczka eksportu nie została załadowana. - + No database selected in the SQL editor. Cannot create a view for unknown database. Nie wybrano bazdy danych w edytorze SQL. Nie można utworzyć widoku dla nieznanej bazy. - Editor window "%1" has uncommited data. - Okno edytora "%1" ma niezatwierdzone dane. + Okno edytora "%1" ma niezatwierdzone dane. @@ -3399,8 +3452,12 @@ Proszę podać nową, unikalną nazwę, lub nacisnąć '%1', aby przer + Functions editor window has uncommitted modifications. + Okno edytora funkcji ma niezatwierdzone modyfikacje. + + Functions editor window has uncommited modifications. - Okno edytora funkcji ma niezatwierdzone zmiany. + Okno edytora funkcji ma niezatwierdzone zmiany. @@ -3999,9 +4056,13 @@ Proszę podać nową, unikalną nazwę, lub nacisnąć '%1', aby przer MdiWindow - Uncommited changes - Niezatwierdzone dane + Niezatwierdzone dane + + + + Uncommitted changes + Niezatwierdzone zmiany @@ -4936,9 +4997,13 @@ Proszę podać nową, unikalną nazwę, lub nacisnąć '%1', aby przer QuitConfirmDialog - Uncommited changes - Niezatwierdzone dane + Niezatwierdzone dane + + + + Uncommitted changes + Niezatwierdzone zmiany @@ -5038,179 +5103,179 @@ znajdź następny SqlEditor - + Cut sql editor Wytnij - + Copy sql editor Kopiuj - + Paste sql editor Wklej - + Delete sql editor Usuń - + Select all sql editor Zaznacz wszystko - + Undo sql editor Cofnij - + Redo sql editor Przywróć - + Complete sql editor Dopełnij - + Format SQL sql editor Formatuj SQL - + Save SQL to file sql editor Zapisz SQL do pliku - + Select file to save SQL sql editor Wybierz plik do zapisu SQL - + Load SQL from file sql editor Wczytaj SQL z pliku - + Delete line sql editor Usuń linię - + Move block down sql editor Przesuń blok w dół - + Move block up sql editor Przesuń blok w górę - + Copy block down sql editor Skopiuj blok w dół - + Copy up down sql editor Skopiuj blok w górę - + Find sql editor Znajdź - + Find next sql editor Znajdź następny - + Find previous sql editor Znajdź poprzedni - + Replace sql editor Zastąp - + Toggle comment sql editor Przełącz komentarz - + Saved SQL contents to file: %1 Zapisano zawartość SQL do pliku: %1 - + Syntax completion can be used only when a valid database is set for the SQL editor. Dopełnianie składni może być użyte tylko wtedy, gdy poprawna baza danych jest ustawiona w edytorze SQL. - + Contents of the SQL editor are huge, so errors detecting and existing objects highlighting are temporarily disabled. Zawartość edytora SQL jest ogromna, więc sprawdzanie błędów i podświetlanie istniejących obiektów zostało tymczasowo wyłączone. - + Save to file Zapisz do pliku - + Could not open file '%1' for writing: %2 Nie udało się otworzyć pliku '%1' do zapisu: %2 - + SQL scripts (*.sql);;All files (*) Skrypty SQL (*.sql);;Wszystkie pliki (*) - + Open file Otwórz plik - + Could not open file '%1' for reading: %2 Nie udało się otworzyć pliku '%1' do odczytu: %2 - + Reached the end of document. Hit the find again to restart the search. Osiągnięto koniec dokumentu. Wciśnij szukanie ponownie, aby zrestartować szukanie. @@ -5242,12 +5307,11 @@ znajdź następny Ograniczenie: - This cell is not editable, because: %1 - Tej komórki nie można edytować, ponieważ: %1 + Tej komórki nie można edytować, ponieważ: %1 - + Cannot load the data for a cell that refers to the already closed database. Nie można załadować danych dla komórki, która odwołuje się do zamkniętej już bazy danych. @@ -5255,18 +5319,36 @@ znajdź następny SqlQueryItemDelegate - - Cannot edit this cell. Details: %2 - Nie można edytować tej komórki. Szczegóły: %2 + Nie można edytować tej komórki. Szczegóły: %2 - + The row is marked for deletion. Wiersz jest zaznaczony do usunięcia. - + + + + + + Cannot edit this cell. Details: %1 + Nie można edytować tej komórki. Szczegóły: %1 + + + + + Structure of this table has changed since last data was loaded. Reload the data to proceed. + Struktura tej tabeli zmieniła się od ostatniego ładowania danych. Przeładuj dane, aby kontynuować. + + + + Editing a huge contents in an inline cell editor is not a good idea. It can become slow and inconvenient. It's better to edit such big contents in a Form View, or in popup editor (available under rick-click menu). + Edytowanie ogromnych ilości danych w podręcznym edytorze nie jest dobrym pomysłem. Może być on powolny i nieporęczny. Lepiej edytować takie duże ilości danych w Widoku Formularza, lub w osobnym oknie edytora (dostępnym w menu prawego kliknięcia myszy). + + + Foreign key for column %2 has more than %1 possible values. It's too much to display in drop down list. You need to edit value manually. Klucz obcy dla kolumny %2 ma więcej niż %1 możliwych wartości. To zbyt wiele, by wyświetlić w liście rozwijanej. Musisz edytować wartość ręcznie. @@ -5274,54 +5356,50 @@ znajdź następny SqlQueryModel - - + + Only one query can be executed simultaneously. Tylko jedno zapytanie może być wykonywane w danym momencie. - Uncommited data - Niezatwierdzone dane + Niezatwierdzone dane - There are uncommited data changes. Do you want to proceed anyway? All uncommited changes will be lost. - Niektóre zmiany w danych nie zostały zatwierdzone. Czy na pewno chcesz kontynuować? Wszystkie niezatwierdzone zmiany zostaną utracone. + Niektóre zmiany w danych nie zostały zatwierdzone. Czy na pewno chcesz kontynuować? Wszystkie niezatwierdzone zmiany zostaną utracone. - + Cannot commit the data for a cell that refers to the already closed database. Nie można zatwierdzić danych dla komórki, która odnosi się do zamkniętej już bazy danych. - + Could not begin transaction on the database. Details: %1 Nie udało się rozpocząć transakcji na bazie danych. Szczegóły: %1 - An error occurred while commiting the transaction: %1 - Wystąpił błąd podczas zatwierdzania transakcji: %1 + Wystąpił błąd podczas zatwierdzania transakcji: %1 - + An error occurred while rolling back the transaction: %1 Wystąpił błąd podczas wycofywania transakcji: %1 - + Tried to commit a cell which is not editable (yet modified and waiting for commit)! This is a bug. Please report it. Próbowano zatwierdzić komórkę, której nie można edytować (a mimo to została zmodyfikowana i czeka na zatwierdzenie)! To jest błąd. Proszę to zgłosić. - An error occurred while commiting the data: %1 - Wystąpił błąd podczas zatwierdzania danych: %1 + Wystąpił błąd podczas zatwierdzania danych: %1 - - + + Error while executing SQL query on database '%1': %2 Błąd podczas wykonywania zapytania SQL na bazie '%1': %2 @@ -5330,17 +5408,37 @@ znajdź następny Błąd podczas wykonywania zapytania SQL: %1 - + + Uncommitted data + Niezatwierdzone dane + + + + There are uncommitted data changes. Do you want to proceed anyway? All uncommitted changes will be lost. + Niektóre zmiany w danych nie zostały zatwierdzone. Czy na pewno chcesz kontynuować? Wszystkie niezatwierdzone zmiany zostaną utracone. + + + + An error occurred while committing the transaction: %1 + Wystąpił błąd podczas zatwierdzania transakcji: %1 + + + + An error occurred while committing the data: %1 + Wystąpił błąd podczas zatwierdzania danych: %1 + + + Error while loading query results: %1 Błąd podczas wczytywania wyników zapytania: %1 - + Insert multiple rows Wstaw wiele wierszy - + Number of rows to insert: Liczba wierszy do wstawienia: @@ -5348,117 +5446,117 @@ znajdź następny SqlQueryView - + Go to referenced row in... Idź do powiązanego wiersza w... - + Copy Kopiuj - + Copy as... Kopiuj jako... - + Paste Wklej - + Paste as... Wklej jako... - + Set NULL values Ustaw wartości NULL - + Erase values Wymaż wartości - + Edit value in editor Edytuj wartość w edytorze - + Commit Zatwierdź - + Rollback Wycofaj - + Commit selected cells Zatwierdź zaznaczone komórki - + Rollback selected cells Wycofaj zaznaczone komórki - + Define columns to sort by Zdefiniuj kolumny po których sortować - + Remove custom sorting Wycofaj własne sortowanie - + Insert row Wstaw wiersz - + Insert multiple rows Wstaw wiele wierszy - + Delete selected row Usuń zaznaczony wiersz - + Generate query for selected cells Generuj zapytanie dla wybranych komórek - + No items selected to paste clipboard contents to. Nie wybrano elementów do których należy wkleić zawartość schowka. - + Go to referenced row in table '%1' Idź do powiązanego wiersza w tabeli '%1' - + table '%1' tabela '%1' - + Referenced row (%1) Powiązany wiersz (%1) - + Edit value Edytuj wartość @@ -5466,12 +5564,16 @@ znajdź następny SqlTableModel - Error while commiting new row: %1 + Błąd podczas zatwierdzania nowego wiersza: %1 + + + + Error while committing new row: %1 Błąd podczas zatwierdzania nowego wiersza: %1 - + Error while deleting row from table %1: %2 Błąd podczas usuwania wiersza z tabeli %1: %2 @@ -5738,7 +5840,7 @@ NULL - + Data Dane @@ -5763,194 +5865,194 @@ NULL DDL - + Export table table window Eksportuj tabelę - + Import data to table table window Importuj do tabeli - + Populate table table window Zaludnij tabelę - + Refresh structure table window Odśwież strukturę - + Commit structure changes table window Zatwierdź zmiany w strukturze - + Rollback structure changes table window Wycofaj zmiany w strukturze - + Add column table window Dodaj kolumnę - + Edit column table window Edytuj kolumnę - - + + Delete column table window Usuń kolumnę - + Move column up table window Przesuń kolumnę w górę - + Move column down table window Przesuń kolumnę w dół - + Create similar table table window Utwórz podobną tabelę - + Reset autoincrement value table window Wyzeruj wartość autoinkrementacji - + Add table constraint table window Dodaj ograniczenie tabeli - + Edit table constraint table window Edytuj ograniczenie tabeli - + Delete table constraint table window Usuń ograniczenie tabeli - + Move table constraint up table window Przesuń ograniczenie tabeli w górę - + Move table constraint down table window Przesuń ograniczenie tabeli w dół - + Add table primary key table window Dodaj klucz główny tabeli - + Add table foreign key table window Dodaj klucz obcy tabeli - + Add table unique constraint table window Dodaj ograniczenie unikalnych wartości tabeli - + Add table check constraint table window Dodaj ograniczenie warunkiem tabeli - + Refresh index list table window Odśwież listę indeksów - + Create index table window Utwórz indeks - + Edit index table window Edytuj indeks - + Delete index table window Usuń indeks - + Refresh trigger list table window Odśwież listę wyzwalaczy - + Create trigger table window Utwórz wyzwalacz - + Edit trigger table window Edytuj wyzwalacz - + Delete trigger table window Usuń wyzwalacz - + Are you sure you want to delete column '%1'? table window Czy na pewno chcesz usunąć kolumnę '%1'? - + Following problems will take place while modifying the table. Would you like to proceed? table window @@ -5958,41 +6060,83 @@ Would you like to proceed? Czy chcesz kontynuować? - + Table modification table window Modyfikacja tabeli - + Could not load data for table %1. Error details: %2 Nie udało się załadować danych dla tabeli %1. Szczegóły błędu: %2 - + Could not process the %1 table correctly. Unable to open a table window. Nie udało się przetworzyć poprawnie tabeli %1. Nie można otworzyć okna tabeli. - + Could not restore window %1, because no database or table was stored in session for this window. Nie można przywrócić okna %1, ponieważ nie ma bazy danych lub tabeli zachowanej w sesji dla tego okna. - + Could not restore window '%1', because no database or table was stored in session for this window. Nie można przywrócić okna %1, ponieważ nie ma bazy danych lub tabeli zachowanej w sesji dla tego okna. - + Could not restore window '%1', because database %2 could not be resolved. Nie udało się przywrócić okna '%1', ponieważ nie udało się ustalić bazy danych %2. - + Could not restore window '%1'', because the table %2 doesn't exist in the database %3. Nie można przywrócić okna '%1', ponieważ tabela %2 już nie jestnieje w bazie danych %3. + + + Committed changes for table '%1' successfully. + Pomyślnie zatwierdzono zmiany dla tabeli '%1'. + + + + Committed changes for table '%1' (named before '%2') successfully. + Pomyślnie zatwierdzono zmiany dla tabeli '%1' (nazwanej wcześniej '%2'). + + + + Autoincrement value for table '%1' has been reset successfully. + Wartość automatycznej inkrementacji dla tabeli '%1' została zresetowana. + + + + Uncommitted changes + Niezatwierdzone zmiany + + + + There are uncommitted structure modifications. You cannot browse or edit data until you have table structure settled. +Do you want to commit the structure, or do you want to go back to the structure tab? + Zmiany w strukturze nie zostały zatwierdzone. Nie można przeglądać, ani edytować danych, dopóki struktura tabeli nie zostanie ustalona. +Czy chcesz zatwierdzić strukturę, czy jednak chcesz wrócić do karty struktury? + + + + Table window "%1" has uncommitted structure modifications and data. + Okno tabeli "%1" ma niezatwierdzone modyfikacje struktury i danych. + + + + Table window "%1" has uncommitted data. + Okno tabeli "%1" ma niezatwierdzone dane. + + + + Table window "%1" has uncommitted structure modifications. + Okno tabeli "%1" ma niezatwierdzone modyfikacje struktury. + Could not restore window, because database %1 could not be resolved. Nie można przywrócić okna, ponieważ nie znaleziono bazy danych %1. @@ -6002,180 +6146,172 @@ Czy chcesz kontynuować? Nie można przywrócić okna, ponieważ tabela %1 już nie jestnieje w bazie danych %2. - + New table %1 Nowa tabela %1 - Commited changes for table '%1' successfly. - Pomyślnie zatwierdzono zmiany dla tabeli '%1'. + Pomyślnie zatwierdzono zmiany dla tabeli '%1'. - Commited changes for table '%1' (named before '%2') successfly. - Pomyślnie zatwierdzono zmiany dla tabeli '%1' (nazwanej wcześniej '%2'). + Pomyślnie zatwierdzono zmiany dla tabeli '%1' (nazwanej wcześniej '%2'). - + Could not commit table structure. Error message: %1 table window Nie udało się zatwierdzić struktury tabeli. Treść błędu: %1 - + Reset autoincrement Wyzeruj autoinkrementację - + Are you sure you want to reset autoincrement value for table '%1'? Czy na pewno chcesz wyzerować wartość autoinkrementacji dla tabeli '%1'? - + An error occurred while trying to reset autoincrement value for table '%1': %2 Wystąpił błąd podczas próby wyzerowania wartości autoinkrementacji dla tabeli '%1': %2 - Autoincrement value for table '%1' has been reset successfly. - Wartość autoinkrementacji dla tabeli '%1' została pomyślnie wyzerowana. + Wartość autoinkrementacji dla tabeli '%1' została pomyślnie wyzerowana. - + Empty name Pusta nazwa - + A blank name for the table is allowed in SQLite, but it is not recommended. Are you sure you want to create a table with blank name? Pusta nazwa dla tabeli jest dozwolona w SQLite, ale nie jest zalecana. Czy na pewno chcesz utworzyć tabelę o pustej nazwie? - + Cannot create a table without at least one column. Nie można utworzyć tabeli bez przynajmniej jednej kolumny. - + Cannot create table %1, if it has no primary key defined. Either uncheck the %2, or define a primary key. Nie można utworzyć tabeli %1, jeśli nie ma zdefiniowanego klucza głównego. Albo udznacz %2, albo zdefiniuj klucz główny. - + Cannot use autoincrement for primary key when %1 clause is used. Either uncheck the %2, or the autoincrement in a primary key. Nie można użyć autoinkrementacji dla klucza głównego, kiedy klauzula %1 jest użyta. Albo odnacz %2, albo autonkrementację w kluczu głównym. - + Are you sure you want to delete table constraint '%1'? table window Czy na pewno chcesz usunąć ograniczenie tabeli '%1'? - + Delete constraint table window Usuń ograniczenie - + Cannot export, because no export plugin is loaded. Nie można wyeksportować, ponieważ żadna wtyczka eksportu nie została załadowana. - + Cannot import, because no import plugin is loaded. Nie można zaimportować, ponieważ żadna wtyczka importu nie została załadowana. - Uncommited changes - Niezatwierdzone dane + Niezatwierdzone dane - There are uncommited structure modifications. You cannot browse or edit data until you have table structure settled. Do you want to commit the structure, or do you want to go back to the structure tab? - Zmiany w strukturze nie zostały zatwierdzone. Nie można przeglądać, ani edytować danych, dopóki struktura tabeli nie zostanie ustalona. + Zmiany w strukturze nie zostały zatwierdzone. Nie można przeglądać, ani edytować danych, dopóki struktura tabeli nie zostanie ustalona. Czy chcesz zatwierdzić strukturę, czy jednak chcesz wrócić do karty struktury? - + Go back to structure tab Wróć do karty struktury - + Commit modifications and browse data. Zatwierdź modyfikacje i przeglądaj dane. - + Name table window indexes Nazwa - + Unique table window indexes Wartości unikalne - + Columns table window indexes Kolumny - + Partial index condition table window indexes Warunek indeksu częściowego: - + Name table window triggers Nazwa - + Event table window triggers Zdarzenie - + Condition table window triggers Warunek - + Details table window triggers Szczegóły - Table window "%1" has uncommited structure modifications and data. - Okno tabeli "%1" ma niezatwierdzone modyfikacje struktury i danych. + Okno tabeli "%1" ma niezatwierdzone modyfikacje struktury i danych. - Table window "%1" has uncommited data. - Okno tabeli "%1" ma niezatwierdzone dane. + Okno tabeli "%1" ma niezatwierdzone dane. - Table window "%1" has uncommited structure modifications. - Okno tabeli "%1" ma niezatwierdzone modyfikacje struktury. + Okno tabeli "%1" ma niezatwierdzone modyfikacje struktury. @@ -6190,6 +6326,16 @@ Czy chcesz zatwierdzić strukturę, czy jednak chcesz wrócić do karty struktur Triggering columns: Kolumny wyzwalające: + + + Select all + Zaznacz wszystko + + + + Deselect all + Odznacz wszystko + TriggerDialog @@ -6281,13 +6427,13 @@ Czy chcesz zatwierdzić strukturę, czy jednak chcesz wrócić do karty struktur Wprowadź poprawny kod wyzwalacza. - + Error trigger dialog Błąd - + An error occurred while executing SQL statements: %1 Wystąpił błąd podczas wykonywania zapytań SQL: @@ -6336,7 +6482,7 @@ Czy chcesz zatwierdzić strukturę, czy jednak chcesz wrócić do karty struktur - + Data Dane @@ -6390,220 +6536,250 @@ Czy chcesz zatwierdzić strukturę, czy jednak chcesz wrócić do karty struktur Nowy widok %1 - + Refresh the view view window Odśwież widok - + Commit the view changes view window Zatwierdź zmiany w widoku - + Rollback the view changes view window Wycofaj zmiany w widoku - + Explicit column names Jawne nazwy kolumn - + Generate output column names automatically basing on result columns of the view. Generuj automatycznie nazwy kolumn wyjściowych bazując na kolumnach wynikowych widoku. - + Add column view window Dodaj kolumnę - + Edit column view window Edytuj kolumnę - + Delete column view window Usuń kolumnę - + Move column up view window Przesuń kolumnę w górę - + Move column down view window Przesuń kolumnę w dół - + Refresh trigger list view window Odśwież listę wyzwalaczy - + Create new trigger view window Utwórz nowy wyzwalacz - + Edit selected trigger view window Edytuj wybrany wyzwalacz - + Delete selected trigger view window Usuń wybrany wyzwalacz - - View window "%1" has uncommited structure modifications and data. + + View window "%1" has uncommitted structure modifications and data. Okno widoku "%1" ma niezatwierdzone modyfikacje struktury i danych. - - View window "%1" has uncommited data. + + View window "%1" has uncommitted data. Okno widoku "%1" ma niezatwierdzone dane. - - View window "%1" has uncommited structure modifications. + + View window "%1" has uncommitted structure modifications. Okno widoku "%1" ma niezatwierdzone modyfikacje struktury. - + + Uncommitted changes + Niezatwierdzone zmiany + + + + There are uncommitted structure modifications. You cannot browse or edit data until you have the view structure settled. +Do you want to commit the structure, or do you want to go back to the structure tab? + Zmiany w strukturze nie zostały zatwierdzone. Nie można przeglądać, ani edytować danych, dopóki struktura widoku nie zostanie ustalona. +Czy chcesz zatwierdzić strukturę, czy jednak chcesz wrócić do karty struktury? + + + + Committed changes for view '%1' successfully. + Pomyślnie zatwierdzono zmiany dla widoku '%1'. + + + + Committed changes for view '%1' (named before '%2') successfully. + Pomyślnie zatwierdzono zmiany dla tabeli '%1' (nazwanej wcześniej '%2'). + + + View window "%1" has uncommited structure modifications and data. + Okno widoku "%1" ma niezatwierdzone modyfikacje struktury i danych. + + + View window "%1" has uncommited data. + Okno widoku "%1" ma niezatwierdzone dane. + + + View window "%1" has uncommited structure modifications. + Okno widoku "%1" ma niezatwierdzone modyfikacje struktury. + + + Could not load data for view %1. Error details: %2 Nie udało się załadować danych dla widoku %1. Szczegóły błędu: %2 - Uncommited changes - Niezatwierdzone dane + Niezatwierdzone dane - There are uncommited structure modifications. You cannot browse or edit data until you have the view structure settled. Do you want to commit the structure, or do you want to go back to the structure tab? - Zmiany w strukturze nie zostały zatwierdzone. Nie można przeglądać, ani edytować danych, dopóki struktura widoku nie zostanie ustalona. + Zmiany w strukturze nie zostały zatwierdzone. Nie można przeglądać, ani edytować danych, dopóki struktura widoku nie zostanie ustalona. Czy chcesz zatwierdzić strukturę, czy jednak chcesz wrócić do karty struktury? - + Go back to structure tab Wróć do karty struktury - + Commit modifications and browse data. Zatwierdź modyfikacje i przeglądaj dane. - Commited changes for view '%1' successfly. - Pomyślnie zatwierdzono zmiany dla widoku '%1'. + Pomyślnie zatwierdzono zmiany dla widoku '%1'. - Commited changes for view '%1' (named before '%2') successfly. - Pomyślnie zatwierdzono zmiany dla widoku '%1' (nazwanego wcześniej '%2'). + Pomyślnie zatwierdzono zmiany dla widoku '%1' (nazwanego wcześniej '%2'). - + Could not commit view changes. Error message: %1 view window Nie udało się zatwierdzić widoku. Treść błędu: %1 - + Override columns Nadpisz kolumny - + Currently defined columns will be overriden. Do you want to continue? Aktualnie zdefiniowane kolumny zostaną nadpisane. Czy chcesz kontynuować? - + Could not determinate columns returned from the view. The query is problably incomplete or contains errors. Nie udało się ustalić kolumn zwracanych z widoku. Zapytanie jest prawdopodobnie niekompletne lub zawiera błędy. - + Name view window triggers Nazwa - + Instead of view window triggers Zamiast - + Condition view window triggers Warunek - + Details table window triggers Szczegóły - + Could not process the %1 view correctly. Unable to open a view window. Nie udało się przetworzyć poprawnie widoku %1. Nie można otworzyć okna widoku. - + Empty name Pusta nazwa - + A blank name for the view is allowed in SQLite, but it is not recommended. Are you sure you want to create a view with blank name? Pusta nazwa dla widoku jest dozwolona w SQLite, ale nie jest zalecana. Czy na pewno chcesz utworzyć widok o pustej nazwie? - + The SELECT statement could not be parsed. Please correct the query and retry. Details: %1 Zapytanie SELECT nie mogło być poprawnie przeanalizowane. Proszę poprawić zapytanie i spróbować ponownie. Szczegóły: %1 - + The view could not be modified due to internal SQLiteStudio error. Please report this! Widok nie mógł być zmodyfikowany w związku z wewnętrznym błędem SQLiteStudio. Proszę to zgłosić! - + The view code could not be parsed properly for execution. This is a SQLiteStudio's bug. Please report it. Kod widok nie mógł być poprawnie przeanalizowany. To jest błąd SQLiteStudio Proszę to zgłosić! - + Following problems will take place while modifying the view. Would you like to proceed? view window @@ -6611,7 +6787,7 @@ Would you like to proceed? Czy chcesz kontynuować? - + View modification view window Modyfikacja widoku diff --git a/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_pt_BR.ts b/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_pt_BR.ts index 0130532..4d51bcb 100644 --- a/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_pt_BR.ts +++ b/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_pt_BR.ts @@ -1,6 +1,6 @@ - + AboutDialog @@ -429,7 +429,7 @@ - Collations editor window has uncommited modifications. + Collations editor window has uncommitted modifications. @@ -903,7 +903,7 @@ but it's okay to use it. ConfigDialog - + Configuration @@ -993,215 +993,215 @@ but it's okay to use it. - + Number of data rows per page: - - + + <p>When the data is read into grid view columns width is automatically adjusted. This value limits the initial width for the adjustment, but user can still resize the column manually over this limit.</p> - + Limit initial data column width to (in pixels): - + <p>When this is enabled and user holds mouse pointer over a cell in any data view (query results, a table data, a view data) a tooltip will appear with details about the cell - it includes details like column data type, constraints, ROWID and others.</p> - + Show column and row details tooltip in data view - + + <p>When editing a cell which used to have NULL value and entering empty string as new value, then this option determinates whether the new value should remain NULL (have this option enabled), or should it be overwritten with empty string value (have this option disabled).</p> + + + + Inserting new row in data grid - + Before currently selected row - + After currently selected row - + At the end of data view - + <p>When enabled, Table Windows will show up with the data tab, instead of the structure tab.</p> - + <p>When enabled the "Data" tab will be placed as first tab in every Table Window, instead of being at second place.</p> - + Place data tab as first tab in a Table Window - + <p>When enabled, View Windows will show up with the data tab, instead of the structure tab.</p> - + <p>When enabled the "Data" tab will be placed as first tab in every View Window, instead of being at second place.</p> - + Place data tab as first tab in a View Window - + Data types - + Available editors: - + Editors selected for this data type: - + Schema editing - + Number of DDL changes kept in history. - + DDL history size: - - Don't show DDL preview dialog when commiting schema changes - - - - + SQL queries - - + + Number of queries kept in the history. - + History size: - + <p>If there is more than one query in the SQL editor window, then (if this option is enabled) only a single query will be executed - the one under the keyboard insertion cursor. Otherwise all queries will be executed. You can always limit queries to be executed by selecting those queries before calling to execute.</p> - + Execute only the query under the cursor - + Updates - + Automatically check for updates at startup - + Session - + Restore last session (active MDI windows) after startup - + Status Field - + <p>When user manually closes the Status panel, this option makes sure that if any new message is printed in the Status panel it will be reopened. If it's disabled, then Status panel can only be open manually by the user from the "View" menu.</p> - + Always open Status panel when new message is printed - + Filter shortcuts by name or key combination - + Action - + Key combination - - + + Language - + Changing language requires application restart to take effect. - + Compact layout - + <p>Compact layout reduces all margins and spacing on the UI to minimum, making space for displaying more data. It makes the interface a little bit less aesthetic, but allows to display more data at once.</p> - + Use compact layout @@ -1277,242 +1277,262 @@ but it's okay to use it. - + + Keep NULL value when entering empty value + + + + + <html><head/><body><p>Enable this to always enforce DEFAULT value when committing a NULL value for a column that has DEFAULT value defined, even though the column is allowed to contain NULL values.</p><p>Disable this option to use DEFAULT value exclusively when NULL value is committed for column with NOT NULL constraint.</p></body></html> + + + + + Use DEFAULT value (if defined), when committing NULL value + + + + Table windows - + Open Table Windows with the data tab for start - + View windows - + Open View Windows with the data tab for start - + + Don't show DDL preview dialog when committing schema changes + + + + Main window dock areas - + Left and right areas occupy corners - + Top and bottom areas occupy corners - + Hide built-in plugins - + Current style: - + Preview - + Enabled - + Disabled - + Active formatter plugin - + SQL editor font - + Database list font - + Database list additional label font - + Data view font - + Status field font - + SQL editor colors - + Current line background - + <p>SQL strings are enclosed with single quote characters.</p> - + String foreground - + <p>Bind parameters are placeholders for values yet to be provided by the user. They have one of the forms:</p><ul><li>:param_name</li><li>$param_name</li><li>@param_name</li><li>?</li></ul> - + Bind parameter foreground - + Highlighted parenthesis background - + <p>BLOB values are binary values represented as hexadecimal numbers, like:</p><ul><li>X'12B4'</li><li>x'46A2F4'</li></ul> - + BLOB value foreground - + Regular foreground - + Line numbers area background - + Keyword foreground - + Number foreground - + Comment foreground - + <p>Valid objects are name of tables, indexes, triggers, or views that exist in the SQLite database.</p> - + Valid objects foreground - + Data view colors - - <p>Any data changes will be outlined with this color, until they're commited to the database.</p> + + <p>Any data changes will be outlined with this color, until they're committed to the database.</p> - - Uncommited data outline color + + Uncommitted data outline color - - <p>In case of error while commiting data changes, the problematic cell will be outlined with this color.</p> + + <p>In case of error while committing data changes, the problematic cell will be outlined with this color.</p> - + Commit error outline color - + NULL value foreground - + Deleted row background - + Database list colors - + <p>Additional labels are those which tell you SQLite version, number of objects deeper in the tree, etc.</p> - + Additional labels foreground - + Status field colors - + Information message foreground - + Warning message foreground - + Error message foreground @@ -2003,22 +2023,17 @@ Browsing other pages will be possible after the row counting is done. - - Generate automatically - - - - + Options - + Permanent (keep it in configuration) - + Test connection @@ -2029,7 +2044,7 @@ Browsing other pages will be possible after the row counting is done. - + File @@ -2039,28 +2054,23 @@ Browsing other pages will be possible after the row counting is done. - - Generate name basing on file path - - - - + <p>Enable this if you want the database to be stored in configuration file and restored every time SQLiteStudio is started.</p> aasfd - + Browse for existing database file on local computer - + Browse - + Enter an unique database name. @@ -2070,28 +2080,23 @@ Browsing other pages will be possible after the row counting is done. - - Enter a database file path. - - - - - This database is already on the list under name: %1 + + <p>Automatic name generation was disabled, becuase the name was edited manually. To restore automatic generation please erase contents of the name field.</p> - - Select a database type. + + Enter a database file path. - - Auto-generated + + This database is already on the list under name: %1 - - Type the name + + Select a database type. @@ -2379,7 +2384,7 @@ Browsing other pages will be possible after the row counting is done. - + Erase table data @@ -2400,127 +2405,127 @@ Browsing other pages will be possible after the row counting is done. - - + + Create group - + Group name - + Entry with name %1 already exists in group %2. - + Delete group - + Are you sure you want to delete group %1? All objects from this group will be moved to parent group. - + Are you sure you want to remove database '%1' from the list? - + Are you sure you want to remove following databases from the list: %1 - + Remove database - + Vacuum (%1) - - - Cannot import, because no import plugin is loaded. + + Autoincrement value for table '%1' has been reset successfully. - - - Cannot export, because no export plugin is loaded. + + Are you sure you want to delete all data from table(s): %1? - - Integrity check (%1) + + + Cannot import, because no import plugin is loaded. - - Reset autoincrement + + + Cannot export, because no export plugin is loaded. - - Are you sure you want to reset autoincrement value for table '%1'? + + Integrity check (%1) - An error occurred while trying to reset autoincrement value for table '%1': %2 + Reset autoincrement - - Autoincrement value for table '%1' has been reset successfly. + + Are you sure you want to reset autoincrement value for table '%1'? - - Are you sure you want to delete all data from table '%1'? + + An error occurred while trying to reset autoincrement value for table '%1': %2 - + An error occurred while trying to delete data from table '%1': %2 - + All data has been deleted for table '%1'. - + Following objects will be deleted: %1. - + Following databases will be removed from list: %1. - + Remainig objects from deleted group will be moved in place where the group used to be. - + %1<br><br>Are you sure you want to continue? - + Delete objects @@ -2784,77 +2789,77 @@ Please enter new, unique name, or press '%1' to abort the operation: - + Previous database - + Next database - + Show next tab sql editor - + Show previous tab sql editor - + Focus results below sql editor - + Focus SQL editor above sql editor - + Active database (%1/%2) - + Query finished in %1 second(s). Rows affected: %2 - + Query finished in %1 second(s). - + Clear execution history - + Are you sure you want to erase the entire SQL execution history? This cannot be undone. - + Cannot export, because no export plugin is loaded. - + No database selected in the SQL editor. Cannot create a view for unknown database. - - Editor window "%1" has uncommited data. + + Editor window "%1" has uncommitted data. @@ -3311,7 +3316,7 @@ Please enter new, unique name, or press '%1' to abort the operation: - Functions editor window has uncommited modifications. + Functions editor window has uncommitted modifications. @@ -3911,7 +3916,7 @@ Please enter new, unique name, or press '%1' to abort the operation:MdiWindow - Uncommited changes + Uncommitted changes @@ -4844,7 +4849,7 @@ Please enter new, unique name, or press '%1' to abort the operation:QuitConfirmDialog - Uncommited changes + Uncommitted changes @@ -4942,179 +4947,179 @@ find next SqlEditor - + Cut sql editor - + Copy sql editor - + Paste sql editor - + Delete sql editor - + Select all sql editor - + Undo sql editor - + Redo sql editor - + Complete sql editor - + Format SQL sql editor - + Save SQL to file sql editor - + Select file to save SQL sql editor - + Load SQL from file sql editor - + Delete line sql editor - + Move block down sql editor - + Move block up sql editor - + Copy block down sql editor - + Copy up down sql editor - + Find sql editor - + Find next sql editor - + Find previous sql editor - + Replace sql editor - + Toggle comment sql editor - + Saved SQL contents to file: %1 - + Syntax completion can be used only when a valid database is set for the SQL editor. - + Contents of the SQL editor are huge, so errors detecting and existing objects highlighting are temporarily disabled. - + Save to file - + Could not open file '%1' for writing: %2 - + SQL scripts (*.sql);;All files (*) - + Open file - + Could not open file '%1' for reading: %2 - + Reached the end of document. Hit the find again to restart the search. @@ -5146,12 +5151,7 @@ find next - - This cell is not editable, because: %1 - - - - + Cannot load the data for a cell that refers to the already closed database. @@ -5159,18 +5159,32 @@ find next SqlQueryItemDelegate - - - Cannot edit this cell. Details: %2 + + The row is marked for deletion. - - The row is marked for deletion. + + + + + + Cannot edit this cell. Details: %1 + + + + + + Structure of this table has changed since last data was loaded. Reload the data to proceed. + + + + + Editing a huge contents in an inline cell editor is not a good idea. It can become slow and inconvenient. It's better to edit such big contents in a Form View, or in popup editor (available under rick-click menu). - + Foreign key for column %2 has more than %1 possible values. It's too much to display in drop down list. You need to edit value manually. @@ -5178,69 +5192,69 @@ find next SqlQueryModel - - + + Only one query can be executed simultaneously. - - Uncommited data + + Cannot commit the data for a cell that refers to the already closed database. - - There are uncommited data changes. Do you want to proceed anyway? All uncommited changes will be lost. + + Could not begin transaction on the database. Details: %1 - - Cannot commit the data for a cell that refers to the already closed database. + + An error occurred while rolling back the transaction: %1 - - Could not begin transaction on the database. Details: %1 + + Tried to commit a cell which is not editable (yet modified and waiting for commit)! This is a bug. Please report it. - - An error occurred while commiting the transaction: %1 + + Uncommitted data - - An error occurred while rolling back the transaction: %1 + + There are uncommitted data changes. Do you want to proceed anyway? All uncommitted changes will be lost. - - Tried to commit a cell which is not editable (yet modified and waiting for commit)! This is a bug. Please report it. + + An error occurred while committing the transaction: %1 - - An error occurred while commiting the data: %1 + + An error occurred while committing the data: %1 - - + + Error while executing SQL query on database '%1': %2 - + Error while loading query results: %1 - + Insert multiple rows - + Number of rows to insert: @@ -5248,117 +5262,117 @@ find next SqlQueryView - + Go to referenced row in... - + Copy - + Copy as... - + Paste - + Paste as... - + Set NULL values - + Erase values - + Edit value in editor - + Commit - + Rollback - + Commit selected cells - + Rollback selected cells - + Define columns to sort by - + Remove custom sorting - + Insert row - + Insert multiple rows - + Delete selected row - + Generate query for selected cells - + No items selected to paste clipboard contents to. - + Go to referenced row in table '%1' - + table '%1' - + Referenced row (%1) - + Edit value @@ -5366,12 +5380,12 @@ find next SqlTableModel - - Error while commiting new row: %1 + + Error while committing new row: %1 - + Error while deleting row from table %1: %2 @@ -5634,7 +5648,7 @@ NULL - + Data @@ -5659,409 +5673,409 @@ NULL - + Export table table window - + Import data to table table window - + Populate table table window - + Refresh structure table window - + Commit structure changes table window - + Rollback structure changes table window - + Add column table window - + Edit column table window - - + + Delete column table window - + Move column up table window - + Move column down table window - + Create similar table table window - + Reset autoincrement value table window - + Add table constraint table window - + Edit table constraint table window - + Delete table constraint table window - + Move table constraint up table window - + Move table constraint down table window - + Add table primary key table window - + Add table foreign key table window - + Add table unique constraint table window - + Add table check constraint table window - + Refresh index list table window - + Create index table window - + Edit index table window - + Delete index table window - + Refresh trigger list table window - + Create trigger table window - + Edit trigger table window - + Delete trigger table window - + Are you sure you want to delete column '%1'? table window - + Following problems will take place while modifying the table. Would you like to proceed? table window - + Table modification table window - + Could not load data for table %1. Error details: %2 - + Could not process the %1 table correctly. Unable to open a table window. - + Could not restore window %1, because no database or table was stored in session for this window. - + Could not restore window '%1', because no database or table was stored in session for this window. - + Could not restore window '%1', because database %2 could not be resolved. - + Could not restore window '%1'', because the table %2 doesn't exist in the database %3. - + New table %1 - - Commited changes for table '%1' successfly. + + Committed changes for table '%1' successfully. - - Commited changes for table '%1' (named before '%2') successfly. + + Committed changes for table '%1' (named before '%2') successfully. - + + Autoincrement value for table '%1' has been reset successfully. + + + + + Uncommitted changes + + + + + There are uncommitted structure modifications. You cannot browse or edit data until you have table structure settled. +Do you want to commit the structure, or do you want to go back to the structure tab? + + + + + Table window "%1" has uncommitted structure modifications and data. + + + + + Table window "%1" has uncommitted data. + + + + + Table window "%1" has uncommitted structure modifications. + + + + Could not commit table structure. Error message: %1 table window - + Reset autoincrement - + Are you sure you want to reset autoincrement value for table '%1'? - + An error occurred while trying to reset autoincrement value for table '%1': %2 - - Autoincrement value for table '%1' has been reset successfly. - - - - + Empty name - + A blank name for the table is allowed in SQLite, but it is not recommended. Are you sure you want to create a table with blank name? - + Cannot create a table without at least one column. - + Cannot create table %1, if it has no primary key defined. Either uncheck the %2, or define a primary key. - + Cannot use autoincrement for primary key when %1 clause is used. Either uncheck the %2, or the autoincrement in a primary key. - + Are you sure you want to delete table constraint '%1'? table window - + Delete constraint table window - + Cannot export, because no export plugin is loaded. - + Cannot import, because no import plugin is loaded. - - Uncommited changes - - - - - There are uncommited structure modifications. You cannot browse or edit data until you have table structure settled. -Do you want to commit the structure, or do you want to go back to the structure tab? - - - - + Go back to structure tab - + Commit modifications and browse data. - + Name table window indexes - + Unique table window indexes - + Columns table window indexes - + Partial index condition table window indexes - + Name table window triggers - + Event table window triggers - + Condition table window triggers - + Details table window triggers - - - Table window "%1" has uncommited structure modifications and data. - - - - - Table window "%1" has uncommited data. - - - - - Table window "%1" has uncommited structure modifications. - - TriggerColumnsDialog @@ -6075,6 +6089,16 @@ Do you want to commit the structure, or do you want to go back to the structure Triggering columns: + + + Select all + + + + + Deselect all + + TriggerDialog @@ -6166,13 +6190,13 @@ Do you want to commit the structure, or do you want to go back to the structure - + Error trigger dialog - + An error occurred while executing SQL statements: %1 @@ -6220,7 +6244,7 @@ Do you want to commit the structure, or do you want to go back to the structure - + Data @@ -6262,224 +6286,224 @@ Do you want to commit the structure, or do you want to go back to the structure - + Refresh the view view window - + Commit the view changes view window - + Rollback the view changes view window - + Explicit column names - + Generate output column names automatically basing on result columns of the view. - + Add column view window - + Edit column view window - + Delete column view window - + Move column up view window - + Move column down view window - + Refresh trigger list view window - + Create new trigger view window - + Edit selected trigger view window - + Delete selected trigger view window - - - View window "%1" has uncommited structure modifications and data. - - - View window "%1" has uncommited data. + View window "%1" has uncommitted structure modifications and data. - View window "%1" has uncommited structure modifications. + View window "%1" has uncommitted data. - - Could not load data for view %1. Error details: %2 + + View window "%1" has uncommitted structure modifications. - - Uncommited changes + + Uncommitted changes - - There are uncommited structure modifications. You cannot browse or edit data until you have the view structure settled. + + There are uncommitted structure modifications. You cannot browse or edit data until you have the view structure settled. Do you want to commit the structure, or do you want to go back to the structure tab? - - Go back to structure tab + + Committed changes for view '%1' successfully. - - Commit modifications and browse data. + + Committed changes for view '%1' (named before '%2') successfully. - - Commited changes for view '%1' successfly. + + Could not load data for view %1. Error details: %2 - - Commited changes for view '%1' (named before '%2') successfly. + + Go back to structure tab - + + Commit modifications and browse data. + + + + Could not commit view changes. Error message: %1 view window - + Override columns - + Currently defined columns will be overriden. Do you want to continue? - + Could not determinate columns returned from the view. The query is problably incomplete or contains errors. - + Name view window triggers - + Instead of view window triggers - + Condition view window triggers - + Details table window triggers - + Could not process the %1 view correctly. Unable to open a view window. - + Empty name - + A blank name for the view is allowed in SQLite, but it is not recommended. Are you sure you want to create a view with blank name? - + The SELECT statement could not be parsed. Please correct the query and retry. Details: %1 - + The view could not be modified due to internal SQLiteStudio error. Please report this! - + The view code could not be parsed properly for execution. This is a SQLiteStudio's bug. Please report it. - + Following problems will take place while modifying the view. Would you like to proceed? view window - + View modification view window diff --git a/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_ru.qm b/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_ru.qm index e07a8d5..7a4d27a 100644 Binary files a/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_ru.qm and b/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_ru.qm differ diff --git a/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_ru.ts b/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_ru.ts index b2eba15..4b135af 100644 --- a/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_ru.ts +++ b/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_ru.ts @@ -1,6 +1,6 @@ - + AboutDialog @@ -431,8 +431,12 @@ + Collations editor window has uncommitted modifications. + + + Collations editor window has uncommited modifications. - В редакторе сравнений имеются неподтверждённые изменения. + В редакторе сравнений имеются неподтверждённые изменения. @@ -680,17 +684,17 @@ but it's okay to use it. Scale is not allowed for INTEGER PRIMARY KEY columns. - + Указание размера данных недопустимо для столбцов с типом INTEGER PRIMARY KEY. Precision cannot be defined without the scale. - + Точность не может быть задана без указания размера данных. Precision is not allowed for INTEGER PRIMARY KEY columns. - + Указание точности недопустимо для столбцов с типом INTEGER PRIMARY KEY. @@ -905,7 +909,7 @@ but it's okay to use it. ConfigDialog - + Configuration Конфигурация @@ -967,27 +971,27 @@ but it's okay to use it. Database dialog window - + Диалоговое окно добавления базы данных <p>When adding new database it is marked to be "permanent" (stored in configuration) by default. Checking this option makes every new database to NOT be "permanent" by default.</p> - + <p>По умолчанию при добавлении базы данных она отмечается как "постоянная" (т.е. сохраняется в конфигурацию). При установке данной опции все добавляемые базы данных по умолчанию НЕ будут отмечены как "постоянные".</p> Do not mark database to be "permanent" by default - + Не отмечать базу данных как "постоянную" по умолчанию <p>When this option is enabled, then files dropped from file manager onto database list will be automatically added to the list, bypassing standard database dialog. If for various reasons automatic process fails, then standard dialog will be presented to the user.</p> - + <p>При выборе данной опции все файлы, перетянутые в список баз данных из файлового менеджера, будут автоматически добавлены в список без отображения диалога добавления базы данных. Если по каким-либо причинам автоматическое добавление не получится, пользователю будет показан стандартный диалог добавления базы данных.</p> Try to bypass dialog completly when dropping database file onto the list - + Не показывать диалог при перетягивании файла базы данных в список @@ -995,38 +999,51 @@ but it's okay to use it. Просмотр и редактирование данных - + Number of data rows per page: Количество строк данных на странице: - - + + <p>When the data is read into grid view columns width is automatically adjusted. This value limits the initial width for the adjustment, but user can still resize the column manually over this limit.</p> <p>При загрузке даных в табличный вид ширина столбцов автоматически подстраивается. Этот параметр ограничивает начальную ширину для подстройки, при этом пользователь может вручную изменить ширину столбца сверх данного лимита.</p> - + Limit initial data column width to (in pixels): Ограничить начальную ширину столбца данных (в пикселях): - + <html><head/><body><p>&lt;p&gt;When editing a cell which used to have NULL value and entering empty string as new value, then this option determinates whether the new value should remain NULL (have this option enabled), or should it be overwritten with empty string value (have this option disabled).&lt;/p&gt;</p></body></html> + <html><head/><body><p>&lt;p&gt;Если редактируется ячейка, содержащая NULL, и вводится пустая строка в качестве значения, то эта опция определяет, останется ли в качестве значения ячейки NULL (если опция активирована), или значение будет заменено на пустую строку (если эта опция деактивирована).&lt;/p&gt;</p></body></html> + + + + Keep NULL value when entering empty value + Сохранять значение NULL при вводе пустой тсроки + + + General.KeepNullWhenEmptyValue + General.KeepNullWhenEmptyValue + + + <p>When this is enabled and user holds mouse pointer over a cell in any data view (query results, a table data, a view data) a tooltip will appear with details about the cell - it includes details like column data type, constraints, ROWID and others.</p> - + <p>Если данная опция активирована и пользователь наводит указатель мыши на ячейку в любом режиме просмотра данных (результаты запроса, данные таблицы, данные представления), то будет отображена всплывающая подсказка с информацией о ячейке, в том числе информация о типе данных столбца, ограничениях, значение ROWID и прочее.</p> - + Show column and row details tooltip in data view - + Показывать всплывающую подсказку с информацией о столбце и строке при просмотре данных - + Inserting new row in data grid Вставка новой строки в таблице данных - + Before currently selected row Перед текущей выделенной строкой @@ -1035,179 +1052,178 @@ but it's okay to use it. General.InsertRowPlacement - + After currently selected row После текущей выделенной строки - + At the end of data view В конец области просмотра данных - + <p>When enabled, Table Windows will show up with the data tab, instead of the structure tab.</p> - + <p>Если опция активирована, окна таблиц будут открываться на вкладке данных вместо вкладки со структурой.</p> - + <p>When enabled the "Data" tab will be placed as first tab in every Table Window, instead of being at second place.</p> - + <p>Если опция активирована, вкладка "Данные" в окнах таблиц будет первой, а не второй по порядку.</p> - + Place data tab as first tab in a Table Window - + Помещать вкладку данных в окнах таблиц первой - + <p>When enabled, View Windows will show up with the data tab, instead of the structure tab.</p> - + <p>Если опция активирована, окна представлений будут открываться на вкладке данных вместо вкладки со структурой.</p> - + <p>When enabled the "Data" tab will be placed as first tab in every View Window, instead of being at second place.</p> - + <p>Если опция активирована, вкладка "Данные" в окнах представлений будет первой, а не второй по порядку.</p> - + Place data tab as first tab in a View Window - + Помещать вкладку данных в окнах представлений первой - + Data types Типы данных - + Available editors: Доступные редакторы: - + Editors selected for this data type: Выбранные редакторы для этого типа данных: - + Schema editing Редактирование схемы - + Number of DDL changes kept in history. Количество сохраняемых в истории изменений DDL. - + DDL history size: Размер истории DDL: - Don't show DDL preview dialog when commiting schema changes - Не показывать диалог предпросмотра DDL при подтверждении изменений схемы + Не показывать диалог предпросмотра DDL при подтверждении изменений схемы - + SQL queries SQL запросы - - + + Number of queries kept in the history. Количество сохраняемых в истории запросов. - + History size: Размер истории: - + <p>If there is more than one query in the SQL editor window, then (if this option is enabled) only a single query will be executed - the one under the keyboard insertion cursor. Otherwise all queries will be executed. You can always limit queries to be executed by selecting those queries before calling to execute.</p> <p>Если в окне редактора SQL введено более одного запроса, то (если данная опция активирована) будет выполнен лишь один запрос - тот, который находится под текстовым курсором. В противном случае будут исполнены все запросы. Вы можете ограничить выполняемые запросы, выделив их перед вызовом выполнения.</p> - + Execute only the query under the cursor Выполнять только запрос под курсором - + Updates Обновления - + Automatically check for updates at startup Автоматически проверять обновления при запуске - + Session Сессия - + Restore last session (active MDI windows) after startup Восстановить предыдущую сессию (активные MDI окна) после запуска - + Status Field - + Окно статуса - + <p>When user manually closes the Status panel, this option makes sure that if any new message is printed in the Status panel it will be reopened. If it's disabled, then Status panel can only be open manually by the user from the "View" menu.</p> - + <p>Если пользователь вручную закрыл окно статуса, включение данной опции гарантирует, что при появлении новых сообщений окно статуса будет автоматически открыто. Если опция отключена, окно статуса может быть заново открыто только пользователем вручную через меню "Вид".</p> - + Always open Status panel when new message is printed - + Всегда открывать окно статуса при появлении нового сообщения - + Filter shortcuts by name or key combination Фильтруйте горячие клавиши по имени или комбинации клавиш - + Action Действие - + Key combination Комбинация клавиш - - + + Language Язык - + Changing language requires application restart to take effect. Для смены языка потребуется перезапустить приложение. - + Compact layout Компактный режим - + <p>Compact layout reduces all margins and spacing on the UI to minimum, making space for displaying more data. It makes the interface a little bit less aesthetic, but allows to display more data at once.</p> <p>В компактном режиме все поля и отступы в интерфейсе минимизированы для отображения большего количества данных. Интерфейс станет чуть менее эстетичным, однако это позволит уместить больше данных на экране.</p> - + Use compact layout Включить компактный режим @@ -1287,7 +1303,22 @@ but it's okay to use it. Отображать в списке системные таблицы и индексы - + + <p>When editing a cell which used to have NULL value and entering empty string as new value, then this option determinates whether the new value should remain NULL (have this option enabled), or should it be overwritten with empty string value (have this option disabled).</p> + + + + + <html><head/><body><p>Enable this to always enforce DEFAULT value when committing a NULL value for a column that has DEFAULT value defined, even though the column is allowed to contain NULL values.</p><p>Disable this option to use DEFAULT value exclusively when NULL value is committed for column with NOT NULL constraint.</p></body></html> + + + + + Use DEFAULT value (if defined), when committing NULL value + + + + Table windows Окна таблиц @@ -1296,12 +1327,12 @@ but it's okay to use it. Если опция активирована, окно таблицы будет открыто на вкладке данных вместо вкладки структуры. - + Open Table Windows with the data tab for start Открывать окна таблиц на вкладке данных - + View windows Окна представлений @@ -1310,227 +1341,244 @@ but it's okay to use it. Если опция активирована, окно представления будет открыто на вкладке данных вместо вкладки структуры. - + Open View Windows with the data tab for start Открывать окна представлений на вкладке данных - + + Don't show DDL preview dialog when committing schema changes + + + + Main window dock areas Области прикрепления вокруг главного окна - + Left and right areas occupy corners Углы занимают правая и левая области - + Top and bottom areas occupy corners Углы занимают верхняя и нижняя области - + Hide built-in plugins Скрыть встроенные модули - + Current style: Текущий стиль: - + Preview Предпросмотр - + Enabled Активно - + Disabled Неактивно - + Active formatter plugin Активный модуль форматирования - + SQL editor font Шрифт редактора SQL - + Database list font Шрифт списка баз данных - + Database list additional label font Шрифт дополнительных меток в списке баз данных - + Data view font Шрифт просмотра данных - + Status field font Шрифт окна статуса - + SQL editor colors Цвета редактора SQL - + Current line background Фон текущей строки - + <p>SQL strings are enclosed with single quote characters.</p> <p>Строки SQL обрамляются в одинарные кавычки.</p> - + String foreground Цвет строки - + <p>Bind parameters are placeholders for values yet to be provided by the user. They have one of the forms:</p><ul><li>:param_name</li><li>$param_name</li><li>@param_name</li><li>?</li></ul> <p>Подстановочные параметры предназначены для значений, которые будут в дальнейшем указаны пользователем. Они определяются одним из следующих способов:</p><ul><li>:имя_параметра</li><li>$имя_параметра</li><li>@имя_параметра</li><li>?</li></ul> - + Bind parameter foreground Цвет подстановочных параметров - + Highlighted parenthesis background Фон подсвечиваемых скобок - + <p>BLOB values are binary values represented as hexadecimal numbers, like:</p><ul><li>X'12B4'</li><li>x'46A2F4'</li></ul> <p>Данные типа BLOB — это бинарные данные, представляемые в виде шестнадцатеричных чисел, например:</p><ul><li>X'12B4'</li><li>x'46A2F4'</li></ul> - + BLOB value foreground Цвет данных типа BLOB - + Regular foreground Стандартный цвет - + Line numbers area background Фон области нумерации строк - + Keyword foreground Цвет ключевого слова - + Number foreground Цвет числа - + Comment foreground Цвет комментария - + <p>Valid objects are name of tables, indexes, triggers, or views that exist in the SQLite database.</p> <p>Распознаваемыми объектами являются имена талиц, индексов, триггеров и представлений, существующих в базе данных SQLite.</p> - + Valid objects foreground Цвет распознанных объектов - + Data view colors Цвета в окне просмотра данных - + + <p>Any data changes will be outlined with this color, until they're committed to the database.</p> + + + + + Uncommitted data outline color + + + + + <p>In case of error while committing data changes, the problematic cell will be outlined with this color.</p> + + + <p>Any data changes will be outlined with this color, until they're commited to the database.</p> - <p>Все изменения данных будут обрамлены этим цветом, пока не будут записаны в базу данных.</p> + <p>Все изменения данных будут обрамлены этим цветом, пока не будут записаны в базу данных.</p> - Uncommited data outline color - Цвет обрамления неподтверждённых изменений + Цвет обрамления неподтверждённых изменений - <p>In case of error while commiting data changes, the problematic cell will be outlined with this color.</p> - <p>В случае ошибки при подтверждении изменений данных, этим цветом будут обрамлены проблемные ячейки.</p> + <p>В случае ошибки при подтверждении изменений данных, этим цветом будут обрамлены проблемные ячейки.</p> - + Commit error outline color Цвет обрамления ошибочных ячеек - + NULL value foreground Цвет значений NULL - + Deleted row background Фон удалённых строк - + Database list colors Цвета списка баз данных - + <p>Additional labels are those which tell you SQLite version, number of objects deeper in the tree, etc.</p> <p>Дополнительные метки содержат информацию о версии SQLite, о количестве объектов в глубине дерева и т.д.</p> - + Additional labels foreground Цвет дополнительных меток - + Status field colors Цвета в окне Статуса - + Information message foreground Цвет информационного сообщения - + Warning message foreground Цвет предупреждения - + Error message foreground Цвет ошибки @@ -2022,22 +2070,21 @@ Browsing other pages will be possible after the row counting is done. Драйвер базы данных - Generate automatically - Сгенерировать автоматически + Сгенерировать автоматически - + Options Опции - + Permanent (keep it in configuration) Постоянная (сохранить базу в конфигурационном файле) - + Test connection Тест соединения @@ -2060,7 +2107,7 @@ Browsing other pages will be possible after the row counting is done. - + File Файл @@ -2070,16 +2117,15 @@ Browsing other pages will be possible after the row counting is done. Имя (в списке) - Generate name basing on file path - Генерировать имя на основе пути к файлу + Генерировать имя на основе пути к файлу Permanent Запомнить - + <p>Enable this if you want the database to be stored in configuration file and restored every time SQLiteStudio is started.</p> aasfd <p>Активируйте эту опцию для сохранения базы данных в конфигурационном файле и добавления её в список при каждом запуске SQLiteStudio.</p> @@ -2089,17 +2135,17 @@ Browsing other pages will be possible after the row counting is done. Тест соединения с базой данных - + Browse for existing database file on local computer Указать существующий файл базы данных на локальном компьютере - + Browse Обзор - + Enter an unique database name. Введите уникальное имя базы данных. @@ -2109,33 +2155,36 @@ Browsing other pages will be possible after the row counting is done. Данное имя уже используется. Пожалуйста, укажите уникальное имя. - + + <p>Automatic name generation was disabled, becuase the name was edited manually. To restore automatic generation please erase contents of the name field.</p> + <p>Автоматическая генерация имени отключена, так как имя было задано вручную. Для автоматической генерации необходимо удалить содержимое из поля имени.</p> + + + Enter a database file path. Введите путь к базе данных. - + This database is already on the list under name: %1 Указанная база данных уже находится в списке под именем %1 - + Select a database type. Выберите тип базы данных. - Auto-generated - Автоматически сгенерировано + Автоматически сгенерировано The name will be auto-generated Имя будет сгенерировано автоматически - Type the name - Введите имя + Введите имя @@ -2189,23 +2238,24 @@ Browsing other pages will be possible after the row counting is done. Delete objects - Удалить объекты + Удалить объекты Are you sure you want to delete following objects: %1 - + Вы действительно хотите удалить следующие объекты: +%1 Cannot start transaction. Details: %1 - + Невозможно начать транзакцию. Подробности: %1 Cannot commit transaction. Details: %1 - + Невозможно подтвердить транзакцию. Подробности: %1 @@ -2422,7 +2472,7 @@ Browsing other pages will be possible after the row counting is done. - + Erase table data Удалить данные из таблицы @@ -2440,54 +2490,64 @@ Browsing other pages will be possible after the row counting is done. Generate query for table - + Сгенерировать запрос для этой таблицы - - + + Create group Создать группу - + Group name Имя группы - + Entry with name %1 already exists in group %2. Элемент с именем %1 уже входит в группу %2. - + Delete group Удалить группу - + Are you sure you want to delete group %1? All objects from this group will be moved to parent group. Вы действительно хотите удалить группу %1? Все объекты из данной группы будут перемещены в родительскую группу. - + Are you sure you want to remove database '%1' from the list? - + Вы действительно хотите удалить базу данных '%1' из списка? - + Are you sure you want to remove following databases from the list: %1 - + Вы действительно хотите удалить следующие базы данных из списка: %1 - + Remove database - + Удалить базу данных - + Vacuum (%1) + Операция VACUUM (%1) + + + + Autoincrement value for table '%1' has been reset successfully. + + + + + Are you sure you want to delete all data from table(s): %1? @@ -2499,14 +2559,14 @@ All objects from this group will be moved to parent group. Вы действительно хотите удалить базу данных '%1'? - - + + Cannot import, because no import plugin is loaded. Невозможно произвести импорт, т.к. не загружено ни одного модуля импорта. - - + + Cannot export, because no export plugin is loaded. Невозможно произвести экспорт, т.к. не загружено ни одного модуля экспорта. @@ -2519,67 +2579,65 @@ All objects from this group will be moved to parent group. Выполнение команды VACUUM успешно завершено. - + Integrity check (%1) Проверка целостности (%1) - + Reset autoincrement Сброс счётчика автоинкремента - + Are you sure you want to reset autoincrement value for table '%1'? Вы действительно хотите сбросить счётчик автоинкремента у таблицы '%1'? - + An error occurred while trying to reset autoincrement value for table '%1': %2 При попытке сброса счётчика автоинкремента у таблицы '%1' произошла ошибка: %2 - Autoincrement value for table '%1' has been reset successfly. - Сброс счётчика автоинкремента у таблицы '%1' успешно выполнен. + Сброс счётчика автоинкремента у таблицы '%1' успешно выполнен. - Are you sure you want to delete all data from table '%1'? - Вы действительно хотите удалить все данные из таблицы '%1'? + Вы действительно хотите удалить все данные из таблицы '%1'? - + An error occurred while trying to delete data from table '%1': %2 При попытке удаления данных из таблицы '%1' произошла ошибка: %2 - + All data has been deleted for table '%1'. Из таблицы '%1' были удалены все данные. - + Following objects will be deleted: %1. Будут удалены следующие объекты: %1. - + Following databases will be removed from list: %1. Из списка будут удалены следующие базы данных: %1. - + Remainig objects from deleted group will be moved in place where the group used to be. Оставшиеся после удаления группы объекты будут перемещены туда, где ранее располагалась группа. - + %1<br><br>Are you sure you want to continue? %11<br><br>Вы действительно хотите продолжить? - + Delete objects Удалить объекты @@ -2705,7 +2763,7 @@ All objects from this group will be moved to parent group. Could not add dropped database file '%1' automatically. Manual setup is necessary. - + Невозможно автоматически добавить перетянутый файл базы данных '%1'. Необходима ручная настройка. @@ -2852,78 +2910,82 @@ Please enter new, unique name, or press '%1' to abort the operation:Создать представление из запроса - + Previous database Предыдущая база данных - + Next database Следующая база данных - + Show next tab sql editor Открыть следующую вкладку - + Show previous tab sql editor Открыть предыдущую вкладку - + Focus results below sql editor Фокус на результатах внизу - + Focus SQL editor above sql editor Фокус на редакторе SQL сверху - + Active database (%1/%2) Текущая база данных (%1/%2) - + Query finished in %1 second(s). Rows affected: %2 Запрос выполнен за %1 секунд. Затронуто строк: %2 - + Query finished in %1 second(s). Запрос выполнен за %1 секунд. - + Clear execution history Очистка истории запросов - + Are you sure you want to erase the entire SQL execution history? This cannot be undone. Вы действительно хотите удалить всю историю выполнения SQL запросов? Операцию невозможно отменить. - + Cannot export, because no export plugin is loaded. Невозможно произвести экспорт, т.к. не загружено ни одного модуля экспорта. - + No database selected in the SQL editor. Cannot create a view for unknown database. В редакторе SQL не выбрана база данных. Невозможно создать представление в неизвестной базе данных. - + + Editor window "%1" has uncommitted data. + + + Editor window "%1" has uncommited data. - В окне редактора "%1" имеются неподтверждённые данные. + В окне редактора "%1" имеются неподтверждённые данные. @@ -3379,8 +3441,12 @@ Please enter new, unique name, or press '%1' to abort the operation: + Functions editor window has uncommitted modifications. + + + Functions editor window has uncommited modifications. - В окне редактора функций имеются неподтверждённые изменения. + В окне редактора функций имеются неподтверждённые изменения. @@ -3532,27 +3598,27 @@ Please enter new, unique name, or press '%1' to abort the operation: Delete selected indexed expression - + Удалить выбранное индексируемое выражение Moves selected index column up in the order, making it more significant in the index. - + Переместить индексируемый столбец выше по списку, увеличивая его значимость в индексе. Moves selected index column down in the order, making it less significant in the index. - + Переместить индексируемый столбец ниже по списку, снижая его значимость в индексе. Edit selected indexed expression - + Редактировать выбранное индексируемое выражение Add indexed expression - + Добавить индексируемое выражение @@ -3572,7 +3638,7 @@ Please enter new, unique name, or press '%1' to abort the operation: Unique index cannot have indexed expressions. Either remove expressions from list below, or uncheck this option. - + Уникальный индекс не может содержать индексируемые выражения. Либо удалите выражения из списка ниже, либо отключите эту опцию. @@ -3626,42 +3692,42 @@ Please enter new, unique name, or press '%1' to abort the operation: Indexed expression - + Индексируемое выражение Expression to index - + Выражение для добавления в индекс This expression is already indexed by the index. - + Такое выражение уже присутствует в индексе. Column should be indexed directly, not by expression. Either extend this expression to contain something more than just column name, or abort and select this column in index dialog directly. - + Столбец необходимо индексировать напрямую, а не выражением. Либо добавьте в выражение что-либо кроме имени столбца, либо отмените изменения и отметьте столбец непосредственно в окне индекса. Column '%1' does not belong to the table covered by this index. Indexed expressions can refer only to columns from the indexed table. - + Столбец '%1' не принадлежит к индексируемой таблице. Индексируемые выражения могут ссылаться только на столбцы индексируемой таблицы. It's forbidden to use 'SELECT' statements in indexed expressions. - + Запрещено использовать конструкции SELECT в индексируемых выражениях. Enter an indexed expression. - + Введите индексируемое выражение. Invalid expression. - + Некорректное выражение. @@ -3979,9 +4045,13 @@ Please enter new, unique name, or press '%1' to abort the operation: MdiWindow - Uncommited changes - Неподтверждённые изменения + Неподтверждённые изменения + + + + Uncommitted changes + @@ -4720,7 +4790,7 @@ Please enter new, unique name, or press '%1' to abort the operation: Toggle comment - + Комментировать/раскомментировать @@ -4912,9 +4982,13 @@ Please enter new, unique name, or press '%1' to abort the operation: QuitConfirmDialog - Uncommited changes - Неподтверждённые изменения + Неподтверждённые изменения + + + + Uncommitted changes + @@ -5013,179 +5087,179 @@ find next SqlEditor - + Cut sql editor Вырезать - + Copy sql editor Копировать - + Paste sql editor Вставить - + Delete sql editor Удалить - + Select all sql editor Выделить всё - + Undo sql editor Отменить - + Redo sql editor Повторить - + Complete sql editor Завершить - + Format SQL sql editor Форматировать SQL - + Save SQL to file sql editor Сохранить SQL в файл - + Select file to save SQL sql editor Выбрать файл для сохранения SQL - + Load SQL from file sql editor Загрузить SQL из файла - + Delete line sql editor Удалить строчку - + Move block down sql editor Переместить блок вниз - + Move block up sql editor Переместить блок вверх - + Copy block down sql editor Копировать блок вниз - + Copy up down sql editor Копировать блок вверх - + Find sql editor Найти - + Find next sql editor Найти далее - + Find previous sql editor Найти предыдущее - + Replace sql editor Заменить - + Toggle comment sql editor - + Комментировать/раскомментировать - + Saved SQL contents to file: %1 SQL-код сохранён в файле %1 - + Syntax completion can be used only when a valid database is set for the SQL editor. Дополнение синтаксиса может быть использовано только после назначения корректной базы данных редактору SQL. - + Contents of the SQL editor are huge, so errors detecting and existing objects highlighting are temporarily disabled. Размер содержимого редактора SQL слишком велико, поэтому обнаружение ошибок и подсветка существующих объектов временно отключена. - + Save to file Сохранить в файл - + Could not open file '%1' for writing: %2 Невозможно открыть файл '%1' для записи: %2 - + SQL scripts (*.sql);;All files (*) Скрипты SQL (*.sql);;Все файлы (*) - + Open file Открыть файл - + Could not open file '%1' for reading: %2 Невозможно открыть файл '%1' для чтения: %2 - + Reached the end of document. Hit the find again to restart the search. Достигнут конец документа. Нажмите Найти снова для перезапуска поиска. @@ -5217,12 +5291,11 @@ find next Ограничения: - This cell is not editable, because: %1 - Эта ячейка нередактируема, причина: %1 + Эта ячейка нередактируема, причина: %1 - + Cannot load the data for a cell that refers to the already closed database. Невозможно загрузить данные ячейки, которая ссылается на уже закрытую базу данных. @@ -5230,88 +5303,122 @@ find next SqlQueryItemDelegate - - Cannot edit this cell. Details: %2 - Невозможно редактировать данную ячейку. Подробности: %2 + Невозможно редактировать данную ячейку. Подробности: %2 - + The row is marked for deletion. Строка помечена для удаления. - - Foreign key for column %2 has more than %1 possible values. It's too much to display in drop down list. You need to edit value manually. + + + + + + Cannot edit this cell. Details: %1 + Невозможно редактировать данную ячейку. Подробности: %1 + + + + + Structure of this table has changed since last data was loaded. Reload the data to proceed. + + + Editing a huge contents in an inline cell editor is not a good idea. It can become slow and inconvenient. It's better to edit such big contents in a Form View, or in popup editor (available under rick-click menu). + + + + + Foreign key for column %2 has more than %1 possible values. It's too much to display in drop down list. You need to edit value manually. + Внешний ключ для столбца %2 имеет более чем %1 возможных значений. Это слишком много для отображения в выпадающем списке. Вам необходимо ввести значение вручную. + SqlQueryModel - - + + Only one query can be executed simultaneously. Одновременно может быть выполнен только один запрос. - Uncommited data - Неподтверждённые данные + Неподтверждённые данные - There are uncommited data changes. Do you want to proceed anyway? All uncommited changes will be lost. - Имеются неподтверждённые изменения данных. Вы действительно хотите продолжить? Все неподтверждённые изменения будут утеряны. + Имеются неподтверждённые изменения данных. Вы действительно хотите продолжить? Все неподтверждённые изменения будут утеряны. - + Cannot commit the data for a cell that refers to the already closed database. Невозможно подтвердить данные для ячейки, которая ссылается на уже закрытую базу данных. - + Could not begin transaction on the database. Details: %1 Невозможно начать транзакцию в базе данных. Подробности: %1 - An error occurred while commiting the transaction: %1 - При завершении транзакции возникла ошибка: %1 + При завершении транзакции возникла ошибка: %1 - + An error occurred while rolling back the transaction: %1 При отмене транзакции возникла ошибка: %1 - + Tried to commit a cell which is not editable (yet modified and waiting for commit)! This is a bug. Please report it. Попытка подтверждения данных для нередактируемой ячейки (которая тем не менее была изменена и ожидает подтверждения). Это программная ошибка. Пожалуйста, отправьте о ней отчёт. - An error occurred while commiting the data: %1 - При подтверждении данных произошла ошибка: %1 + При подтверждении данных произошла ошибка: %1 + + + + Uncommitted data + + + + + There are uncommitted data changes. Do you want to proceed anyway? All uncommitted changes will be lost. + + + + + An error occurred while committing the transaction: %1 + + + + + An error occurred while committing the data: %1 + - - + + Error while executing SQL query on database '%1': %2 Ошибка при выполнении SQL запроса к базе данных '%1': %2 - + Error while loading query results: %1 Ошибка при загрузке результатов запроса: %1 - + Insert multiple rows Вставить несколько строк - + Number of rows to insert: Количество вставляемых строк: @@ -5319,117 +5426,117 @@ find next SqlQueryView - + Go to referenced row in... - + Перейти к связанной строке в... - + Copy Копировать - + Copy as... Копировать как... - + Paste Вставить - + Paste as... Вставить как... - + Set NULL values Установить значения на NULL - + Erase values Стереть содержимое - + Edit value in editor Править содержимое в редакторе - + Commit Подтвердить - + Rollback Откатить - + Commit selected cells Подтвердить выбранные ячейки - + Rollback selected cells Откатить выбранные ячейки - + Define columns to sort by Определить столбцы для сортировки - + Remove custom sorting Сбросить указанную сортировку - + Insert row Вставить строку - + Insert multiple rows Вставить несколько строк - + Delete selected row Удалить выбранную строку - + Generate query for selected cells - + Сгенерировать запрос для выбранных ячеек - + No items selected to paste clipboard contents to. Не выбраны элементы для вставки в них содержимого буфера обмена. - + Go to referenced row in table '%1' - + Перейти к связанной строке в таблице '%1' - + table '%1' - + таблица '%1' - + Referenced row (%1) - + Связанная строка (%1) - + Edit value Править содержимое @@ -5437,12 +5544,16 @@ find next SqlTableModel - Error while commiting new row: %1 - Ошибка при подтверждении новой строки: %1 + Ошибка при подтверждении новой строки: %1 - + + Error while committing new row: %1 + + + + Error while deleting row from table %1: %2 Ошибка при удалении строки из таблицы %1: %2 @@ -5651,39 +5762,42 @@ but it's okay to use them anyway. Primary Key table structure columns - + Первичный +ключ Foreign Key table structure columns - + Внешний +ключ Unique table structure columns - Уникальность + Уникальность Check table structure columns - Проверка + Проверка Not NULL table structure columns - + Не +NULL Collate table structure columns - Сравнение + Сравнение @@ -5706,7 +5820,7 @@ NULL - + Data Данные @@ -5731,194 +5845,194 @@ NULL DDL - + Export table table window Экспортировать таблицу - + Import data to table table window Импортировать данные в таблицу - + Populate table table window Заполнить таблицу - + Refresh structure table window Обновить структуру - + Commit structure changes table window Подтвердить изменения структуры - + Rollback structure changes table window Откатить изменения структуры - + Add column table window Добавить столбец - + Edit column table window Редактировать столбец - - + + Delete column table window Удалить столбец - + Move column up table window Переместить столбец вверх - + Move column down table window Переместить столбец вниз - + Create similar table table window Создать подобную таблицу - + Reset autoincrement value table window Сбросить счётчик автоинкремента - + Add table constraint table window Добавить ограничение на таблицу - + Edit table constraint table window Редактировать ограничение на таблицу - + Delete table constraint table window Удалить ограничение на таблицу - + Move table constraint up table window Переместить ограничение на таблицу вверх - + Move table constraint down table window Переместить ограничение на таблицу вниз - + Add table primary key table window Добавить первичный ключ таблицы - + Add table foreign key table window Добавить внешний ключ таблицы - + Add table unique constraint table window Добавить табличное ограничение на уникальность - + Add table check constraint table window Добавить проверочное ограничение на таблицу - + Refresh index list table window Обновить список индексов - + Create index table window Создать индекс - + Edit index table window Редактировать индекс - + Delete index table window Удалить индекс - + Refresh trigger list table window Обновить список триггеров - + Create trigger table window Создать триггер - + Edit trigger table window Редактировать триггер - + Delete trigger table window Удалить триггер - + Are you sure you want to delete column '%1'? table window Вы действительно хотите удалить столбец '%1'? - + Following problems will take place while modifying the table. Would you like to proceed? table window @@ -5926,41 +6040,82 @@ Would you like to proceed? Вы хотите продолжить? - + Table modification table window Изменение таблицы - + Could not load data for table %1. Error details: %2 Невозможно загрузить данные таблицы %1. Подробности ошибки: %2 - + Could not process the %1 table correctly. Unable to open a table window. Не удалось корректно обработать таблицу %1. Невозможно открыть окно таблицы. - + Could not restore window %1, because no database or table was stored in session for this window. Невозможно восстановить окно %1, так как в сессии для этого окна не была сохранена база данных или таблица. - + Could not restore window '%1', because no database or table was stored in session for this window. Невозможно восстановить окно '%1', так как в сессии для этого окна не была сохранена база данных или таблица. - + Could not restore window '%1', because database %2 could not be resolved. Невозможно восстановить окно '%1', так как невозможно определить базу данных %2 - + Could not restore window '%1'', because the table %2 doesn't exist in the database %3. Невозможно восстановить окно '%1', так как таблица %2 не существует в базе данных %3. + + + Committed changes for table '%1' successfully. + + + + + Committed changes for table '%1' (named before '%2') successfully. + + + + + Autoincrement value for table '%1' has been reset successfully. + + + + + Uncommitted changes + + + + + There are uncommitted structure modifications. You cannot browse or edit data until you have table structure settled. +Do you want to commit the structure, or do you want to go back to the structure tab? + + + + + Table window "%1" has uncommitted structure modifications and data. + + + + + Table window "%1" has uncommitted data. + + + + + Table window "%1" has uncommitted structure modifications. + + Could not restore window, because database %1 could not be resolved. Невозможно восстановить окно, так как невозможно определить базу данных %1 @@ -5970,180 +6125,172 @@ Would you like to proceed? Невозможно восстановить окно, так как таблица %1 не существует в базе данных %2. - + New table %1 Новая таблица %1 - Commited changes for table '%1' successfly. - + Изменения в таблицу '%1' внесены успешно. - Commited changes for table '%1' (named before '%2') successfly. - + Изменения в таблицу '%1' (предыдущее название '%2') внесены успешно. - + Could not commit table structure. Error message: %1 table window Невозможно подтвердить структуру таблицы. Сообщение об ошибке: %1 - + Reset autoincrement Сброс счётчика автоинкремента - + Are you sure you want to reset autoincrement value for table '%1'? Вы действительно хотите сбросить счётчик автоинкремента у таблицы '%1'? - + An error occurred while trying to reset autoincrement value for table '%1': %2 При попытке сброса счётчика автоинкремента у таблицы '%1' произошла ошибка: %2 - Autoincrement value for table '%1' has been reset successfly. - Сброс счётчика автоинкремента у таблицы '%1' успешно выполнен. + Сброс счётчика автоинкремента у таблицы '%1' успешно выполнен. - + Empty name Пустое имя - + A blank name for the table is allowed in SQLite, but it is not recommended. Are you sure you want to create a table with blank name? SQLite позволяет таблице иметь пустое имя, хотя это не рекомендуется. Вы действительно хотите создать таблицу с пустым именем? - + Cannot create a table without at least one column. Невозможно создать таблицу без хотя бы одного столбца. - + Cannot create table %1, if it has no primary key defined. Either uncheck the %2, or define a primary key. Невозможно создать таблицу %1, если не определён первичный ключ. Отключите %2, либо определите первичный ключ. - + Cannot use autoincrement for primary key when %1 clause is used. Either uncheck the %2, or the autoincrement in a primary key. Невозможно использовать автоинкремент первичного ключа при использовании оператора %1. Отключите либо %2, либо автоинкремент первичного ключа. - + Are you sure you want to delete table constraint '%1'? table window Вы действительно хотите удалить ограничение на таблицу '%1'? - + Delete constraint table window Удалить ограничение - + Cannot export, because no export plugin is loaded. Невозможно произвести экспорт, т.к. не загружено ни одного модуля экспорта. - + Cannot import, because no import plugin is loaded. Невозможно произвести импорт, т.к. не загружено ни одного модуля импорта. - Uncommited changes - Неподтверждённые изменения + Неподтверждённые изменения - There are uncommited structure modifications. You cannot browse or edit data until you have table structure settled. Do you want to commit the structure, or do you want to go back to the structure tab? - Имеются неподтверждённые изменения структуры. Невозможно просматривать или редактировать данные, пока структура таблицы не подтверждена. + Имеются неподтверждённые изменения структуры. Невозможно просматривать или редактировать данные, пока структура таблицы не подтверждена. Подтвердить структуру таблицы или вернуться на вкладку структуры? - + Go back to structure tab Вернуться на вкладку структуры - + Commit modifications and browse data. Подтвердить изменения и перейти к данным. - + Name table window indexes Имя - + Unique table window indexes Уникальность - + Columns table window indexes Столбцы - + Partial index condition table window indexes Условие для частичного индекса - + Name table window triggers Имя - + Event table window triggers Событие - + Condition table window triggers Условие - + Details table window triggers Подробности - Table window "%1" has uncommited structure modifications and data. - В окне таблицы "%1" имеются неподтверждённые изменения структуры и данных. + В окне таблицы "%1" имеются неподтверждённые изменения структуры и данных. - Table window "%1" has uncommited data. - В окне таблицы "%1" имеются неподтверждённые изменения данных. + В окне таблицы "%1" имеются неподтверждённые изменения данных. - Table window "%1" has uncommited structure modifications. - В окне таблицы "%1" имеются неподтверждённые изменения структуры. + В окне таблицы "%1" имеются неподтверждённые изменения структуры. @@ -6158,6 +6305,16 @@ Do you want to commit the structure, or do you want to go back to the structure Triggering columns: Столбцы, вызывающие триггер: + + + Select all + + + + + Deselect all + Снять выделение + TriggerDialog @@ -6249,13 +6406,13 @@ Do you want to commit the structure, or do you want to go back to the structure Введите корректный код триггера. - + Error trigger dialog Ошибка - + An error occurred while executing SQL statements: %1 При выполнении конструкций SQL произошла ошибка: @@ -6300,11 +6457,11 @@ Do you want to commit the structure, or do you want to go back to the structure Output column names - + Отображаемые имена столбцов - + Data Данные @@ -6358,220 +6515,249 @@ Do you want to commit the structure, or do you want to go back to the structure Новое представление %1 - + Refresh the view view window Обновить представление - + Commit the view changes view window Подтвердить изменения представления - + Rollback the view changes view window Откатить изменения представления - + Explicit column names - + Явные имена столбцов - + Generate output column names automatically basing on result columns of the view. - + Сгенерировать отображаемые имена столбцов на основе результирующих столбцов представления. - + Add column view window - Добавить столбец + Добавить столбец - + Edit column view window - Редактировать столбец + Редактировать столбец - + Delete column view window - Удалить столбец + Удалить столбец - + Move column up view window - Переместить столбец вверх + Переместить столбец вверх - + Move column down view window - Переместить столбец вниз + Переместить столбец вниз - + Refresh trigger list view window Обновить список триггеров - + Create new trigger view window Создать новый триггер - + Edit selected trigger view window Редактировать выбранный триггер - + Delete selected trigger view window Удалить выбранный триггер - + + View window "%1" has uncommitted structure modifications and data. + + + + + View window "%1" has uncommitted data. + + + + + View window "%1" has uncommitted structure modifications. + + + + + Uncommitted changes + + + + + There are uncommitted structure modifications. You cannot browse or edit data until you have the view structure settled. +Do you want to commit the structure, or do you want to go back to the structure tab? + + + + + Committed changes for view '%1' successfully. + + + + + Committed changes for view '%1' (named before '%2') successfully. + + + View window "%1" has uncommited structure modifications and data. - В окне представления "%1" имеются неподтверждённые изменения структуры и данных. + В окне представления "%1" имеются неподтверждённые изменения структуры и данных. - View window "%1" has uncommited data. - В окне представления "%1" имеются неподтверждённые изменения данных. + В окне представления "%1" имеются неподтверждённые изменения данных. - View window "%1" has uncommited structure modifications. - В окне представления "%1" имеются неподтверждённые изменения структуры. + В окне представления "%1" имеются неподтверждённые изменения структуры. - + Could not load data for view %1. Error details: %2 Невозможно загрузить данные представления %1. Подробности ошибки: %2 - Uncommited changes - Неподтверждённые изменения + Неподтверждённые изменения - There are uncommited structure modifications. You cannot browse or edit data until you have the view structure settled. Do you want to commit the structure, or do you want to go back to the structure tab? - Имеются неподтверждённые изменения структуры. Невозможно просматривать или редактировать данные, пока структура представления не подтверждена. + Имеются неподтверждённые изменения структуры. Невозможно просматривать или редактировать данные, пока структура представления не подтверждена. Подтвердить структуру представления или вернуться на вкладку структуры? - + Go back to structure tab Вернуться на вкладку структуры - + Commit modifications and browse data. Подтвердить изменения и перейти к данным. - Commited changes for view '%1' successfly. - + Изменения в представление '%1' внесены успешно. - Commited changes for view '%1' (named before '%2') successfly. - + Изменения в представление '%1' (предыдущее название '%2') внесены успешно. - + Could not commit view changes. Error message: %1 view window Невозможно подтвердить изменения представления. Сообщение об ошибке: %1 - + Override columns - + Перезапись столбцов - + Currently defined columns will be overriden. Do you want to continue? - + Заданные столбцы будут перезаписаны. Вы хотите продолжить? - + Could not determinate columns returned from the view. The query is problably incomplete or contains errors. - + Невозможно определить столбцы, возвращаемые представлением. Вероятно запрос неполон или содержит ошибки. - + Name view window triggers Имя - + Instead of view window triggers Вместо - + Condition view window triggers Условие - + Details table window triggers Подробности - + Could not process the %1 view correctly. Unable to open a view window. Не удалось корректно обработать представление %1. Невозможно открыть окно представления. - + Empty name Пустое имя - + A blank name for the view is allowed in SQLite, but it is not recommended. Are you sure you want to create a view with blank name? SQLite позволяет представлению иметь пустое имя, хотя это не рекомендуется. Вы действительно хотите создать представление с пустым именем? - + The SELECT statement could not be parsed. Please correct the query and retry. Details: %1 Невозможно проанализировать структуру конструкции SELECT. Пожалуйста, исправьте запрос и повторите попытку. Подробности: %1 - + The view could not be modified due to internal SQLiteStudio error. Please report this! Невозможно изменить представление из-за внутренней ошибки SQLiteStudio. Пожалуйста, сообщите о ней! - + The view code could not be parsed properly for execution. This is a SQLiteStudio's bug. Please report it. Невозможно корректно проанализировать структуру представления для выполнения. Это ошибка SQLiteStudio. Пожалуйста, сообщите о ней. - + Following problems will take place while modifying the view. Would you like to proceed? view window @@ -6579,7 +6765,7 @@ Would you like to proceed? Вы хотите продолжить? - + View modification view window Изменение представления diff --git a/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_sk.qm b/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_sk.qm index ac0f46e..6490cf2 100644 Binary files a/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_sk.qm and b/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_sk.qm differ diff --git a/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_sk.ts b/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_sk.ts index e6625c1..8703dc7 100644 --- a/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_sk.ts +++ b/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_sk.ts @@ -1,6 +1,6 @@ - + AboutDialog @@ -431,8 +431,12 @@ + Collations editor window has uncommitted modifications. + + + Collations editor window has uncommited modifications. - Okno editora porovnávaní obsahuje nepotvrdené zmeny. + Okno editora porovnávaní obsahuje nepotvrdené zmeny. @@ -509,12 +513,12 @@ Scale - + Rozsah Precision - + Presnosť @@ -905,7 +909,7 @@ but it's okay to use it. ConfigDialog - + Configuration Konfigurácia @@ -967,17 +971,17 @@ but it's okay to use it. Database dialog window - + Databázové dialógové okno <p>When adding new database it is marked to be "permanent" (stored in configuration) by default. Checking this option makes every new database to NOT be "permanent" by default.</p> - + <p>Označením tejto možnosti sa vypne voľba "Zapamätať si databázu" v okne pridávania novej databázy</p> Do not mark database to be "permanent" by default - + Nepamätať si databázu @@ -995,215 +999,234 @@ but it's okay to use it. Prezeranie a úprava dát - + Number of data rows per page: Počet data riadkov na stranu: - - + + <p>When the data is read into grid view columns width is automatically adjusted. This value limits the initial width for the adjustment, but user can still resize the column manually over this limit.</p> - + Limit initial data column width to (in pixels): - + + Keep NULL value when entering empty value + + + + <p>When this is enabled and user holds mouse pointer over a cell in any data view (query results, a table data, a view data) a tooltip will appear with details about the cell - it includes details like column data type, constraints, ROWID and others.</p> - + Show column and row details tooltip in data view - + + <p>When editing a cell which used to have NULL value and entering empty string as new value, then this option determinates whether the new value should remain NULL (have this option enabled), or should it be overwritten with empty string value (have this option disabled).</p> + + + + + <html><head/><body><p>Enable this to always enforce DEFAULT value when committing a NULL value for a column that has DEFAULT value defined, even though the column is allowed to contain NULL values.</p><p>Disable this option to use DEFAULT value exclusively when NULL value is committed for column with NOT NULL constraint.</p></body></html> + + + + + Use DEFAULT value (if defined), when committing NULL value + + + + Inserting new row in data grid - + Before currently selected row - + After currently selected row - + At the end of data view - + <p>When enabled, Table Windows will show up with the data tab, instead of the structure tab.</p> - + <p>When enabled the "Data" tab will be placed as first tab in every Table Window, instead of being at second place.</p> - + Place data tab as first tab in a Table Window - + <p>When enabled, View Windows will show up with the data tab, instead of the structure tab.</p> - + <p>When enabled the "Data" tab will be placed as first tab in every View Window, instead of being at second place.</p> - + Place data tab as first tab in a View Window - + Data types Datové typy - + Available editors: Dostupné editory: - + Editors selected for this data type: - + Schema editing Úprava schémy - + Number of DDL changes kept in history. Počet DDL zmien uchovávaných v histórii. - + DDL history size: Veľkosť DDL histórie: - Don't show DDL preview dialog when commiting schema changes - Nezobrazovať náhľad DDL pri potvrdzovaní zmien v schéme + Nezobrazovať náhľad DDL pri potvrdzovaní zmien v schéme - + SQL queries SQL dotazy - - + + Number of queries kept in the history. Počet dotazov uchovávaných v histórii. - + History size: Veľkosť SQL histórie: - + <p>If there is more than one query in the SQL editor window, then (if this option is enabled) only a single query will be executed - the one under the keyboard insertion cursor. Otherwise all queries will be executed. You can always limit queries to be executed by selecting those queries before calling to execute.</p> <p>Ak je v SQL editore viacej ako jeden dotaz, potom(ak je táto voľba zapnutá) bude vykonaný iba jeden dotaz - ten, na ktorom je kurzor. Ináč budú vykonané všetky dotazy. Vždy si viete vybrať ktoré dotazy budú vykonané a to ich výberom\označením.</p> - + Execute only the query under the cursor Vykonať len dotaz, na ktorom stojí kurzor - + Updates Aktualizácie - + Automatically check for updates at startup Kontrolovať aktualizácie pri štarte - + Session Sedenie - + Restore last session (active MDI windows) after startup Obnoviť posledné sedenie (aktívne okná) pri štarte - + Status Field - + <p>When user manually closes the Status panel, this option makes sure that if any new message is printed in the Status panel it will be reopened. If it's disabled, then Status panel can only be open manually by the user from the "View" menu.</p> - + Always open Status panel when new message is printed - + Filter shortcuts by name or key combination Filtrovať podľa názvu alebo klávesovej skratky - + Action Akcia - + Key combination Klávesová skratka - - + + Language Jazyk - + Changing language requires application restart to take effect. Je potrebné reštartovať aplikáciu aby sa zmena jazyka prejavila. - + Compact layout - + <p>Compact layout reduces all margins and spacing on the UI to minimum, making space for displaying more data. It makes the interface a little bit less aesthetic, but allows to display more data at once.</p> - + Use compact layout @@ -1279,7 +1302,7 @@ but it's okay to use it. Zobraziť systémové tabuľky a indexy v zozname - + Table windows Okná tabuľky @@ -1288,12 +1311,12 @@ but it's okay to use it. Ak je táto možnosť zaškrtnutá, tak sa v okne zobrazia dáta a nie štruktúra tabuľky. - + Open Table Windows with the data tab for start Zobraziť dáta po otvorení tabuľky - + View windows Okná pohľadov @@ -1302,227 +1325,244 @@ but it's okay to use it. Ak je táto možnosť zaškrtnutá, tak sa v okne zobrazia dáta a nie SQL dotaz. - + Open View Windows with the data tab for start Zobraziť dáta po otvorení pohľadu - + + Don't show DDL preview dialog when committing schema changes + + + + Main window dock areas - + Left and right areas occupy corners - + Top and bottom areas occupy corners - + Hide built-in plugins Nezobrazovať interné pluginy - + Current style: Aktuálny štýl: - + Preview Náhľad - + Enabled Zapnutý - + Disabled Vypnutý - + Active formatter plugin Aktívny formátovací plugin - + SQL editor font Písmo SQL editora - + Database list font Font zoznamu databáz - + Database list additional label font Font doplnkového popisku - + Data view font Font dát - + Status field font Font status okna - + SQL editor colors Farby SQL editora - + Current line background - + <p>SQL strings are enclosed with single quote characters.</p> - + String foreground - + <p>Bind parameters are placeholders for values yet to be provided by the user. They have one of the forms:</p><ul><li>:param_name</li><li>$param_name</li><li>@param_name</li><li>?</li></ul> - + Bind parameter foreground - + Highlighted parenthesis background - + <p>BLOB values are binary values represented as hexadecimal numbers, like:</p><ul><li>X'12B4'</li><li>x'46A2F4'</li></ul> - + BLOB value foreground Farba BLOB hodnoty - + Regular foreground - + Line numbers area background - + Keyword foreground - + Number foreground - + Comment foreground - + <p>Valid objects are name of tables, indexes, triggers, or views that exist in the SQLite database.</p> - + Valid objects foreground - + Data view colors Farby dát - + + <p>Any data changes will be outlined with this color, until they're committed to the database.</p> + + + + + Uncommitted data outline color + + + + + <p>In case of error while committing data changes, the problematic cell will be outlined with this color.</p> + + + <p>Any data changes will be outlined with this color, until they're commited to the database.</p> - <p>Všetky zmeny dát budú ohraničené touto farbou, dokiaľ nebudú potvrdené.</p> + <p>Všetky zmeny dát budú ohraničené touto farbou, dokiaľ nebudú potvrdené.</p> - Uncommited data outline color - Farba rámčeka nepotvrdených dát + Farba rámčeka nepotvrdených dát - <p>In case of error while commiting data changes, the problematic cell will be outlined with this color.</p> - <p>V prípade chyby pri potvrdzovaní zmien dát, budú problematické bunky ohraničené touto farbou.</p> + <p>V prípade chyby pri potvrdzovaní zmien dát, budú problematické bunky ohraničené touto farbou.</p> - + Commit error outline color Farba rámčeka s chybou potvrdenia dát - + NULL value foreground Farba NULL hodnoty - + Deleted row background Pozadie vymazaného riadka - + Database list colors Farby zoznamu databáz - + <p>Additional labels are those which tell you SQLite version, number of objects deeper in the tree, etc.</p> - + Additional labels foreground Farba doplnkového popisku - + Status field colors Farby status okna - + Information message foreground Farba informačnej správy - + Warning message foreground Farba upozornenia - + Error message foreground Farba chybovej správy @@ -2014,22 +2054,21 @@ Prezeranie ďalších strán bude možné až po dokončení spočítavania.Databázový ovládač - Generate automatically - Generovať automaticky + Generovať automaticky - + Options Voľby - + Permanent (keep it in configuration) Zapamätať si databázu - + Test connection Test spojenia @@ -2052,7 +2091,7 @@ Prezeranie ďalších strán bude možné až po dokončení spočítavania. - + File Súbor @@ -2062,16 +2101,15 @@ Prezeranie ďalších strán bude možné až po dokončení spočítavania.Názov (v zozname) - Generate name basing on file path - Generovať názov na základe cesty k súboru + Generovať názov na základe cesty k súboru Permanent Uložiť natrvalo - + <p>Enable this if you want the database to be stored in configuration file and restored every time SQLiteStudio is started.</p> aasfd <p>Databáza sa uloží do konfiguračného súboru a bude obnovená pri každom spustení SQLiteStudia.</p> @@ -2081,17 +2119,17 @@ Prezeranie ďalších strán bude možné až po dokončení spočítavania.Otestovať spojenie s databázou - + Browse for existing database file on local computer Hľadať databázový súbor na lokálnom počítači - + Browse Prehľadávať - + Enter an unique database name. Zadajte názov databázy. @@ -2101,33 +2139,36 @@ Prezeranie ďalších strán bude možné až po dokončení spočítavania.Tento názov už existuje. Prosím zadajte iný názov. - + + <p>Automatic name generation was disabled, becuase the name was edited manually. To restore automatic generation please erase contents of the name field.</p> + + + + Enter a database file path. Zadajte cestu k databázovému súboru. - + This database is already on the list under name: %1 Táto databáza už je v zozname pod názvom: %1 - + Select a database type. Vyberte typ databázy. - Auto-generated - Automaticky vygenerovaný + Automaticky vygenerovaný The name will be auto-generated Názov bude vygenerovaný automaticky - Type the name - Zadajte meno + Zadajte meno @@ -2415,7 +2456,7 @@ Prezeranie ďalších strán bude možné až po dokončení spočítavania. - + Erase table data Vymazať dáta z tabuľky @@ -2436,54 +2477,64 @@ Prezeranie ďalších strán bude možné až po dokončení spočítavania. - - + + Create group Vytvoriť skupinu - + Group name Názov skupiny - + Entry with name %1 already exists in group %2. Položka s názvom %1 už existuje v skupine %2. - + Delete group Vymazať skupinu - + Are you sure you want to delete group %1? All objects from this group will be moved to parent group. Ste si istý, že chcete vymazať skupinu %1? Všetky objekty z tejto skupiny budú presunuté do nadradenej skupiny. - + Are you sure you want to remove database '%1' from the list? - + Are you sure you want to remove following databases from the list: %1 - + Remove database - + Vacuum (%1) + + + Autoincrement value for table '%1' has been reset successfully. + + + + + Are you sure you want to delete all data from table(s): %1? + + Delete database Odstrániť databázu @@ -2493,14 +2544,14 @@ Všetky objekty z tejto skupiny budú presunuté do nadradenej skupiny.Ste si istý, že chcete odstrániť databázu '%1'? - - + + Cannot import, because no import plugin is loaded. Nemôžem importovať, lebo nebol načítaný žiaden plugin na import. - - + + Cannot export, because no export plugin is loaded. Nemôžem exportovať, lebo nebol načítaný žiaden plugin na export. @@ -2513,67 +2564,61 @@ Všetky objekty z tejto skupiny budú presunuté do nadradenej skupiny.VACUUM úspešne skončilo. - + Integrity check (%1) Kontrola integrity (%1) - + Reset autoincrement Resetovať autoinkrement - + Are you sure you want to reset autoincrement value for table '%1'? Ste si istý, že chcete zresetovať hodnotu autoinkrementu pre tabuľku %1 ? - + An error occurred while trying to reset autoincrement value for table '%1': %2 Vyskytla sa chyba pri pokuse o zresetovanie hodnoty autoinkrementu pre tebuľku '%1': %2 - - Autoincrement value for table '%1' has been reset successfly. - - - - Are you sure you want to delete all data from table '%1'? - Ste si istý, že chcete vymazať všetky dáta z tabuľky '%1'? + Ste si istý, že chcete vymazať všetky dáta z tabuľky '%1'? - + An error occurred while trying to delete data from table '%1': %2 Vyskytla sa chyba pri pokuse vymazať dáta z tabuľky '%1': %2 - + All data has been deleted for table '%1'. Všetky dáta z tabuľky '%1' boli vymazané. - + Following objects will be deleted: %1. Nasledujúce objekty budú odstránené: %1. - + Following databases will be removed from list: %1. Nasledujúce databázy budú odstránené zo zoznamu: %1. - + Remainig objects from deleted group will be moved in place where the group used to be. - + %1<br><br>Are you sure you want to continue? %1<br><br>Ste si istý, že chcete pokračovať? - + Delete objects Odstránenie objektov @@ -2842,78 +2887,82 @@ Please enter new, unique name, or press '%1' to abort the operation:Vytvoriť pohľad z dotazu - + Previous database Predchádzajúca databáza - + Next database Nasledujúca databáza - + Show next tab sql editor Zobraziť nasledujúcu záložku - + Show previous tab sql editor Zobraziť predchádzajúcu záložku - + Focus results below sql editor - + Focus SQL editor above sql editor - + Active database (%1/%2) Aktívna databáza (%1/%2) - + Query finished in %1 second(s). Rows affected: %2 Dotaz trval %1 sekúnd. Počet dotknutých riadkov: %2 - + Query finished in %1 second(s). Dotaz trval %1 sekúnd. - + Clear execution history Vymazať históriu dotazov - + Are you sure you want to erase the entire SQL execution history? This cannot be undone. Ste si istý, že chete vymazať celú históriu SQL dotazov? Túto operáciu nieje možné vrátiť späť. - + Cannot export, because no export plugin is loaded. Nemôžem exportovať, lebo nebol načítaný žiaden plugin na export. - + No database selected in the SQL editor. Cannot create a view for unknown database. Nebola vybraná žiadna databáza v SQL editore. Nemôžem vytvoriť view pre neznámu databázu. - + + Editor window "%1" has uncommitted data. + + + Editor window "%1" has uncommited data. - Okno editora "%1" obsahuje nepotrdené dáta. + Okno editora "%1" obsahuje nepotrdené dáta. @@ -3369,7 +3418,7 @@ Please enter new, unique name, or press '%1' to abort the operation: - Functions editor window has uncommited modifications. + Functions editor window has uncommitted modifications. @@ -3968,9 +4017,13 @@ Please enter new, unique name, or press '%1' to abort the operation: MdiWindow - Uncommited changes - Nepotvrdené zmeny + Nepotvrdené zmeny + + + + Uncommitted changes + @@ -4901,9 +4954,13 @@ Please enter new, unique name, or press '%1' to abort the operation: QuitConfirmDialog - Uncommited changes - Nepotvrdené zmeny + Nepotvrdené zmeny + + + + Uncommitted changes + @@ -5001,179 +5058,179 @@ nájsť ďalší SqlEditor - + Cut sql editor Vystrihnúť - + Copy sql editor Kopírovať - + Paste sql editor Vložiť - + Delete sql editor Vymazať - + Select all sql editor Vybrať všetko - + Undo sql editor - + Redo sql editor - + Complete sql editor - + Format SQL sql editor Formátovať SQL - + Save SQL to file sql editor Uložiť SQL do súboru - + Select file to save SQL sql editor - + Load SQL from file sql editor Načítať SQL zo súboru - + Delete line sql editor Vymazať riadok - + Move block down sql editor - + Move block up sql editor - + Copy block down sql editor - + Copy up down sql editor - + Find sql editor Nájsť - + Find next sql editor Nájsť ďalší - + Find previous sql editor Nájsť predchádzajúci - + Replace sql editor Nahradiť - + Toggle comment sql editor - + Saved SQL contents to file: %1 - + Syntax completion can be used only when a valid database is set for the SQL editor. - + Contents of the SQL editor are huge, so errors detecting and existing objects highlighting are temporarily disabled. - + Save to file Uložiť do súboru - + Could not open file '%1' for writing: %2 Nemôžem otvoriť súbor '%1' pre zápis: %2 - + SQL scripts (*.sql);;All files (*) - + Open file Otvoriť súbor - + Could not open file '%1' for reading: %2 Nemôžem otvoriť súbor '%1' na čítanie: %2 - + Reached the end of document. Hit the find again to restart the search. Dosiahnutý koniec súboru. Kliknite na tlačidlo Nájsť pre hľadanie od začiatku súboru. @@ -5205,12 +5262,11 @@ nájsť ďalší Obmedzenia: - This cell is not editable, because: %1 - Táto bunka nieje editovateľná, pretože: %1 + Táto bunka nieje editovateľná, pretože: %1 - + Cannot load the data for a cell that refers to the already closed database. @@ -5218,18 +5274,32 @@ nájsť ďalší SqlQueryItemDelegate - - - Cannot edit this cell. Details: %2 + + The row is marked for deletion. - - The row is marked for deletion. + + + + + + Cannot edit this cell. Details: %1 - + + + Structure of this table has changed since last data was loaded. Reload the data to proceed. + + + + + Editing a huge contents in an inline cell editor is not a good idea. It can become slow and inconvenient. It's better to edit such big contents in a Form View, or in popup editor (available under rick-click menu). + + + + Foreign key for column %2 has more than %1 possible values. It's too much to display in drop down list. You need to edit value manually. @@ -5237,69 +5307,85 @@ nájsť ďalší SqlQueryModel - - + + Only one query can be executed simultaneously. Nemôže byť spustených viacero dotazov súčasne. - Uncommited data - Nepotvrdené dáta + Nepotvrdené dáta - There are uncommited data changes. Do you want to proceed anyway? All uncommited changes will be lost. - Sú tu nepotvrdené zmeny. Chcete aj napriek tomu pokračovať? Všetky nepotvrdené zmeny budú stratené. + Sú tu nepotvrdené zmeny. Chcete aj napriek tomu pokračovať? Všetky nepotvrdené zmeny budú stratené. - + Cannot commit the data for a cell that refers to the already closed database. Nemôžem potrdiť dáta bunky, ktorá odkazuje na už uzatvorenú databázu. - + Could not begin transaction on the database. Details: %1 Nemôžem začať tranzakciu na databáze. Detaily: %1 - An error occurred while commiting the transaction: %1 - Vyskytla sa chyba počas potvrdzovania tranzakcie: %1 + Vyskytla sa chyba počas potvrdzovania tranzakcie: %1 - + An error occurred while rolling back the transaction: %1 Vyskytla sa chyba počas vracania späť tranzakcie: %1 - + Tried to commit a cell which is not editable (yet modified and waiting for commit)! This is a bug. Please report it. Nastal pokus o potvrdenie zmien v bunke, ktorú nieje možné upravovať (napriek tomu bola upravená a čaká na potvrdenie)! Toto je chyba. Prosím nahláste ju. - An error occurred while commiting the data: %1 - Vyskytla sa chyba počas potvrdzovania dát: %1 + Vyskytla sa chyba počas potvrdzovania dát: %1 - - + + Uncommitted data + + + + + There are uncommitted data changes. Do you want to proceed anyway? All uncommitted changes will be lost. + + + + + An error occurred while committing the transaction: %1 + + + + + An error occurred while committing the data: %1 + + + + + Error while executing SQL query on database '%1': %2 Vyskytla sa chyba počas vykonávania SQL dotazu na databáze '%1': %2 - + Error while loading query results: %1 Vyskytla sa chyba počas načítavania výsledkov dotazu: %1 - + Insert multiple rows Vložiť viacero riadkov - + Number of rows to insert: Počet vkládaných riadkov: @@ -5307,117 +5393,117 @@ nájsť ďalší SqlQueryView - + Go to referenced row in... - + Copy Kopírovať - + Copy as... Kopírovať ako... - + Paste Vložiť - + Paste as... Vložiť ako... - + Set NULL values Nastaviť null hodnoty - + Erase values Vymazať hodnoty - + Edit value in editor Upraviť hodnotu v editory - + Commit Potvrdiť - + Rollback Vrátiť späť - + Commit selected cells Potvrdiť vybrané bunky - + Rollback selected cells Vrátiť späť vybrané bunky - + Define columns to sort by Vybrať stĺpce na zoradenie podľa - + Remove custom sorting Odstrániť užívateľské triedenie - + Insert row Vložiť riadok - + Insert multiple rows Vložiť viacero riadkov - + Delete selected row Vymazať viacero riadkov - + Generate query for selected cells - + No items selected to paste clipboard contents to. Neboli vybrané žiadne položky na vloženie obsahu schránky. - + Go to referenced row in table '%1' - + table '%1' - + Referenced row (%1) - + Edit value Upraviť hodnotu @@ -5425,12 +5511,16 @@ nájsť ďalší SqlTableModel - Error while commiting new row: %1 - Vyskytla sa chyba počas potvrdzovania nového riadka: %1 + Vyskytla sa chyba počas potvrdzovania nového riadka: %1 + + + + Error while committing new row: %1 + - + Error while deleting row from table %1: %2 Vyskytla sa chyba počas mazania riadka z tabuľky %1: %2 @@ -5693,7 +5783,7 @@ NULL - + Data Dáta @@ -5718,409 +5808,430 @@ NULL DDL - + Export table table window Exportovať tabuľku - + Import data to table table window Importovať dáta do tabuľky - + Populate table table window Naplniť tabuľku - + Refresh structure table window Obnoviť štruktúru - + Commit structure changes table window Potvrdiť zmeny štruktúr - + Rollback structure changes table window Vrátiť späť zmeny štruktúr - + Add column table window Pridať stĺpec - + Edit column table window Upraviť stĺpec - - + + Delete column table window Vymazať stĺpec - + Move column up table window Posunúť stĺpec hore - + Move column down table window Posunúť stĺpec dole - + Create similar table table window Vytvoriť rovnakú tabuľku - + Reset autoincrement value table window Resetovať hodnotu autoinkrementu - + Add table constraint table window Pridať obmedzenie - + Edit table constraint table window Upraviť obmedzenie - + Delete table constraint table window Vymazať obmedzenie - + Move table constraint up table window Posunúť obmedzenie hore - + Move table constraint down table window Posunúť obmedzenie dole - + Add table primary key table window Pridať primárny kľúč - + Add table foreign key table window Pridať cudzí kľúč - + Add table unique constraint table window Pridať jedinečné obmedzenie - + Add table check constraint table window - + Refresh index list table window Obnoviť zoznam indexov - + Create index table window Vytvoriť index - + Edit index table window Upraviť index - + Delete index table window Vymazať index - + Refresh trigger list table window Obnoviť zoznam spúšťačov - + Create trigger table window Vytvoriť spúšťač - + Edit trigger table window Upraviť spúšťač - + Delete trigger table window Vymazať spúšťač - + Are you sure you want to delete column '%1'? table window Ste si istý, že chcete vymazať stĺpec '%1' ? - + Following problems will take place while modifying the table. Would you like to proceed? table window - + Table modification table window - + Could not load data for table %1. Error details: %2 - + Could not process the %1 table correctly. Unable to open a table window. - + Could not restore window %1, because no database or table was stored in session for this window. - + Could not restore window '%1', because no database or table was stored in session for this window. - + Could not restore window '%1', because database %2 could not be resolved. - + Could not restore window '%1'', because the table %2 doesn't exist in the database %3. - + New table %1 - - Commited changes for table '%1' successfly. + + Committed changes for table '%1' successfully. + + + + + Committed changes for table '%1' (named before '%2') successfully. + + + + + Autoincrement value for table '%1' has been reset successfully. - - Commited changes for table '%1' (named before '%2') successfly. + + Uncommitted changes - + + There are uncommitted structure modifications. You cannot browse or edit data until you have table structure settled. +Do you want to commit the structure, or do you want to go back to the structure tab? + + + + + Table window "%1" has uncommitted structure modifications and data. + + + + + Table window "%1" has uncommitted data. + + + + + Table window "%1" has uncommitted structure modifications. + + + + Could not commit table structure. Error message: %1 table window - + Reset autoincrement Resetovať autoinkrement - + Are you sure you want to reset autoincrement value for table '%1'? Ste si istý, že chcete zresetovať hodnotu autoinkrementu pre tabuľku %1 ? - + An error occurred while trying to reset autoincrement value for table '%1': %2 Vyskytla sa chyba pri pokuse o zresetovanie hodnoty autoinkrementu pre tebuľku '%1': %2 - - Autoincrement value for table '%1' has been reset successfly. - - - - + Empty name - + A blank name for the table is allowed in SQLite, but it is not recommended. Are you sure you want to create a table with blank name? - + Cannot create a table without at least one column. - + Cannot create table %1, if it has no primary key defined. Either uncheck the %2, or define a primary key. - + Cannot use autoincrement for primary key when %1 clause is used. Either uncheck the %2, or the autoincrement in a primary key. - + Are you sure you want to delete table constraint '%1'? table window Ste si istý, že chcete vymazať obmedzenie '%1'? - + Delete constraint table window Vymazať obmedzenie - + Cannot export, because no export plugin is loaded. Nemôžem exportovať, lebo nebol načítaný žiaden plugin na export. - + Cannot import, because no import plugin is loaded. Nemôžem importovať, lebo nebol načítaný žiaden plugin na import. - Uncommited changes - Nepotvrdené zmeny + Nepotvrdené zmeny - There are uncommited structure modifications. You cannot browse or edit data until you have table structure settled. Do you want to commit the structure, or do you want to go back to the structure tab? - Sú tu nepotvrdené zmeny štruktúr. Nemôžte prezerať alebo editovať dáta dokiaľ nebude štruktúra tabuľky jasná. + Sú tu nepotvrdené zmeny štruktúr. Nemôžte prezerať alebo editovať dáta dokiaľ nebude štruktúra tabuľky jasná. Chcete potvrdiť štruktúru alebo sa chcete vrátiť do záložky štruktúr? - + Go back to structure tab Choď späť na záložku štruktúr - + Commit modifications and browse data. Potvrdiť zmeny a prezerať dáta. - + Name table window indexes Názov - + Unique table window indexes Jedinečný - + Columns table window indexes Stĺpce - + Partial index condition table window indexes - + Name table window triggers Názov - + Event table window triggers Udalosť - + Condition table window triggers Podmienka - + Details table window triggers Detaily - Table window "%1" has uncommited structure modifications and data. - V okne tabuľky %1 sú nepotvrdené zmeny štruktúry a dáta. + V okne tabuľky %1 sú nepotvrdené zmeny štruktúry a dáta. - Table window "%1" has uncommited data. - V okne tabuľky %1 sú nepotvrdené dáta. + V okne tabuľky %1 sú nepotvrdené dáta. - Table window "%1" has uncommited structure modifications. - V okne tabuľky %1 sú nepotvrdené zmeny štruktúry. + V okne tabuľky %1 sú nepotvrdené zmeny štruktúry. @@ -6135,6 +6246,16 @@ Chcete potvrdiť štruktúru alebo sa chcete vrátiť do záložky štruktúr?Triggering columns: + + + Select all + Vybrať všetko + + + + Deselect all + Zrušiť výber + TriggerDialog @@ -6226,13 +6347,13 @@ Chcete potvrdiť štruktúru alebo sa chcete vrátiť do záložky štruktúr?Zadajte validný kód spúšťača. - + Error trigger dialog Chyba - + An error occurred while executing SQL statements: %1 @@ -6280,7 +6401,7 @@ Chcete potvrdiť štruktúru alebo sa chcete vrátiť do záložky štruktúr? - + Data Dáta @@ -6322,226 +6443,247 @@ Chcete potvrdiť štruktúru alebo sa chcete vrátiť do záložky štruktúr?Nový pohľad %1 - + Refresh the view view window Obnoviť pohľad - + Commit the view changes view window Potvrdiť zmeny v pohľade - + Rollback the view changes view window Vrátiť späť zmeny v pohľade - + Explicit column names - + Generate output column names automatically basing on result columns of the view. - + Add column view window Pridať stĺpec - + Edit column view window Upraviť stĺpec - + Delete column view window Vymazať stĺpec - + Move column up view window Posunúť stĺpec hore - + Move column down view window Posunúť stĺpec dole - + Refresh trigger list view window Obnoviť zoznam spúšťačov - + Create new trigger view window Vytvoriť nový spúšťač - + Edit selected trigger view window Upraviť vybraný spúšťač - + Delete selected trigger view window Vymazať vybraný spúšťač - + + View window "%1" has uncommitted structure modifications and data. + + + + + View window "%1" has uncommitted data. + + + + + View window "%1" has uncommitted structure modifications. + + + + + Uncommitted changes + + + + + There are uncommitted structure modifications. You cannot browse or edit data until you have the view structure settled. +Do you want to commit the structure, or do you want to go back to the structure tab? + + + + + Committed changes for view '%1' successfully. + + + + + Committed changes for view '%1' (named before '%2') successfully. + + + View window "%1" has uncommited structure modifications and data. - Okno pohľadu "%1" obsahuje nepotrdené zmeny štruktúr a dát. + Okno pohľadu "%1" obsahuje nepotrdené zmeny štruktúr a dát. - View window "%1" has uncommited data. - Okno pohľadu "%1" obsahuje nepotrdené dáta. + Okno pohľadu "%1" obsahuje nepotrdené dáta. - View window "%1" has uncommited structure modifications. - Okno pohľadu "%1" obsahuje nepotrdené zmeny štruktúr. + Okno pohľadu "%1" obsahuje nepotrdené zmeny štruktúr. - + Could not load data for view %1. Error details: %2 Nemôžem načítať dáta z pohľadu %1. Detaily chyby: %2 - Uncommited changes - Nepotvrdené zmeny + Nepotvrdené zmeny - There are uncommited structure modifications. You cannot browse or edit data until you have the view structure settled. Do you want to commit the structure, or do you want to go back to the structure tab? - Sú tu nepotvrdené zmeny štruktúr. Nemôžte prezerať alebo editovať dáta dokiaľ nebude štruktúra tabuľky jasná. + Sú tu nepotvrdené zmeny štruktúr. Nemôžte prezerať alebo editovať dáta dokiaľ nebude štruktúra tabuľky jasná. Chcete potvrdiť štruktúru alebo sa chcete vrátiť do záložky štruktúr? - + Go back to structure tab Choď späť na záložku štruktúr - + Commit modifications and browse data. Potvrdiť zmeny a prezerať dáta. - - Commited changes for view '%1' successfly. - - - - - Commited changes for view '%1' (named before '%2') successfly. - - - - + Could not commit view changes. Error message: %1 view window Nemôžem potvrdiť zmeny v pohľade. Chyba: %1 - + Override columns - + Currently defined columns will be overriden. Do you want to continue? - + Could not determinate columns returned from the view. The query is problably incomplete or contains errors. - + Name view window triggers Názov - + Instead of view window triggers - + Condition view window triggers Podmienka - + Details table window triggers Detaily - + Could not process the %1 view correctly. Unable to open a view window. - + Empty name - + A blank name for the view is allowed in SQLite, but it is not recommended. Are you sure you want to create a view with blank name? - + The SELECT statement could not be parsed. Please correct the query and retry. Details: %1 SELECT nemôže byť analyzovaný. Prosím opravte dotaz a skúste to znovu. Detaily: %1 - + The view could not be modified due to internal SQLiteStudio error. Please report this! - + The view code could not be parsed properly for execution. This is a SQLiteStudio's bug. Please report it. - + Following problems will take place while modifying the view. Would you like to proceed? view window - + View modification view window diff --git a/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_zh_CN.qm b/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_zh_CN.qm index 47beaf2..3201eff 100644 Binary files a/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_zh_CN.qm and b/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_zh_CN.qm differ diff --git a/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_zh_CN.ts b/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_zh_CN.ts index e6a2c1d..53cd968 100644 --- a/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_zh_CN.ts +++ b/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_zh_CN.ts @@ -1,6 +1,6 @@ - + AboutDialog @@ -433,8 +433,12 @@ + Collations editor window has uncommitted modifications. + + + Collations editor window has uncommited modifications. - 排序规则编辑器存在未提交的改动。 + 排序规则编辑器存在未提交的改动。 @@ -907,7 +911,7 @@ but it's okay to use it. ConfigDialog - + Configuration 配置 @@ -997,215 +1001,219 @@ but it's okay to use it. 流量和编辑数据 - + Number of data rows per page: 每页的行数： - - + + <p>When the data is read into grid view columns width is automatically adjusted. This value limits the initial width for the adjustment, but user can still resize the column manually over this limit.</p> <p>在以列表方式显示数据时，列宽度会自动调整。该值控制初始列宽度，之后您可以手动调整列宽度，不受此限制。</p> - + Limit initial data column width to (in pixels): 限制宽度（单位：像素）： - + <p>When this is enabled and user holds mouse pointer over a cell in any data view (query results, a table data, a view data) a tooltip will appear with details about the cell - it includes details like column data type, constraints, ROWID and others.</p> - + Show column and row details tooltip in data view - + + <p>When editing a cell which used to have NULL value and entering empty string as new value, then this option determinates whether the new value should remain NULL (have this option enabled), or should it be overwritten with empty string value (have this option disabled).</p> + + + + Inserting new row in data grid - + Before currently selected row 在已选列之前 - + After currently selected row 在已选列之后 - + At the end of data view 在数据显示区域的末尾 - + <p>When enabled, Table Windows will show up with the data tab, instead of the structure tab.</p> - + <p>When enabled the "Data" tab will be placed as first tab in every Table Window, instead of being at second place.</p> - + Place data tab as first tab in a Table Window - + <p>When enabled, View Windows will show up with the data tab, instead of the structure tab.</p> - + <p>When enabled the "Data" tab will be placed as first tab in every View Window, instead of being at second place.</p> - + Place data tab as first tab in a View Window - + Data types 数据类型 - + Available editors: 可用的编辑器： - + Editors selected for this data type: 已选的该数据类型编辑器： - + Schema editing 架构编辑 - + Number of DDL changes kept in history. 数据库定义（DDL）的更改历史记录数量。 - + DDL history size: 数据库定义（DDL）历史大小： - Don't show DDL preview dialog when commiting schema changes - 当提交schema变动时不显示数据库定义（DDL）预览对话框 + 当提交schema变动时不显示数据库定义（DDL）预览对话框 - + SQL queries SQL查询 - - + + Number of queries kept in the history. 查询历史记录数量。 - + History size: 历史大小： - + <p>If there is more than one query in the SQL editor window, then (if this option is enabled) only a single query will be executed - the one under the keyboard insertion cursor. Otherwise all queries will be executed. You can always limit queries to be executed by selecting those queries before calling to execute.</p> <p>如果SQL编辑器中有多个语句，如果启用该选项，只执行光标下的语句；反之则执行全部语句。另外您可以选择需要执行的语句来执行</p> - + Execute only the query under the cursor 只执行光标下的语句 - + Updates 更新 - + Automatically check for updates at startup 在启动时自己检查更新 - + Session 会话 - + Restore last session (active MDI windows) after startup 启动后恢复上一次会话。 - + Status Field - + <p>When user manually closes the Status panel, this option makes sure that if any new message is printed in the Status panel it will be reopened. If it's disabled, then Status panel can only be open manually by the user from the "View" menu.</p> - + Always open Status panel when new message is printed - + Filter shortcuts by name or key combination - + Action - + Key combination 按键编定 - - + + Language 语言 - + Changing language requires application restart to take effect. 更改语言后，重启程序生效。 - + Compact layout - + <p>Compact layout reduces all margins and spacing on the UI to minimum, making space for displaying more data. It makes the interface a little bit less aesthetic, but allows to display more data at once.</p> - + Use compact layout @@ -1281,242 +1289,262 @@ but it's okay to use it. - + + Keep NULL value when entering empty value + + + + + <html><head/><body><p>Enable this to always enforce DEFAULT value when committing a NULL value for a column that has DEFAULT value defined, even though the column is allowed to contain NULL values.</p><p>Disable this option to use DEFAULT value exclusively when NULL value is committed for column with NOT NULL constraint.</p></body></html> + + + + + Use DEFAULT value (if defined), when committing NULL value + + + + Table windows - + Open Table Windows with the data tab for start - + View windows - + Open View Windows with the data tab for start - + + Don't show DDL preview dialog when committing schema changes + + + + Main window dock areas - + Left and right areas occupy corners - + Top and bottom areas occupy corners - + Hide built-in plugins - + Current style: 当前风格： - + Preview 预览 - + Enabled 已启用 - + Disabled 已禁用 - + Active formatter plugin 启用格式化插件 - + SQL editor font SQL编辑器字体 - + Database list font 数据库字体 - + Database list additional label font 数据库额外标签字体 - + Data view font 数据浏览字体 - + Status field font 状态栏字体 - + SQL editor colors SQL编辑器颜色 - + Current line background 当前行的背景色 - + <p>SQL strings are enclosed with single quote characters.</p> <p>单引号内的SQL字符串</p> - + String foreground 字符串颜色 - + <p>Bind parameters are placeholders for values yet to be provided by the user. They have one of the forms:</p><ul><li>:param_name</li><li>$param_name</li><li>@param_name</li><li>?</li></ul> - + Bind parameter foreground - + Highlighted parenthesis background - + <p>BLOB values are binary values represented as hexadecimal numbers, like:</p><ul><li>X'12B4'</li><li>x'46A2F4'</li></ul> - + BLOB value foreground BLOB值的颜色 - + Regular foreground 背景色 - + Line numbers area background 行号的背景色 - + Keyword foreground 关键字的颜色 - + Number foreground 数字颜色 - + Comment foreground 注释颜色 - + <p>Valid objects are name of tables, indexes, triggers, or views that exist in the SQLite database.</p> - + Valid objects foreground - + Data view colors - - <p>Any data changes will be outlined with this color, until they're commited to the database.</p> + + <p>Any data changes will be outlined with this color, until they're committed to the database.</p> - - Uncommited data outline color + + Uncommitted data outline color - - <p>In case of error while commiting data changes, the problematic cell will be outlined with this color.</p> + + <p>In case of error while committing data changes, the problematic cell will be outlined with this color.</p> - + Commit error outline color - + NULL value foreground NULL值的颜色 - + Deleted row background 已删除行的背景色 - + Database list colors 数据库列表颜色 - + <p>Additional labels are those which tell you SQLite version, number of objects deeper in the tree, etc.</p> - + Additional labels foreground - + Status field colors - + Information message foreground 信息颜色 - + Warning message foreground 警告信息颜色 - + Error message foreground 错误信息颜色 @@ -2007,22 +2035,17 @@ Browsing other pages will be possible after the row counting is done. 数据库驱动 - - Generate automatically - - - - + Options 选项 - + Permanent (keep it in configuration) 记住该数据库 - + Test connection 测试连接 @@ -2041,7 +2064,7 @@ Browsing other pages will be possible after the row counting is done. - + File 文件 @@ -2051,28 +2074,23 @@ Browsing other pages will be possible after the row counting is done. - - Generate name basing on file path - - - - + <p>Enable this if you want the database to be stored in configuration file and restored every time SQLiteStudio is started.</p> aasfd - + Browse for existing database file on local computer 浏览计算上已存在的文件 - + Browse 浏览 - + Enter an unique database name. @@ -2082,29 +2100,32 @@ Browsing other pages will be possible after the row counting is done. - + + <p>Automatic name generation was disabled, becuase the name was edited manually. To restore automatic generation please erase contents of the name field.</p> + + + + Enter a database file path. 输入数据库文件位置。 - + This database is already on the list under name: %1 该数据库已在列表中：%1 - + Select a database type. 选择数据库类型。 - Auto-generated - 自动产生 + 自动产生 - Type the name - 输入名字 + 输入名字 @@ -2391,7 +2412,7 @@ Browsing other pages will be possible after the row counting is done. - + Erase table data 擦除该表的数据 @@ -2412,54 +2433,64 @@ Browsing other pages will be possible after the row counting is done. - - + + Create group 创建分组 - + Group name 分组名 - + Entry with name %1 already exists in group %2. - + Delete group 删除分组 - + Are you sure you want to delete group %1? All objects from this group will be moved to parent group. 确认删除组 %1 吗? 删除后该组下的全部内容将被移动到其所属的父分组中。 - + Are you sure you want to remove database '%1' from the list? - + Are you sure you want to remove following databases from the list: %1 - + Remove database - + Vacuum (%1) + + + Autoincrement value for table '%1' has been reset successfully. + + + + + Are you sure you want to delete all data from table(s): %1? + + Delete database 删除数据库 @@ -2469,14 +2500,14 @@ All objects from this group will be moved to parent group. 您确定要删除数据库“%1”吗? - - + + Cannot import, because no import plugin is loaded. 未能导入，因为没有导入插件被加载。 - - + + Cannot export, because no export plugin is loaded. 未能导出，因为没有导出插件被加载。 @@ -2489,67 +2520,65 @@ All objects from this group will be moved to parent group. VACUUM 命令执行完成。 - + Integrity check (%1) 完整性检查（%1） - + Reset autoincrement 重置autoincrement - + Are you sure you want to reset autoincrement value for table '%1'? 您确定要重设“%1”的autoincrement吗? - + An error occurred while trying to reset autoincrement value for table '%1': %2 在重设表“%1”的autoincrement时出现错误：%2 - Autoincrement value for table '%1' has been reset successfly. - 表“%1”的auincrement重设成功。 + 表“%1”的auincrement重设成功。 - Are you sure you want to delete all data from table '%1'? - 您确定要删除表“%1”中的全部数据吗? + 您确定要删除表“%1”中的全部数据吗? - + An error occurred while trying to delete data from table '%1': %2 删除表“%1”中的数据时出错：%2 - + All data has been deleted for table '%1'. 表“%1”中的数据全部被删除。 - + Following objects will be deleted: %1. 以下内容将被删除：%1。 - + Following databases will be removed from list: %1. 以下数据库将从列表中移除：%1。 - + Remainig objects from deleted group will be moved in place where the group used to be. - + %1<br><br>Are you sure you want to continue? %1<br><br>继续? - + Delete objects 删除对象 @@ -2813,78 +2842,82 @@ Please enter new, unique name, or press '%1' to abort the operation:从query中创建视图 - + Previous database 前一个数据库 - + Next database 下一个数据库 - + Show next tab sql editor 显示下一个标签 - + Show previous tab sql editor 显示上一个标签 - + Focus results below sql editor - + Focus SQL editor above sql editor - + Active database (%1/%2) - + Query finished in %1 second(s). Rows affected: %2 - + Query finished in %1 second(s). - + Clear execution history 清除执行历史 - + Are you sure you want to erase the entire SQL execution history? This cannot be undone. 确定要删除全部的SQL执行历史吗?删除后不能恢复。 - + Cannot export, because no export plugin is loaded. 未能导出，因为没有导出插件被加载。 - + No database selected in the SQL editor. Cannot create a view for unknown database. - + + Editor window "%1" has uncommitted data. + + + Editor window "%1" has uncommited data. - 编辑器“%1”里有未提交的数据库。 + 编辑器“%1”里有未提交的数据库。 @@ -3340,7 +3373,7 @@ Please enter new, unique name, or press '%1' to abort the operation: - Functions editor window has uncommited modifications. + Functions editor window has uncommitted modifications. @@ -3939,9 +3972,13 @@ Please enter new, unique name, or press '%1' to abort the operation: MdiWindow - Uncommited changes - 未提交的更改 + 未提交的更改 + + + + Uncommitted changes + @@ -4872,9 +4909,13 @@ Please enter new, unique name, or press '%1' to abort the operation: QuitConfirmDialog - Uncommited changes - 未提交的更改 + 未提交的更改 + + + + Uncommitted changes + @@ -4971,179 +5012,179 @@ find next SqlEditor - + Cut sql editor 剪切 - + Copy sql editor 复制 - + Paste sql editor 粘贴 - + Delete sql editor 删除 - + Select all sql editor 全选 - + Undo sql editor 撤销 - + Redo sql editor 恢复 - + Complete sql editor 完成 - + Format SQL sql editor 格式化SQL - + Save SQL to file sql editor 保存SQL到文件 - + Select file to save SQL sql editor - + Load SQL from file sql editor 从文件加载SQL - + Delete line sql editor 删除行 - + Move block down sql editor 整块下移 - + Move block up sql editor 整块上移 - + Copy block down sql editor - + Copy up down sql editor - + Find sql editor 查找 - + Find next sql editor 查找下一个 - + Find previous sql editor 查找上一个 - + Replace sql editor 替换 - + Toggle comment sql editor - + Saved SQL contents to file: %1 - + Syntax completion can be used only when a valid database is set for the SQL editor. - + Contents of the SQL editor are huge, so errors detecting and existing objects highlighting are temporarily disabled. - + Save to file 保存到文件 - + Could not open file '%1' for writing: %2 - + SQL scripts (*.sql);;All files (*) SQL文件 (*.sql);;所有文件 (*) - + Open file 打开文件 - + Could not open file '%1' for reading: %2 - + Reached the end of document. Hit the find again to restart the search. 已搜索到文档底部。点击查找从头程序开始搜索。 @@ -5175,12 +5216,7 @@ find next 约束： - - This cell is not editable, because: %1 - - - - + Cannot load the data for a cell that refers to the already closed database. @@ -5188,18 +5224,32 @@ find next SqlQueryItemDelegate - - - Cannot edit this cell. Details: %2 + + The row is marked for deletion. - - The row is marked for deletion. + + + + + + Cannot edit this cell. Details: %1 + + + + + + Structure of this table has changed since last data was loaded. Reload the data to proceed. + + + + + Editing a huge contents in an inline cell editor is not a good idea. It can become slow and inconvenient. It's better to edit such big contents in a Form View, or in popup editor (available under rick-click menu). - + Foreign key for column %2 has more than %1 possible values. It's too much to display in drop down list. You need to edit value manually. @@ -5207,69 +5257,69 @@ find next SqlQueryModel - - + + Only one query can be executed simultaneously. - - Uncommited data + + Cannot commit the data for a cell that refers to the already closed database. - - There are uncommited data changes. Do you want to proceed anyway? All uncommited changes will be lost. + + Could not begin transaction on the database. Details: %1 - - Cannot commit the data for a cell that refers to the already closed database. + + An error occurred while rolling back the transaction: %1 - - Could not begin transaction on the database. Details: %1 + + Tried to commit a cell which is not editable (yet modified and waiting for commit)! This is a bug. Please report it. - - An error occurred while commiting the transaction: %1 + + Uncommitted data - - An error occurred while rolling back the transaction: %1 + + There are uncommitted data changes. Do you want to proceed anyway? All uncommitted changes will be lost. - - Tried to commit a cell which is not editable (yet modified and waiting for commit)! This is a bug. Please report it. + + An error occurred while committing the transaction: %1 - - An error occurred while commiting the data: %1 + + An error occurred while committing the data: %1 - - + + Error while executing SQL query on database '%1': %2 - + Error while loading query results: %1 - + Insert multiple rows 插入多行 - + Number of rows to insert: @@ -5277,117 +5327,117 @@ find next SqlQueryView - + Go to referenced row in... - + Copy 复制 - + Copy as... 复制为... - + Paste 粘贴 - + Paste as... 粘贴为... - + Set NULL values 设置为NULL - + Erase values 擦除 - + Edit value in editor - + Commit 提交 - + Rollback 回滚 - + Commit selected cells - + Rollback selected cells - + Define columns to sort by - + Remove custom sorting - + Insert row 插入行 - + Insert multiple rows 插入多行 - + Delete selected row 删除已选行 - + Generate query for selected cells - + No items selected to paste clipboard contents to. - + Go to referenced row in table '%1' - + table '%1' - + Referenced row (%1) - + Edit value 编辑值 @@ -5395,12 +5445,16 @@ find next SqlTableModel - Error while commiting new row: %1 - 写入新行时发生了错误：%1 + 写入新行时发生了错误：%1 - + + Error while committing new row: %1 + + + + Error while deleting row from table %1: %2 删除行时发生了错误 %1：%2 @@ -5663,7 +5717,7 @@ NULL - + Data 数据 @@ -5688,409 +5742,417 @@ NULL DDL - + Export table table window - + Import data to table table window - + Populate table table window 填充表 - + Refresh structure table window - + Commit structure changes table window - + Rollback structure changes table window - + Add column table window - + Edit column table window - - + + Delete column table window - + Move column up table window - + Move column down table window - + Create similar table table window 创建一个相似的表 - + Reset autoincrement value table window - + Add table constraint table window - + Edit table constraint table window - + Delete table constraint table window - + Move table constraint up table window - + Move table constraint down table window - + Add table primary key table window - + Add table foreign key table window - + Add table unique constraint table window - + Add table check constraint table window - + Refresh index list table window - + Create index table window - + Edit index table window - + Delete index table window 删除索引 - + Refresh trigger list table window - + Create trigger table window - + Edit trigger table window - + Delete trigger table window 删除触发器 - + Are you sure you want to delete column '%1'? table window - + Following problems will take place while modifying the table. Would you like to proceed? table window - + Table modification table window - + Could not load data for table %1. Error details: %2 - + Could not process the %1 table correctly. Unable to open a table window. - + Could not restore window %1, because no database or table was stored in session for this window. - + Could not restore window '%1', because no database or table was stored in session for this window. - + Could not restore window '%1', because database %2 could not be resolved. - + Could not restore window '%1'', because the table %2 doesn't exist in the database %3. - + New table %1 - - Commited changes for table '%1' successfly. + + Committed changes for table '%1' successfully. - - Commited changes for table '%1' (named before '%2') successfly. + + Committed changes for table '%1' (named before '%2') successfully. - + + Autoincrement value for table '%1' has been reset successfully. + + + + + Uncommitted changes + + + + + There are uncommitted structure modifications. You cannot browse or edit data until you have table structure settled. +Do you want to commit the structure, or do you want to go back to the structure tab? + + + + + Table window "%1" has uncommitted structure modifications and data. + + + + + Table window "%1" has uncommitted data. + + + + + Table window "%1" has uncommitted structure modifications. + + + + Could not commit table structure. Error message: %1 table window - + Reset autoincrement 重置autoincrement - + Are you sure you want to reset autoincrement value for table '%1'? 您确定要重设“%1”的autoincrement吗? - + An error occurred while trying to reset autoincrement value for table '%1': %2 在重设表“%1”的autoincrement时出现错误：%2 - Autoincrement value for table '%1' has been reset successfly. - 表“%1”的auincrement重设成功。 + 表“%1”的auincrement重设成功。 - + Empty name - + A blank name for the table is allowed in SQLite, but it is not recommended. Are you sure you want to create a table with blank name? - + Cannot create a table without at least one column. - + Cannot create table %1, if it has no primary key defined. Either uncheck the %2, or define a primary key. - + Cannot use autoincrement for primary key when %1 clause is used. Either uncheck the %2, or the autoincrement in a primary key. - + Are you sure you want to delete table constraint '%1'? table window - + Delete constraint table window 删除约束 - + Cannot export, because no export plugin is loaded. 未能导出，因为没有导出插件被加载。 - + Cannot import, because no import plugin is loaded. 未能导入，因为没有导入插件被加载。 - Uncommited changes - 未提交的更改 - - - - There are uncommited structure modifications. You cannot browse or edit data until you have table structure settled. -Do you want to commit the structure, or do you want to go back to the structure tab? - + 未提交的更改 - + Go back to structure tab - + Commit modifications and browse data. - + Name table window indexes 名称 - + Unique table window indexes 唯一 - + Columns table window indexes 字段 - + Partial index condition table window indexes - + Name table window triggers 名称 - + Event table window triggers - + Condition table window triggers - + Details table window triggers 详情 - - - Table window "%1" has uncommited structure modifications and data. - - - - - Table window "%1" has uncommited data. - - - - - Table window "%1" has uncommited structure modifications. - - TriggerColumnsDialog @@ -6104,6 +6166,16 @@ Do you want to commit the structure, or do you want to go back to the structure Triggering columns: + + + Select all + 全选 + + + + Deselect all + 全不选 + TriggerDialog @@ -6195,13 +6267,13 @@ Do you want to commit the structure, or do you want to go back to the structure - + Error trigger dialog 错误 - + An error occurred while executing SQL statements: %1 在执行SQL语句“%1”时发生了错误。 @@ -6249,7 +6321,7 @@ Do you want to commit the structure, or do you want to go back to the structure - + Data 数据 @@ -6291,224 +6363,228 @@ Do you want to commit the structure, or do you want to go back to the structure - + Refresh the view view window - + Commit the view changes view window - + Rollback the view changes view window - + Explicit column names - + Generate output column names automatically basing on result columns of the view. - + Add column view window - + Edit column view window - + Delete column view window - + Move column up view window - + Move column down view window - + Refresh trigger list view window - + Create new trigger view window - + Edit selected trigger view window - + Delete selected trigger view window - - - View window "%1" has uncommited structure modifications and data. - - - View window "%1" has uncommited data. + View window "%1" has uncommitted structure modifications and data. - View window "%1" has uncommited structure modifications. + View window "%1" has uncommitted data. - - Could not load data for view %1. Error details: %2 + + View window "%1" has uncommitted structure modifications. - - Uncommited changes - 未提交的更改 + + Uncommitted changes + - - There are uncommited structure modifications. You cannot browse or edit data until you have the view structure settled. + + There are uncommitted structure modifications. You cannot browse or edit data until you have the view structure settled. Do you want to commit the structure, or do you want to go back to the structure tab? - - Go back to structure tab + + Committed changes for view '%1' successfully. - - Commit modifications and browse data. + + Committed changes for view '%1' (named before '%2') successfully. - - Commited changes for view '%1' successfly. + + Could not load data for view %1. Error details: %2 - - Commited changes for view '%1' (named before '%2') successfly. + Uncommited changes + 未提交的更改 + + + + Go back to structure tab + + + + + Commit modifications and browse data. - + Could not commit view changes. Error message: %1 view window - + Override columns - + Currently defined columns will be overriden. Do you want to continue? - + Could not determinate columns returned from the view. The query is problably incomplete or contains errors. - + Name view window triggers 名称 - + Instead of view window triggers - + Condition view window triggers - + Details table window triggers 详情 - + Could not process the %1 view correctly. Unable to open a view window. - + Empty name - + A blank name for the view is allowed in SQLite, but it is not recommended. Are you sure you want to create a view with blank name? - + The SELECT statement could not be parsed. Please correct the query and retry. Details: %1 - + The view could not be modified due to internal SQLiteStudio error. Please report this! - + The view code could not be parsed properly for execution. This is a SQLiteStudio's bug. Please report it. - + Following problems will take place while modifying the view. Would you like to proceed? view window - + View modification view window diff --git a/SQLiteStudio3/guiSQLiteStudio/uiconfig.h b/SQLiteStudio3/guiSQLiteStudio/uiconfig.h index 75ea87d..0f2d17c 100644 --- a/SQLiteStudio3/guiSQLiteStudio/uiconfig.h +++ b/SQLiteStudio3/guiSQLiteStudio/uiconfig.h @@ -44,8 +44,8 @@ CFG_CATEGORIES(Ui, CFG_ENTRY(QColor, SqlEditorBlobFg, Qt::darkCyan) CFG_ENTRY(QColor, SqlEditorCommentFg, Qt::darkGray) CFG_ENTRY(QColor, SqlEditorNumberFg, Qt::darkBlue) - CFG_ENTRY(QColor, DataUncommitedError, Qt::red) - CFG_ENTRY(QColor, DataUncommited, Qt::blue) + CFG_ENTRY(QColor, DataUncommittedError, Qt::red) + CFG_ENTRY(QColor, DataUncommitted, Qt::blue) CFG_ENTRY(QColor, DataNullFg, Qt::gray) CFG_ENTRY(QColor, DataDeletedBg, Qt::gray) CFG_ENTRY(QColor, DbTreeLabelsFg, Qt::blue) @@ -101,6 +101,8 @@ CFG_CATEGORIES(Ui, CFG_ENTRY(bool, CompactLayout, true) CFG_ENTRY(int, InsertRowPlacement, Cfg::BEFORE_CURRENT) CFG_ENTRY(bool, ShowDataViewTooltips, true) + CFG_ENTRY(bool, KeepNullWhenEmptyValue, true) + CFG_ENTRY(bool, UseDefaultValueForNull, false) ) ) diff --git a/SQLiteStudio3/guiSQLiteStudio/uidebug.cpp b/SQLiteStudio3/guiSQLiteStudio/uidebug.cpp index a2ce9f8..6448259 100644 --- a/SQLiteStudio3/guiSQLiteStudio/uidebug.cpp +++ b/SQLiteStudio3/guiSQLiteStudio/uidebug.cpp @@ -40,6 +40,11 @@ void uiMessageHandler(QtMsgType type, const QMessageLogContext &context, const Q case QtFatalMsg: msgHandlerThreadProxy->fatal(fatMsg.arg(time, msg)); abort(); +#if QT_VERSION >= 0x050300 + case QtInfoMsg: + msgHandlerThreadProxy->fatal(fatMsg.arg(time, msg)); + break; +#endif } } diff --git a/SQLiteStudio3/guiSQLiteStudio/windows/bugreporthistorywindow.cpp b/SQLiteStudio3/guiSQLiteStudio/windows/bugreporthistorywindow.cpp index c92f6f4..7632c8f 100644 --- a/SQLiteStudio3/guiSQLiteStudio/windows/bugreporthistorywindow.cpp +++ b/SQLiteStudio3/guiSQLiteStudio/windows/bugreporthistorywindow.cpp @@ -144,12 +144,12 @@ void BugReportHistoryWindow::deleteSelected() CFG->deleteReport(id); } -bool BugReportHistoryWindow::isUncommited() const +bool BugReportHistoryWindow::isUncommitted() const { return false; } -QString BugReportHistoryWindow::getQuitUncommitedConfirmMessage() const +QString BugReportHistoryWindow::getQuitUncommittedConfirmMessage() const { return QString(); } diff --git a/SQLiteStudio3/guiSQLiteStudio/windows/bugreporthistorywindow.h b/SQLiteStudio3/guiSQLiteStudio/windows/bugreporthistorywindow.h index e582a48..42e518a 100644 --- a/SQLiteStudio3/guiSQLiteStudio/windows/bugreporthistorywindow.h +++ b/SQLiteStudio3/guiSQLiteStudio/windows/bugreporthistorywindow.h @@ -33,8 +33,8 @@ class GUI_API_EXPORT BugReportHistoryWindow : public MdiChild ~BugReportHistoryWindow(); bool restoreSessionNextTime(); - bool isUncommited() const; - QString getQuitUncommitedConfirmMessage() const; + bool isUncommitted() const; + QString getQuitUncommittedConfirmMessage() const; protected: QVariant saveSession(); diff --git a/SQLiteStudio3/guiSQLiteStudio/windows/collationseditor.cpp b/SQLiteStudio3/guiSQLiteStudio/windows/collationseditor.cpp index 1d0594d..286924b 100644 --- a/SQLiteStudio3/guiSQLiteStudio/windows/collationseditor.cpp +++ b/SQLiteStudio3/guiSQLiteStudio/windows/collationseditor.cpp @@ -378,12 +378,12 @@ void CollationsEditor::changeFont(const QVariant& font) } -bool CollationsEditor::isUncommited() const +bool CollationsEditor::isUncommitted() const { return model->isModified(); } -QString CollationsEditor::getQuitUncommitedConfirmMessage() const +QString CollationsEditor::getQuitUncommittedConfirmMessage() const { - return tr("Collations editor window has uncommited modifications."); + return tr("Collations editor window has uncommitted modifications."); } diff --git a/SQLiteStudio3/guiSQLiteStudio/windows/collationseditor.h b/SQLiteStudio3/guiSQLiteStudio/windows/collationseditor.h index 62cb281..a75e66b 100644 --- a/SQLiteStudio3/guiSQLiteStudio/windows/collationseditor.h +++ b/SQLiteStudio3/guiSQLiteStudio/windows/collationseditor.h @@ -40,8 +40,8 @@ class GUI_API_EXPORT CollationsEditor : public MdiChild ~CollationsEditor(); bool restoreSessionNextTime(); - bool isUncommited() const; - QString getQuitUncommitedConfirmMessage() const; + bool isUncommitted() const; + QString getQuitUncommittedConfirmMessage() const; protected: QVariant saveSession(); diff --git a/SQLiteStudio3/guiSQLiteStudio/windows/ddlhistorywindow.cpp b/SQLiteStudio3/guiSQLiteStudio/windows/ddlhistorywindow.cpp index 3aeccfb..15b49e5 100644 --- a/SQLiteStudio3/guiSQLiteStudio/windows/ddlhistorywindow.cpp +++ b/SQLiteStudio3/guiSQLiteStudio/windows/ddlhistorywindow.cpp @@ -139,12 +139,12 @@ QToolBar* DdlHistoryWindow::getToolBar(int toolbar) const } -bool DdlHistoryWindow::isUncommited() const +bool DdlHistoryWindow::isUncommitted() const { return false; } -QString DdlHistoryWindow::getQuitUncommitedConfirmMessage() const +QString DdlHistoryWindow::getQuitUncommittedConfirmMessage() const { return QString(); } diff --git a/SQLiteStudio3/guiSQLiteStudio/windows/ddlhistorywindow.h b/SQLiteStudio3/guiSQLiteStudio/windows/ddlhistorywindow.h index 16a07ce..1a04831 100644 --- a/SQLiteStudio3/guiSQLiteStudio/windows/ddlhistorywindow.h +++ b/SQLiteStudio3/guiSQLiteStudio/windows/ddlhistorywindow.h @@ -24,8 +24,8 @@ class GUI_API_EXPORT DdlHistoryWindow : public MdiChild ~DdlHistoryWindow(); bool restoreSessionNextTime(); - bool isUncommited() const; - QString getQuitUncommitedConfirmMessage() const; + bool isUncommitted() const; + QString getQuitUncommittedConfirmMessage() const; protected: void changeEvent(QEvent *e); diff --git a/SQLiteStudio3/guiSQLiteStudio/windows/editorwindow.cpp b/SQLiteStudio3/guiSQLiteStudio/windows/editorwindow.cpp index 30fe07b..56ab6fe 100644 --- a/SQLiteStudio3/guiSQLiteStudio/windows/editorwindow.cpp +++ b/SQLiteStudio3/guiSQLiteStudio/windows/editorwindow.cpp @@ -375,6 +375,9 @@ void EditorWindow::createActions() attachActionInMenu(ui->sqlEdit->getAction(SqlEditor::SAVE_SQL_FILE), ui->sqlEdit->getAction(SqlEditor::SAVE_AS_SQL_FILE), ui->toolBar); ui->toolBar->addAction(ui->sqlEdit->getAction(SqlEditor::OPEN_SQL_FILE)); ui->toolBar->addSeparator(); + ui->toolBar->addAction(ui->sqlEdit->getAction(SqlEditor::FIND)); + ui->toolBar->addAction(ui->sqlEdit->getAction(SqlEditor::REPLACE)); + ui->toolBar->addSeparator(); actionMap[CURRENT_DB] = ui->toolBar->addWidget(dbCombo); ui->toolBar->addSeparator(); ui->toolBar->addAction(staticActions[RESULTS_IN_TAB]); @@ -424,7 +427,7 @@ void EditorWindow::selectCurrentQuery(bool fallBackToPreviousIfNecessary) int pos = cursor.position(); int queryStartPos; QString contents = ui->sqlEdit->toPlainText(); - QString query = getQueryWithPosition(contents, pos, dialect, &queryStartPos); + QString query = getQueryWithPosition(contents, pos, &queryStartPos); TokenList tokens = Lexer::tokenize(query, dialect); tokens.trim(); tokens.trimRight(Token::OPERATOR, ";"); @@ -435,7 +438,7 @@ void EditorWindow::selectCurrentQuery(bool fallBackToPreviousIfNecessary) pos = contents.lastIndexOf(";", pos - 1); if (pos > -1) { - query = getQueryWithPosition(contents, pos, dialect, &queryStartPos); + query = getQueryWithPosition(contents, pos, &queryStartPos); tokens = Lexer::tokenize(query, dialect); tokens.trim(); tokens.trimRight(Token::OPERATOR, ";"); @@ -470,6 +473,7 @@ void EditorWindow::execQuery(bool explain) resultsModel->setDb(getCurrentDb()); resultsModel->setExplainMode(explain); resultsModel->setQuery(sql); + resultsModel->setQueryCountLimitForSmartMode(queryLimitForSmartExecution); ui->dataView->refreshData(); updateState(); @@ -623,7 +627,7 @@ void EditorWindow::exportResults() } QString query = lastSuccessfulQuery.isEmpty() ? getQueryToExecute() : lastSuccessfulQuery; - QStringList queries = splitQueries(query, getCurrentDb()->getDialect(), false); + QStringList queries = splitQueries(query, getCurrentDb()->getDialect(), false, true); if (queries.size() == 0) { qWarning() << "No queries after split in EditorWindow::exportResults()"; @@ -662,12 +666,12 @@ int qHash(EditorWindow::ActionGroup actionGroup) } -bool EditorWindow::isUncommited() const +bool EditorWindow::isUncommitted() const { - return ui->dataView->isUncommited(); + return ui->dataView->isUncommitted(); } -QString EditorWindow::getQuitUncommitedConfirmMessage() const +QString EditorWindow::getQuitUncommittedConfirmMessage() const { - return tr("Editor window \"%1\" has uncommited data.").arg(getMdiWindow()->windowTitle()); + return tr("Editor window \"%1\" has uncommitted data.").arg(getMdiWindow()->windowTitle()); } diff --git a/SQLiteStudio3/guiSQLiteStudio/windows/editorwindow.h b/SQLiteStudio3/guiSQLiteStudio/windows/editorwindow.h index d952b1b..12486a8 100644 --- a/SQLiteStudio3/guiSQLiteStudio/windows/editorwindow.h +++ b/SQLiteStudio3/guiSQLiteStudio/windows/editorwindow.h @@ -93,8 +93,8 @@ class GUI_API_EXPORT EditorWindow : public MdiChild void execute(); QToolBar* getToolBar(int toolbar) const; SqlEditor* getEditor() const; - bool isUncommited() const; - QString getQuitUncommitedConfirmMessage() const; + bool isUncommitted() const; + QString getQuitUncommittedConfirmMessage() const; protected: void changeEvent(QEvent *e); @@ -115,6 +115,8 @@ class GUI_API_EXPORT EditorWindow : public MdiChild void selectCurrentQuery(bool fallBackToPreviousIfNecessary = false); void updateShortcutTips(); + static const int queryLimitForSmartExecution = 100; + static ResultsDisplayMode resultsDisplayMode; static QHash staticActions; static QHash staticActionGroups; diff --git a/SQLiteStudio3/guiSQLiteStudio/windows/functionseditor.cpp b/SQLiteStudio3/guiSQLiteStudio/windows/functionseditor.cpp index 29163e3..1bfd1f7 100644 --- a/SQLiteStudio3/guiSQLiteStudio/windows/functionseditor.cpp +++ b/SQLiteStudio3/guiSQLiteStudio/windows/functionseditor.cpp @@ -621,12 +621,12 @@ QVariant FunctionsEditor::saveSession() } -bool FunctionsEditor::isUncommited() const +bool FunctionsEditor::isUncommitted() const { return model->isModified(); } -QString FunctionsEditor::getQuitUncommitedConfirmMessage() const +QString FunctionsEditor::getQuitUncommittedConfirmMessage() const { - return tr("Functions editor window has uncommited modifications."); + return tr("Functions editor window has uncommitted modifications."); } diff --git a/SQLiteStudio3/guiSQLiteStudio/windows/functionseditor.h b/SQLiteStudio3/guiSQLiteStudio/windows/functionseditor.h index 0fa496e..72455d3 100644 --- a/SQLiteStudio3/guiSQLiteStudio/windows/functionseditor.h +++ b/SQLiteStudio3/guiSQLiteStudio/windows/functionseditor.h @@ -48,8 +48,8 @@ class GUI_API_EXPORT FunctionsEditor : public MdiChild ~FunctionsEditor(); bool restoreSessionNextTime(); - bool isUncommited() const; - QString getQuitUncommitedConfirmMessage() const; + bool isUncommitted() const; + QString getQuitUncommittedConfirmMessage() const; protected: QVariant saveSession(); diff --git a/SQLiteStudio3/guiSQLiteStudio/windows/tablewindow.cpp b/SQLiteStudio3/guiSQLiteStudio/windows/tablewindow.cpp index fd344e8..286aad7 100644 --- a/SQLiteStudio3/guiSQLiteStudio/windows/tablewindow.cpp +++ b/SQLiteStudio3/guiSQLiteStudio/windows/tablewindow.cpp @@ -176,9 +176,10 @@ void TableWindow::init() connect(CFG_UI.General.DataTabAsFirstInTables, SIGNAL(changed(const QVariant&)), this, SLOT(updateTabsOrder())); connect(ui->structureView, SIGNAL(doubleClicked(const QModelIndex&)), this, SLOT(structureViewDoubleClicked(const QModelIndex&))); connect(ui->tableConstraintsView, SIGNAL(doubleClicked(const QModelIndex&)), this, SLOT(constraintsViewDoubleClicked(const QModelIndex&))); + connect(CFG_UI.Fonts.DataView, SIGNAL(changed(QVariant)), this, SLOT(updateFont())); structureExecutor = new ChainExecutor(this); - connect(structureExecutor, SIGNAL(success()), this, SLOT(changesSuccessfullyCommited())); + connect(structureExecutor, SIGNAL(success(SqlQueryPtr)), this, SLOT(changesSuccessfullyCommitted())); connect(structureExecutor, SIGNAL(failure(int,QString)), this, SLOT(changesFailedToCommit(int,QString))); THEME_TUNER->manageCompactLayout({ @@ -191,6 +192,7 @@ void TableWindow::init() ui->ddlTab }); + updateFont(); setupCoverWidget(); updateAfterInit(); } @@ -797,7 +799,7 @@ void TableWindow::commitStructure(bool skipWarning) executeStructureChanges(); } -void TableWindow::changesSuccessfullyCommited() +void TableWindow::changesSuccessfullyCommitted() { modifyingThisTable = false; @@ -820,10 +822,17 @@ void TableWindow::changesSuccessfullyCommited() updateNewTableState(); updateWindowTitle(); + NotifyManager* notifyManager = NotifyManager::getInstance(); if (oldTable.compare(table, Qt::CaseInsensitive) == 0 || oldTable.isEmpty()) - notifyInfo(tr("Commited changes for table '%1' successfly.").arg(table)); + { + notifyInfo(tr("Committed changes for table '%1' successfully.").arg(table)); + } else - notifyInfo(tr("Commited changes for table '%1' (named before '%2') successfly.").arg(table, oldTable)); + { + notifyInfo(tr("Committed changes for table '%1' (named before '%2') successfully.").arg(table, oldTable)); + notifyManager->renamed(db, database, oldTable, table); + } + notifyManager->modified(db, database, table); DBTREE->refreshSchema(db); @@ -835,7 +844,6 @@ void TableWindow::changesSuccessfullyCommited() tableModifier->getModifiedTriggers(), tableModifier->getModifiedViews() }; - NotifyManager* notifyManager = NotifyManager::getInstance(); foreach (const QStringList& objList, modifiedObjects) { foreach (const QString& obj, objList) @@ -886,7 +894,7 @@ void TableWindow::resetAutoincrement() if (res->isError()) notifyError(tr("An error occurred while trying to reset autoincrement value for table '%1': %2").arg(table, res->getErrorText())); else - notifyInfo(tr("Autoincrement value for table '%1' has been reset successfly.").arg(table)); + notifyInfo(tr("Autoincrement value for table '%1' has been reset successfully.").arg(table)); } void TableWindow::addColumn() @@ -1259,8 +1267,8 @@ void TableWindow::tabChanged(int newTab) { if (isModified()) { - int res = QMessageBox::question(this, tr("Uncommited changes"), - tr("There are uncommited structure modifications. You cannot browse or edit data until you have " + int res = QMessageBox::question(this, tr("Uncommitted changes"), + tr("There are uncommitted structure modifications. You cannot browse or edit data until you have " "table structure settled.\n" "Do you want to commit the structure, or do you want to go back to the structure tab?"), tr("Go back to structure tab"), tr("Commit modifications and browse data.")); @@ -1596,23 +1604,23 @@ bool TableWindow::handleInitialFocus() return false; } -bool TableWindow::isUncommited() const +bool TableWindow::isUncommitted() const { - return ui->dataView->isUncommited() || isModified(); + return ui->dataView->isUncommitted() || isModified(); } -QString TableWindow::getQuitUncommitedConfirmMessage() const +QString TableWindow::getQuitUncommittedConfirmMessage() const { QString title = getMdiWindow()->windowTitle(); - if (ui->dataView->isUncommited() && isModified()) - return tr("Table window \"%1\" has uncommited structure modifications and data.").arg(title); - else if (ui->dataView->isUncommited()) - return tr("Table window \"%1\" has uncommited data.").arg(title); + if (ui->dataView->isUncommitted() && isModified()) + return tr("Table window \"%1\" has uncommitted structure modifications and data.").arg(title); + else if (ui->dataView->isUncommitted()) + return tr("Table window \"%1\" has uncommitted data.").arg(title); else if (isModified()) - return tr("Table window \"%1\" has uncommited structure modifications.").arg(title); + return tr("Table window \"%1\" has uncommitted structure modifications.").arg(title); else { - qCritical() << "Unhandled message case in TableWindow::getQuitUncommitedConfirmMessage()."; + qCritical() << "Unhandled message case in TableWindow::getQuitUncommittedConfirmMessage()."; return QString(); } } @@ -1630,3 +1638,18 @@ Db* TableWindow::getAssociatedDb() const { return db; } + +void TableWindow::updateFont() +{ + QFont f = CFG_UI.Fonts.DataView.get(); + QFontMetrics fm(f); + + QTableView* views[] = {ui->structureView, ui->tableConstraintsView, ui->indexList, ui->triggerList}; + for (QTableView* view : views) + { + view->setFont(f); + view->horizontalHeader()->setFont(f); + view->verticalHeader()->setFont(f); + view->verticalHeader()->setDefaultSectionSize(fm.height() + 4); + } +} diff --git a/SQLiteStudio3/guiSQLiteStudio/windows/tablewindow.h b/SQLiteStudio3/guiSQLiteStudio/windows/tablewindow.h index d8738f1..f44af4f 100644 --- a/SQLiteStudio3/guiSQLiteStudio/windows/tablewindow.h +++ b/SQLiteStudio3/guiSQLiteStudio/windows/tablewindow.h @@ -118,8 +118,8 @@ class GUI_API_EXPORT TableWindow : public MdiChild QString getTable() const; Db* getDb() const; bool handleInitialFocus(); - bool isUncommited() const; - QString getQuitUncommitedConfirmMessage() const; + bool isUncommitted() const; + QString getQuitUncommittedConfirmMessage() const; void useCurrentTableAsBaseForNew(); Db* getAssociatedDb() const; @@ -193,7 +193,7 @@ class GUI_API_EXPORT TableWindow : public MdiChild void checkIfTriggerDeleted(const QString& object); void refreshStructure(); void commitStructure(bool skipWarning = false); - void changesSuccessfullyCommited(); + void changesSuccessfullyCommitted(); void changesFailedToCommit(int errorCode, const QString& errorText); void rollbackStructure(); void resetAutoincrement(); @@ -237,6 +237,7 @@ class GUI_API_EXPORT TableWindow : public MdiChild void nextTab(); void prevTab(); void updateTabsOrder(); + void updateFont(); public slots: void updateIndexes(); diff --git a/SQLiteStudio3/guiSQLiteStudio/windows/viewwindow.cpp b/SQLiteStudio3/guiSQLiteStudio/windows/viewwindow.cpp index 07c927c..be805af 100644 --- a/SQLiteStudio3/guiSQLiteStudio/windows/viewwindow.cpp +++ b/SQLiteStudio3/guiSQLiteStudio/windows/viewwindow.cpp @@ -237,9 +237,10 @@ void ViewWindow::init() connect(ui->outputColumnsTable->model(), SIGNAL(rowsMoved(const QModelIndex&, int, int, const QModelIndex&, int)), this, SLOT(updateQueryToolbarStatus())); connect(ui->outputColumnsTable, SIGNAL(itemChanged(QListWidgetItem*)), this, SLOT(updateQueryToolbarStatus())); connect(CFG_UI.General.DataTabAsFirstInViews, SIGNAL(changed(const QVariant&)), this, SLOT(updateTabsOrder())); + connect(CFG_UI.Fonts.DataView, SIGNAL(changed(QVariant)), this, SLOT(updateFont())); structureExecutor = new ChainExecutor(this); - connect(structureExecutor, SIGNAL(success()), this, SLOT(changesSuccessfullyCommited())); + connect(structureExecutor, SIGNAL(success(SqlQueryPtr)), this, SLOT(changesSuccessfullyCommitted())); connect(structureExecutor, SIGNAL(failure(int,QString)), this, SLOT(changesFailedToCommit(int,QString))); setupCoverWidget(); @@ -253,6 +254,7 @@ void ViewWindow::init() updateTabsOrder(); + updateFont(); refreshTriggers(); updateQueryToolbarStatus(); updateTriggersState(); @@ -347,23 +349,23 @@ void ViewWindow::setSelect(const QString &selectSql) ui->queryEdit->setPlainText(selectSql); } -bool ViewWindow::isUncommited() const +bool ViewWindow::isUncommitted() const { - return ui->dataView->isUncommited() || isModified(); + return ui->dataView->isUncommitted() || isModified(); } -QString ViewWindow::getQuitUncommitedConfirmMessage() const +QString ViewWindow::getQuitUncommittedConfirmMessage() const { QString title = getMdiWindow()->windowTitle(); - if (ui->dataView->isUncommited() && isModified()) - return tr("View window \"%1\" has uncommited structure modifications and data.").arg(title); - else if (ui->dataView->isUncommited()) - return tr("View window \"%1\" has uncommited data.").arg(title); + if (ui->dataView->isUncommitted() && isModified()) + return tr("View window \"%1\" has uncommitted structure modifications and data.").arg(title); + else if (ui->dataView->isUncommitted()) + return tr("View window \"%1\" has uncommitted data.").arg(title); else if (isModified()) - return tr("View window \"%1\" has uncommited structure modifications.").arg(title); + return tr("View window \"%1\" has uncommitted structure modifications.").arg(title); else { - qCritical() << "Unhandled message case in ViewWindow::getQuitUncommitedConfirmMessage()."; + qCritical() << "Unhandled message case in ViewWindow::getQuitUncommittedConfirmMessage()."; return QString(); } } @@ -569,8 +571,8 @@ void ViewWindow::tabChanged(int tabIdx) { if (isModified()) { - int res = QMessageBox::question(this, tr("Uncommited changes"), - tr("There are uncommited structure modifications. You cannot browse or edit data until you have " + int res = QMessageBox::question(this, tr("Uncommitted changes"), + tr("There are uncommitted structure modifications. You cannot browse or edit data until you have " "the view structure settled.\n" "Do you want to commit the structure, or do you want to go back to the structure tab?"), tr("Go back to structure tab"), tr("Commit modifications and browse data.")); @@ -604,7 +606,7 @@ void ViewWindow::updateQueryToolbarStatus() actionMap[REFRESH_QUERY]->setEnabled(existingView); } -void ViewWindow::changesSuccessfullyCommited() +void ViewWindow::changesSuccessfullyCommitted() { QStringList sqls = structureExecutor->getQueries(); CFG->addDdlHistory(sqls.join("\n"), db->getName(), db->getPath()); @@ -624,9 +626,9 @@ void ViewWindow::changesSuccessfullyCommited() updateWindowTitle(); if (oldView.compare(view, Qt::CaseInsensitive) == 0) - notifyInfo(tr("Commited changes for view '%1' successfly.").arg(view)); + notifyInfo(tr("Committed changes for view '%1' successfully.").arg(view)); else - notifyInfo(tr("Commited changes for view '%1' (named before '%2') successfly.").arg(view, oldView)); + notifyInfo(tr("Committed changes for view '%1' (named before '%2') successfully.").arg(view, oldView)); DBTREE->refreshSchema(db); } @@ -1044,3 +1046,18 @@ void ViewWindow::executeStructureChanges() structureExecutor->exec(); widgetCover->show(); } + +void ViewWindow::updateFont() +{ + QFont f = CFG_UI.Fonts.DataView.get(); + QFontMetrics fm(f); + + QTableView* views[] = {ui->triggersList}; + for (QTableView* view : views) + { + view->setFont(f); + view->horizontalHeader()->setFont(f); + view->verticalHeader()->setFont(f); + view->verticalHeader()->setDefaultSectionSize(fm.height() + 4); + } +} diff --git a/SQLiteStudio3/guiSQLiteStudio/windows/viewwindow.h b/SQLiteStudio3/guiSQLiteStudio/windows/viewwindow.h index 65c3260..6144ad8 100644 --- a/SQLiteStudio3/guiSQLiteStudio/windows/viewwindow.h +++ b/SQLiteStudio3/guiSQLiteStudio/windows/viewwindow.h @@ -73,8 +73,8 @@ class GUI_API_EXPORT ViewWindow : public MdiChild QString getDatabase() const; QString getView() const; void setSelect(const QString& selectSql); - bool isUncommited() const; - QString getQuitUncommitedConfirmMessage() const; + bool isUncommitted() const; + QString getQuitUncommittedConfirmMessage() const; Db* getAssociatedDb() const; static void staticInit(); @@ -147,7 +147,7 @@ class GUI_API_EXPORT ViewWindow : public MdiChild void executionFailed(const QString& errorMessage); void tabChanged(int tabIdx); void updateQueryToolbarStatus(); - void changesSuccessfullyCommited(); + void changesSuccessfullyCommitted(); void changesFailedToCommit(int errorCode, const QString& errorText); void updateTriggersState(); void nextTab(); @@ -165,6 +165,7 @@ class GUI_API_EXPORT ViewWindow : public MdiChild void updateDbRelatedUiElements(); void updateTabsOrder(); void triggerViewDoubleClicked(const QModelIndex& idx); + void updateFont(); public slots: void refreshTriggers(); diff --git a/SQLiteStudio3/lang.tcl b/SQLiteStudio3/lang.tcl index 4746a8d..d169450 100755 --- a/SQLiteStudio3/lang.tcl +++ b/SQLiteStudio3/lang.tcl @@ -71,7 +71,8 @@ switch -- $op { if {$op == "update"} { exec lupdate $f } else { - exec lrelease $f $::ERR_NULL + #exec lrelease $f $::ERR_NULL + exec lrelease $f } } res if {$op == "release"} { @@ -149,15 +150,18 @@ switch -- $op { } foreach p [list coreSQLiteStudio guiSQLiteStudio sqlitestudio sqlitestudiocli] { + # pro file set fd [open $p/$p.pro r] set data [read $fd] close $fd set ts "translations/${p}_$lang.ts" - if {$op == "add"} { + if {$op == "add" && [string first $ts $data] == -1} { set data [string map [list "TRANSLATIONS += " "TRANSLATIONS += $ts \\\n\t\t"] $data] - } else { + } elseif {$op == "remove" && [string first $ts $data] > -1} { regsub -- "$ts\\s*(\\\\)?\n\\s*" $data "" data + } else { + continue } set fd [open $p/$p.pro w+] @@ -166,19 +170,46 @@ switch -- $op { puts "Updated $p.pro" } + + foreach p [list coreSQLiteStudio guiSQLiteStudio sqlitestudio sqlitestudiocli] { + # qrc file + set fd [open $p/$p.qrc r] + set data [read $fd] + close $fd + + set qm "translations/${p}_$lang.qm" + if {$op == "add" && [string first $qm $data] == -1} { + set data [string map [list "" "\n $qm"] $data] + } elseif {$op == "remove" && [string first $qm $data] > -1} { + regsub -- "\\s*$qm\\s*\n" $data "" data + } else { + continue + } + + set fd [open $p/$p.qrc w+] + puts $fd $data + close $fd + + puts "Updated $p.qrc" + } foreach d [glob -directory ../Plugins -tails -nocomplain *] { if {![file isdirectory ../Plugins/$d]} continue + # pro file set fd [open ../Plugins/$d/$d.pro r] set data [read $fd] close $fd - + + if {[string first "TRANSLATIONS +=" $data] == -1} continue + set ts "${d}_$lang.ts" - if {$op == "add"} { + if {$op == "add" && [string first $ts $data] == -1} { set data [string map [list "TRANSLATIONS += " "TRANSLATIONS += $ts \\\n\t\t"] $data] - } else { + } elseif {$op == "remove" && [string first $ts $data] > -1} { regsub -- "$ts\\s*(\\\\)?\n\\s*" $data "" data + } else { + continue } set fd [open ../Plugins/$d/$d.pro w+] @@ -187,6 +218,41 @@ switch -- $op { puts "Updated $d.pro" } + + foreach d [glob -directory ../Plugins -tails -nocomplain *] { + # qrc file + if {![file isdirectory ../Plugins/$d]} continue + if {[file exists ../Plugins/$d/$d.qrc]} { + set fname ../Plugins/$d/$d.qrc + set fnameOnly $d.qrc + } elseif {[file exists ../Plugins/$d/[string tolower $d].qrc]} { + set fname ../Plugins/$d/[string tolower $d].qrc + set fnameOnly [string tolower $d].qrc + } else { + continue + } + + set fd [open $fname r] + set data [read $fd] + close $fd + + if {[string first "" $data] == -1} continue + + set qm "${d}_$lang.qm" + if {$op == "add" && [string first $qm $data] == -1} { + set data [string map [list "" "\n $qm"] $data] + } elseif {$op == "remove" && [string first $qm $data] > -1} { + regsub -- "\\s*$qm\\s*\n" $data "" data + } else { + continue + } + + set fd [open $fname w+] + puts $fd $data + close $fd + + puts "Updated $fnameOnly" + } } default { usage diff --git a/SQLiteStudio3/sqlitestudio/main.cpp b/SQLiteStudio3/sqlitestudio/main.cpp index 94ee80e..829d657 100644 --- a/SQLiteStudio3/sqlitestudio/main.cpp +++ b/SQLiteStudio3/sqlitestudio/main.cpp @@ -53,6 +53,7 @@ QString uiHandleCmdLineArgs() QCommandLineOption sqlDebugDbNameOption("debug-sql-db", QObject::tr("Limits SQL query messages to only the given ."), QObject::tr("database")); QCommandLineOption executorDebugOption("debug-query-executor", QObject::tr("Enables debugging of SQLiteStudio's query executor.")); QCommandLineOption listPluginsOption("list-plugins", QObject::tr("Lists plugins installed in the SQLiteStudio and quits.")); + QCommandLineOption masterConfigOption("master-config", QObject::tr("Points to the master configuration file. Read manual at wiki page for more details."), QObject::tr("SQLiteStudio settings file")); parser.addOption(debugOption); parser.addOption(debugStdOutOption); parser.addOption(debugFileOption); @@ -60,6 +61,7 @@ QString uiHandleCmdLineArgs() parser.addOption(sqlDebugOption); parser.addOption(sqlDebugDbNameOption); parser.addOption(executorDebugOption); + parser.addOption(masterConfigOption); parser.addOption(listPluginsOption); parser.addPositionalArgument(QObject::tr("file"), QObject::tr("Database file to open")); @@ -77,6 +79,9 @@ QString uiHandleCmdLineArgs() if (parser.isSet(listPluginsOption)) listPlugins = true; + if (parser.isSet(masterConfigOption)) + Config::setMasterConfigFile(parser.value(masterConfigOption)); + QStringList args = parser.positionalArguments(); if (args.size() > 0) return args[0]; diff --git a/SQLiteStudio3/sqlitestudio/sqlitestudio.pro b/SQLiteStudio3/sqlitestudio/sqlitestudio.pro index d8384d8..42aa7dc 100644 --- a/SQLiteStudio3/sqlitestudio/sqlitestudio.pro +++ b/SQLiteStudio3/sqlitestudio/sqlitestudio.pro @@ -33,10 +33,10 @@ LIBS += -lcoreSQLiteStudio -lguiSQLiteStudio SOURCES += main.cpp -TRANSLATIONS += translations/sqlitestudio_it.ts \ +TRANSLATIONS += translations/sqlitestudio_de.ts \ + translations/sqlitestudio_it.ts \ translations/sqlitestudio_zh_CN.ts \ translations/sqlitestudio_sk.ts \ - translations/sqlitestudio_de.ts \ translations/sqlitestudio_ru.ts \ translations/sqlitestudio_pt_BR.ts \ translations/sqlitestudio_fr.ts \ @@ -74,3 +74,5 @@ RESOURCES += \ + + diff --git a/SQLiteStudio3/sqlitestudio/sqlitestudio.qrc b/SQLiteStudio3/sqlitestudio/sqlitestudio.qrc index 1abc1e0..9942536 100644 --- a/SQLiteStudio3/sqlitestudio/sqlitestudio.qrc +++ b/SQLiteStudio3/sqlitestudio/sqlitestudio.qrc @@ -1,5 +1,6 @@ + translations/sqlitestudio_de.qm translations/sqlitestudio_pl.qm translations/sqlitestudio_ru.qm translations/sqlitestudio_fr.qm @@ -7,3 +8,6 @@ translations/sqlitestudio_zh_CN.qm + + + diff --git a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_de.ts b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_de.ts index ff1c85b..fb20723 100644 --- a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_de.ts +++ b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_de.ts @@ -1,6 +1,6 @@ - + QObject @@ -61,18 +61,28 @@ Listet die in SQLiteStudio installierten Plugins auf und beendet. - + + Points to the master configuration file. Read manual at wiki page for more details. + + + + + SQLiteStudio settings file + + + + file Datei - + Database file to open Zu öffnende Datenbankdatei - - + + Error Fehler diff --git a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_es.ts b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_es.ts index 0130240..d58025f 100644 --- a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_es.ts +++ b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_es.ts @@ -1,6 +1,6 @@ - + QObject @@ -59,18 +59,28 @@ - + + Points to the master configuration file. Read manual at wiki page for more details. + + + + + SQLiteStudio settings file + + + + file - + Database file to open - - + + Error diff --git a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_fr.qm b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_fr.qm index 0165b48..9d59c25 100644 Binary files a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_fr.qm and b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_fr.qm differ diff --git a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_fr.ts b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_fr.ts index 78be06b..fc7e350 100644 --- a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_fr.ts +++ b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_fr.ts @@ -32,7 +32,7 @@ Enables Lemon parser debug messages for SQL code assistant. - Message de déboguage avec l’analyseur Lemon pour un assistant code SQL. + Message de déboguage avec l’analyseur Lemon pour un assistant code SQL. @@ -51,22 +51,37 @@ + Enables debugging of SQLiteStudio's query executor. + + + + Lists plugins installed in the SQLiteStudio and quits. Listes des plugins installés dans SQLiteStudio et quitter. - + + Points to the master configuration file. Read manual at wiki page for more details. + + + + + SQLiteStudio settings file + + + + file Fichier - + Database file to open Fichier de la base de données à ouvrir - - + + Error Erreur diff --git a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_it.ts b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_it.ts index 9cd5c61..88ce9ce 100644 --- a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_it.ts +++ b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_it.ts @@ -1,6 +1,6 @@ - + QObject @@ -59,18 +59,28 @@ - + + Points to the master configuration file. Read manual at wiki page for more details. + + + + + SQLiteStudio settings file + + + + file - + Database file to open - - + + Error diff --git a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_pl.qm b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_pl.qm index 2da6fe3..df5348b 100644 Binary files a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_pl.qm and b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_pl.qm differ diff --git a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_pl.ts b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_pl.ts index 700bb5e..365a823 100644 --- a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_pl.ts +++ b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_pl.ts @@ -1,6 +1,6 @@ - + QObject @@ -59,5 +59,13 @@ Enables debugging of SQLiteStudio's query executor. Włącza debugowanie wykonawcy zapytań w SQLiteStudio. + + Points to the master configuration file. Read manual at wiki page for more details. + + + + SQLiteStudio settings file + + diff --git a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_pt_BR.ts b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_pt_BR.ts index b637de7..95025b4 100644 --- a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_pt_BR.ts +++ b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_pt_BR.ts @@ -1,6 +1,6 @@ - + QObject @@ -59,18 +59,28 @@ - + + Points to the master configuration file. Read manual at wiki page for more details. + + + + + SQLiteStudio settings file + + + + file - + Database file to open - - + + Error diff --git a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_ru.qm b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_ru.qm index e6a4c31..b5a73d2 100644 Binary files a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_ru.qm and b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_ru.qm differ diff --git a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_ru.ts b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_ru.ts index 9808fe7..65f0cf4 100644 --- a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_ru.ts +++ b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_ru.ts @@ -1,6 +1,6 @@ - + QObject @@ -51,7 +51,7 @@ Enables debugging of SQLiteStudio's query executor. - + Включает отладку обработчика запросов SQLiteStudio. @@ -59,18 +59,28 @@ Выводит список установленных в SQLiteStudio модулей и осуществляет выход. - + + Points to the master configuration file. Read manual at wiki page for more details. + Указывает основной файл конфигурации. Детальная информация содержится в инструкции на wiki-странице. + + + + SQLiteStudio settings file + Файл настроек SQLiteStudio + + + file файл - + Database file to open Файл базы данных для открытия - - + + Error Ошибка diff --git a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_sk.ts b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_sk.ts index 496f44d..6c08225 100644 --- a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_sk.ts +++ b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_sk.ts @@ -1,6 +1,6 @@ - + QObject @@ -59,18 +59,28 @@ - + + Points to the master configuration file. Read manual at wiki page for more details. + + + + + SQLiteStudio settings file + + + + file Súbor - + Database file to open - - + + Error Chyba diff --git a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_zh_CN.ts b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_zh_CN.ts index d5b76d7..0417421 100644 --- a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_zh_CN.ts +++ b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_zh_CN.ts @@ -1,6 +1,6 @@ - + QObject @@ -59,18 +59,28 @@ 列出已安装的插件并退出。 - + + Points to the master configuration file. Read manual at wiki page for more details. + + + + + SQLiteStudio settings file + + + + file 文件 - + Database file to open 要打开的数据库文件 - - + + Error 错误 diff --git a/SQLiteStudio3/sqlitestudiocli/cli.cpp b/SQLiteStudio3/sqlitestudiocli/cli.cpp index 87c4f93..df7e7cd 100644 --- a/SQLiteStudio3/sqlitestudiocli/cli.cpp +++ b/SQLiteStudio3/sqlitestudiocli/cli.cpp @@ -202,7 +202,7 @@ bool CLI::isComplete(const QString& contents) const dialect = getCurrentDb()->getDialect(); bool complete = true; - splitQueries(contents, dialect, true, &complete); + splitQueries(contents, dialect, true, false, &complete); return complete; } diff --git a/SQLiteStudio3/sqlitestudiocli/commands/clicommandsql.cpp b/SQLiteStudio3/sqlitestudiocli/commands/clicommandsql.cpp index 3f2c4b3..7ae78e5 100644 --- a/SQLiteStudio3/sqlitestudiocli/commands/clicommandsql.cpp +++ b/SQLiteStudio3/sqlitestudiocli/commands/clicommandsql.cpp @@ -88,7 +88,6 @@ void CliCommandSql::defineSyntax() void CliCommandSql::printResultsClassic(QueryExecutor* executor, SqlQueryPtr results) { - int metaColumns = executor->getMetaColumnCount(); int resultColumnCount = executor->getResultColumns().size(); // Columns @@ -105,7 +104,7 @@ void CliCommandSql::printResultsClassic(QueryExecutor* executor, SqlQueryPtr res { row = results->next(); i = 0; - values = row->valueList().mid(metaColumns); + values = row->valueList().mid(0, resultColumnCount); foreach (QVariant value, values) { qOut << getValueString(value); @@ -124,7 +123,6 @@ void CliCommandSql::printResultsFixed(QueryExecutor* executor, SqlQueryPtr resul { QList resultColumns = executor->getResultColumns(); int resultColumnsCount = resultColumns.size(); - int metaColumns = executor->getMetaColumnCount(); int termCols = getCliColumns(); int baseColWidth = termCols / resultColumns.size() - 1; @@ -157,7 +155,7 @@ void CliCommandSql::printResultsFixed(QueryExecutor* executor, SqlQueryPtr resul // Data while (results->hasNext()) - printColumnDataRow(widths, results->next(), metaColumns); + printColumnDataRow(widths, results->next(), resultColumnsCount); qOut.flush(); } @@ -181,7 +179,6 @@ void CliCommandSql::printResultsColumns(QueryExecutor* executor, SqlQueryPtr res // Preload data (we will calculate column widths basing on real values) QList allRows = results->getAll(); - int metaColumns = executor->getMetaColumnCount(); // Get widths of each column in every data row, remember the longest ones QList columnWidths; @@ -199,7 +196,7 @@ void CliCommandSql::printResultsColumns(QueryExecutor* executor, SqlQueryPtr res { for (int i = 0; i < resultColumnsCount; i++) { - dataLength = row->value(metaColumns + i).toString().length(); + dataLength = row->value(i).toString().length(); columnWidths[i]->setMinDataWidth(dataLength); } } @@ -232,7 +229,7 @@ void CliCommandSql::printResultsColumns(QueryExecutor* executor, SqlQueryPtr res printColumnHeader(finalWidths, headerNames); foreach (SqlResultsRowPtr row, allRows) - printColumnDataRow(finalWidths, row, metaColumns); + printColumnDataRow(finalWidths, row, resultColumnsCount); qOut.flush(); } @@ -240,7 +237,7 @@ void CliCommandSql::printResultsColumns(QueryExecutor* executor, SqlQueryPtr res void CliCommandSql::printResultsRowByRow(QueryExecutor* executor, SqlQueryPtr results) { // Columns - int metaColumns = executor->getMetaColumnCount(); + int resultColumnCount = executor->getResultColumns().size(); int colWidth = 0; foreach (const QueryExecutor::ResultColumnPtr& resCol, executor->getResultColumns()) { @@ -265,7 +262,7 @@ void CliCommandSql::printResultsRowByRow(QueryExecutor* executor, SqlQueryPtr re i = 0; rowCntString = " " + rowCntTemplate.arg(rowCnt) + " "; qOut << center(rowCntString, termWidth - 1, '-') << "\n"; - foreach (QVariant value, row->valueList().mid(metaColumns)) + foreach (QVariant value, row->valueList().mid(0, resultColumnCount)) { qOut << columns[i] + ": " + getValueString(value) << "\n"; i++; @@ -379,11 +376,11 @@ void CliCommandSql::printColumnHeader(const QList& widths, const QStringLis qOut << line.join("+"); } -void CliCommandSql::printColumnDataRow(const QList& widths, const SqlResultsRowPtr& row, int rowIdOffset) +void CliCommandSql::printColumnDataRow(const QList& widths, const SqlResultsRowPtr& row, int resultColumnCount) { int i = 0; QStringList line; - foreach (const QVariant& value, row->valueList().mid(rowIdOffset)) + foreach (const QVariant& value, row->valueList().mid(0, resultColumnCount)) { line << pad(getValueString(value).left(widths[i]), widths[i], ' '); i++; diff --git a/SQLiteStudio3/sqlitestudiocli/commands/clicommandsql.h b/SQLiteStudio3/sqlitestudiocli/commands/clicommandsql.h index 5423a85..1921063 100644 --- a/SQLiteStudio3/sqlitestudiocli/commands/clicommandsql.h +++ b/SQLiteStudio3/sqlitestudiocli/commands/clicommandsql.h @@ -55,7 +55,7 @@ class CliCommandSql : public CliCommand void printResultsRowByRow(QueryExecutor *executor, SqlQueryPtr results); void shrinkColumns(QList& columnWidths, int termCols, int resultColumnsCount, int totalWidth); void printColumnHeader(const QList& widths, const QStringList& columns); - void printColumnDataRow(const QList& widths, const SqlResultsRowPtr& row, int rowIdOffset); + void printColumnDataRow(const QList& widths, const SqlResultsRowPtr& row, int rowIdCount); QString getValueString(const QVariant& value); diff --git a/SQLiteStudio3/sqlitestudiocli/sqlitestudiocli.pro b/SQLiteStudio3/sqlitestudiocli/sqlitestudiocli.pro index 705a00c..9e402d5 100644 --- a/SQLiteStudio3/sqlitestudiocli/sqlitestudiocli.pro +++ b/SQLiteStudio3/sqlitestudiocli/sqlitestudiocli.pro @@ -27,10 +27,10 @@ linux { } } -TRANSLATIONS += translations/sqlitestudiocli_it.ts \ +TRANSLATIONS += translations/sqlitestudiocli_de.ts \ + translations/sqlitestudiocli_it.ts \ translations/sqlitestudiocli_zh_CN.ts \ translations/sqlitestudiocli_sk.ts \ - translations/sqlitestudiocli_de.ts \ translations/sqlitestudiocli_ru.ts \ translations/sqlitestudiocli_pt_BR.ts \ translations/sqlitestudiocli_fr.ts \ @@ -126,3 +126,5 @@ RESOURCES += \ + + diff --git a/SQLiteStudio3/sqlitestudiocli/sqlitestudiocli.qrc b/SQLiteStudio3/sqlitestudiocli/sqlitestudiocli.qrc index 46f8566..025053f 100644 --- a/SQLiteStudio3/sqlitestudiocli/sqlitestudiocli.qrc +++ b/SQLiteStudio3/sqlitestudiocli/sqlitestudiocli.qrc @@ -1,5 +1,8 @@ + translations/sqlitestudiocli_de.qm + + translations/sqlitestudiocli_pl.qm translations/sqlitestudiocli_ru.qm translations/sqlitestudiocli_fr.qm @@ -7,3 +10,8 @@ translations/sqlitestudiocli_zh_CN.qm + + + + + diff --git a/SQLiteStudio3/sqlitestudiocli/translations/sqlitestudiocli_de.ts b/SQLiteStudio3/sqlitestudiocli/translations/sqlitestudiocli_de.ts index 1eb52bd..c00f2e6 100644 --- a/SQLiteStudio3/sqlitestudiocli/translations/sqlitestudiocli_de.ts +++ b/SQLiteStudio3/sqlitestudiocli/translations/sqlitestudiocli_de.ts @@ -1,6 +1,6 @@ - + CLI @@ -564,18 +564,18 @@ Call %2 to see list of all databases. - - + + Too many columns to display in %1 mode. - + Row %1 - + Query execution error: %1 diff --git a/SQLiteStudio3/sqlitestudiocli/translations/sqlitestudiocli_es.ts b/SQLiteStudio3/sqlitestudiocli/translations/sqlitestudiocli_es.ts index 3ed0731..7c2d175 100644 --- a/SQLiteStudio3/sqlitestudiocli/translations/sqlitestudiocli_es.ts +++ b/SQLiteStudio3/sqlitestudiocli/translations/sqlitestudiocli_es.ts @@ -1,6 +1,6 @@ - + CLI @@ -564,18 +564,18 @@ Call %2 to see list of all databases. - - + + Too many columns to display in %1 mode. - + Row %1 - + Query execution error: %1 diff --git a/SQLiteStudio3/sqlitestudiocli/translations/sqlitestudiocli_fr.qm b/SQLiteStudio3/sqlitestudiocli/translations/sqlitestudiocli_fr.qm index 289a90f..00760ec 100644 Binary files a/SQLiteStudio3/sqlitestudiocli/translations/sqlitestudiocli_fr.qm and b/SQLiteStudio3/sqlitestudiocli/translations/sqlitestudiocli_fr.qm differ diff --git a/SQLiteStudio3/sqlitestudiocli/translations/sqlitestudiocli_fr.ts b/SQLiteStudio3/sqlitestudiocli/translations/sqlitestudiocli_fr.ts index 5a505a0..3e4c3e5 100644 --- a/SQLiteStudio3/sqlitestudiocli/translations/sqlitestudiocli_fr.ts +++ b/SQLiteStudio3/sqlitestudiocli/translations/sqlitestudiocli_fr.ts @@ -6,17 +6,17 @@ Current database: %1 - Base de données actuelle: %1 + Base de données actuelle : %1 No current working database is set. - Aucune base de données en cours n’est activée. + Aucune base de données en cours n’est activée. Type %1 for help - Touche %1 pour l’aide + Touche %1 pour l’aide @@ -26,7 +26,7 @@ Could not add database %1 to list. - Impossible d’ajouter la base de données %1 à la liste. + Impossible d’ajouter la base de données %1 à la liste. @@ -39,7 +39,7 @@ Usage: %1%2 - Uttilisation: %1%2 + Uttilisation : %1%2 @@ -47,12 +47,12 @@ Could not add database %1 to list. - Impossible d’ajouter le base de données %1 à la liste. + Impossible d’ajouter le base de données %1 à la liste. Database added: %1 - Base de données ajoutée: %1 + Base de données ajoutée : %1 @@ -62,7 +62,7 @@ Adds given database pointed by <path> with given <name> to list the databases list. The <name> is just a symbolic name that you can later refer to. Just pick any unique name. For list of databases already on the list use %1 command. - Ajoutez la base de données pointée par <path>nommée <name>à la liste des baszs de données. Le nom<name>est seulement un nom symbilique que vous pourrez y référer. Choississez un nom unique. Pour une base de données figuant dans la liste utilisez la commande %1. + Ajoutez la base de données pointée par <chemin> nommée <nom> à la liste des baszs de données. Le <nom>est seulement un nom symbolique que vous pourrez y référer. Choississez un nom unique. Pour une base de données figuant dans la liste utilisez la commande %1. @@ -82,12 +82,12 @@ Changed directory to: %1 - Renommer le repertoire en: %1 + Renommer le repertoire en : %1 Could not change directory to: %1 - Impossible de renommer le répertoire en: %1 + Impossible de renommer le répertoire en : %1 @@ -97,7 +97,7 @@ Very similar command to 'cd' known from Unix systems and Windows. It requires a <path> argument to be passed, therefore calling %1 will always cause a change of the directory. To learn what's the current working directory use %2 command and to list contents of the current working directory use %3 command. - La commande « cd » est connu du système UNIX et Windows. Elle nécessite le paramètre <chemin> passé avant l’appel %1 qui occasionnera une modification du répertoire. Pour connaitre qu’elle est le répertoire courant utiliser la commande %2 et pour lister le contenu de celui-ci utilisez la commande %3. + La commande « cd » est connu du système UNIX et Windows. Elle nécessite le paramètre <chemin> passé avant l’appel %1 qui occasionnera une modification du répertoire. Pour connaitre qu’elle est le répertoire courant utiliser la commande %2 et pour lister le contenu de celui-ci utilisez la commande %3. @@ -111,7 +111,7 @@ Cannot call %1 when no database is set to be current. Specify current database with %2 command or pass database name to %3. - Impossible d’appeler %1 lorsqu’aucune base de données n’est active. Spécifiez la base de données active avec la commande %2 ou par le nom de la base de données par %3. + Impossible d’appeler %1 lorsqu’aucune base de données n’est active. Spécifiez la base de données active avec la commande %2 ou par le nom de la base de données par %3. @@ -122,17 +122,17 @@ No such database: %1. Use %2 to see list of known databases. - Aucune base de données:%1. Utilisez %2 pour avoir la liste des bases de données connues. + Aucune base de données : %1. Utilisez %2 pour avoir la liste des bases de données connues. closes given (or current) database - Fermeture d’une de données sélectionnées (ou actuelle) + Fermeture d’une de données sélectionnées (ou actuelle) Closes database connection. If the database was already closed, nothing happens. If <name> is provided, it should be name of the database to close (as printed by %1 command). The the <name> is not provided, then current working database is closed (see help for %2 for details). - Fermeture de base de données connectée. . Si la base est déjà fermée, aucune action. Si <name> est fourni, c’est celle ainsi qui sera close (as printed by %1 command). Si <name> n’est pas fourni, la base actuelle est close (voir l’aide %2 pour plus de détails). + Fermeture de base de données connectée. . Si la base est déjà fermée, aucune action. Si <name> est fourni, c’est celle ainsi qui sera close (as printed by %1 command). Si <name> n’est pas fourni, la base actuelle est close (voir l’aide %2 pour plus de détails). @@ -146,12 +146,12 @@ No current working database defined. - Aucune base de données actuelle n’est définie. + Aucune base de données actuelle n’est définie. Databases: - Base de données: + Base de données : @@ -195,7 +195,7 @@ Prints list of databases registered in the SQLiteStudio. Each database on the list can be in open or closed state and %1 tells you that. The current working database (aka default database) is also marked on the list with '*' at the start of its name. See help for %2 command to learn about the default database. - Imprimez la liste des bases de données enregistrées sous SQLiteStudio. Chaque base se données de la liste peut être ouverte ou close et %1 vous indique lesquellest.La base de données actuelle est aussi marquée dans la liste par « * » en début de nom. Voir l’aide la commande %2 pour en savoir plus sur la base de données actuelle. + Imprimez la liste des bases de données enregistrées sous SQLiteStudio. Chaque base se données de la liste peut être ouverte ou close et %1 vous indique lesquellest.La base de données actuelle est aussi marquée dans la liste par « * » en début de nom. Voir l’aide la commande %2 pour en savoir plus sur la base de données actuelle. @@ -205,14 +205,14 @@ No working database is set. Call %1 command to set working database. Call %2 to see list of all databases. - Aucune base de données de travail n’est activée. + Aucune base de données de travail n’est activée. Appelez la commande %1 pour activer la base de données active. Appelez %2 pour voir la liste de toutes les bases de données. Database is not open. - La base de données n’est pas ouverte. + La base de données n’est pas ouverte. @@ -277,7 +277,7 @@ Appelez %2 pour voir la liste de toutes les bases de données. This is very similar to 'dir' command known from Windows and 'ls' command from Unix systems. You can pass <pattern> with wildcard characters to filter output. - Ceci est très semblable à la commande « dir » de Windows et à la commande de « ls » de systèmes Unix. + Ceci est très semblable à la commande « dir » de Windows et à la commande de « ls » de systèmes Unix. You pouvez utiliser les caractères de remplacement <pattern> npour filtrer la sortie. @@ -292,12 +292,12 @@ You pouvez utiliser les caractères de remplacement <pattern> npour filtre quits the application - Quitter l’application + Quitter l’application Quits the application. Settings are stored in configuration file and will be restored on next startup. - Quittez l’apllication. Le paramètrage est stocké dans la configuration et sera restauré au prochain lancement. + Quittez l’apllication. Le paramètrage est stocké dans la configuration et sera restauré au prochain lancement. @@ -305,7 +305,7 @@ You pouvez utiliser les caractères de remplacement <pattern> npour filtre shows this help message - Affichagez l’aide du message + Affichagez l’aide du message @@ -318,9 +318,9 @@ You can always execute any command with exactly single '--help' option Utilisez %1 pour connaitre certaines commandes supportées par la ligne de commande (CLI) de SQLiteStudio. Pour voir les commandes supportées, saississez %2 sana arguments. -En utilisant le nom de <command>, vous ajouter le caractère spécial(« %3 »). +En utilisant le nom de <command>, vous ajouter le caractère spécial(« %3 »). -Vous pouvez exécuter n’importe quelle commande avec l’option « --help » pour voir l’aide pour cette commande. C’est une alternative à : %1 <commande>. +Vous pouvez exécuter n’importe quelle commande avec l’option « --help » pour voir l’aide pour cette commande. C’est une alternative à : %1 <commande>. @@ -331,22 +331,22 @@ Vous pouvez exécuter n’importe quelle commande avec l’option «&nbs No such command: %1 - Aucune telle commande: %1 + Aucune telle commande : %1 Type '%1' for list of available commands. - Saisissez « %1 » pour la liste des commandes valides. + Saisissez « %1 » pour la liste des commandes valides. Usage: %1%2 - Utilisation: %1%2 + Utilisation : %1%2 Aliases: %1 - Pseudomynes: %1 + Pseudomynes : %1 @@ -354,12 +354,12 @@ Vous pouvez exécuter n’importe quelle commande avec l’option «&nbs Current history limit is set to: %1 - L’historique actuel est limité à: %1 + L’historique actuel est limité à : %1 prints history or erases it - Imprimez l’historique ou supprimez le + Imprimez l’historique ou supprimez le @@ -368,7 +368,7 @@ Vous pouvez exécuter n’importe quelle commande avec l’option «&nbs When the -c or --clear option is passed, then the history gets erased. When the -l or --limit option is passed, it sets the new history entries limit. It requires an additional argument saying how many entries do you want the history to be limited to. Use -ql or --querylimit option to see the current limit value. - Lorqu’aucun argument n’est passé,cette commande imprime l’histoirique. Chaque entrée est séparée par une ligne vide, permettant une lecture aisée. + Lorqu’aucun argument n’est passé,cette commande imprime l’histoirique. Chaque entrée est séparée par une ligne vide, permettant une lecture aisée. When the -c or --clear option is passed, then the history gets erased. When the -l or --limit option is passed, it sets the new history entries limit. It requires an additional argument saying how many entries do you want the history to be limited to. @@ -387,7 +387,7 @@ Use -ql or --querylimit option to see the current limit value. Invalid number: %1 - Nombre invalide: %1 + Nombre invalide : %1 @@ -400,17 +400,17 @@ Use -ql or --querylimit option to see the current limit value. Current results printing mode: %1 - Résultats actuels du mode d’ impression: %1 + Résultats actuels du mode d’ impression : %1 Invalid results printing mode: %1 - Résultats invalides du mode d’ impression: %1 + Résultats invalides du mode d’ impression : %1 New results printing mode: %1 - Résultats actuels du mode d’ impression: %1 + Résultats actuels du mode d’ impression : %1 @@ -433,7 +433,7 @@ The COLUMNS mode is similar to FIXED mode, except it tries to be smart and make ATTENTION! The COLUMNS mode reads all the results from the query at once in order to evaluate column widhts, therefore it is dangerous to use this mode when working with huge result sets. Keep in mind that this mode will load entire result set into memory. The ROW mode is recommended if you need to see whole values and you don't expect many rows to be displayed, because this mode displays a line of output per each column, so you'll get 10 lines for single row with 10 columns, then if you have 10 of such rows, you will get 100 lines of output (+1 extra line per each row, to separate rows from each other). - Sans argument, le format de sortie actuel de la requête est utilisé. Avec <mode>c'est un de ces mode qui est utilisé: + Sans argument, le format de sortie actuel de la requête est utilisé. Avec <mode>c'est un de ces mode qui est utilisé : - CLASSIC - columns are separated by a comma, not aligned, - FIXED - columns have equal and fixed width, they always fit into terminal window width, but the data in columns can be cut off, - COLUMNS - like FIXED, but smarter (do not use with huge result sets, see details below), @@ -444,7 +444,7 @@ The CLASSIC mode is recommended if you want to see all the data, but you don&apo The FIXED mode is recommended if you want a readable output and you don't care about long data values. Columns will be aligned, making the output a nice table. The width of columns is calculated from width of the console window and a number of columns. The COLUMNS mode is similar to FIXED mode, except it tries to be smart and make columns with shorter values more thin, while columns with longer values get more space. First to shrink are columns with longest headers (so the header names are to be cut off as first), then columns with the longest values are shrinked, up to the moment when all columns fit into terminal window. -ATTENTION! The COLUMNS mode reads all the results from the query at once in order to evaluate column widhts, therefore it is dangerous to use this mode when working with huge result sets. Keep in mind that this mode will load entire result set into memory. +ATTENTION ! The COLUMNS mode reads all the results from the query at once in order to evaluate column widhts, therefore it is dangerous to use this mode when working with huge result sets. Keep in mind that this mode will load entire result set into memory. The ROW mode is recommended if you need to see whole values and you don't expect many rows to be displayed, because this mode displays a line of output per each column, so you'll get 10 lines for single row with 10 columns, then if you have 10 of such rows, you will get 100 lines of output (+1 extra line per each row, to separate rows from each other). @@ -454,17 +454,17 @@ The ROW mode is recommended if you need to see whole values and you don't e Current NULL representation string: %1 - Représentation actuelle d’une chaine NULL: %1 + Représentation actuelle d’une chaine NULL : %1 tells or changes the NULL representation string - Modifiez la représentation d’une chaine NULL + Modifiez la représentation d’une chaine NULL If no argument was passed, it tells what's the current NULL value representation (that is - what is printed in place of NULL values in query results). If the argument is given, then it's used as a new string to be used for NULL representation. - Si on n’a passé aucun argument, c’est la représentation de valeur NULL actuelle qui est utilisée (ce qui est imprimé à la place de valeurs NULL dans des résultats de requête). Si on donne un argument, il sera utilisé comme une nouvelle chaine représentant NULL. + Si on n’a passé aucun argument, c’est la représentation de valeur NULL actuelle qui est utilisée (ce qui est imprimé à la place de valeurs NULL dans des résultats de requête). Si on donne un argument, il sera utilisé comme une nouvelle chaine représentant NULL. @@ -472,17 +472,17 @@ The ROW mode is recommended if you need to see whole values and you don't e Cannot call %1 when no database is set to be current. Specify current database with %2 command or pass database name to %3. - Impossible d’appeler %1 lorsque aucune base de données n’est sélectionnée. Spécifiez la base de données actuelle avec la commande %2 ou nommez la base de données %3. + Impossible d’appeler %1 lorsque aucune base de données n’est sélectionnée. Spécifiez la base de données actuelle avec la commande %2 ou nommez la base de données %3. Could not add database %1 to list. - Impossible d’ajouter la base de données %1 à la liste. + Impossible d’ajouter la base de données %1 à la liste. File %1 doesn't exist in %2. Cannot open inexisting database with %3 command. To create a new database, use %4 command. - Le fichier %1 n’existe pas dans %2. Impossible d’ouvrir une base de données avec la commande %3. Pour créer une nouvelle base de données utilisez la commande %4. + Le fichier %1 n’existe pas dans %2. Impossible d’ouvrir une base de données avec la commande %3. Pour créer une nouvelle base de données utilisez la commande %4. @@ -497,7 +497,7 @@ The ROW mode is recommended if you need to see whole values and you don't e Opens connection to the database. If no additional argument was passed, then the connection is open to the current default database (see help for %1 for details). However if an argument was passed, it can be either <name> of the registered database to open, or it can be <path> to the database file to open. In the second case, the <path> gets registered on the list with a generated name, but only for the period of current application session. After restarting application such database is not restored on the list. - Ouvre la connexion de la base de données. Si aucun argument n’est passé, alors la connexion est ouverte comme base de données actuelle (voir l’aide %1 pour plus de détails). Cependant si on a passé un argument il peut être le <name> d’une base de données enregistrée, ou cela peut être le <chemin> du fichier de base de données. Dans le deuxième cas, le <chemin> est enregistré dans la liste avec un nom généré mais seulement pendant la période de la session actuelle. Après la reprise de la l’application une telle base de données n’est pas rétablie dans la liste. + Ouvre la connexion de la base de données. Si aucun argument n’est passé, alors la connexion est ouverte comme base de données actuelle (voir l’aide %1 pour plus de détails). Cependant si on a passé un argument il peut être le <name> d’une base de données enregistrée, ou cela peut être le <chemin> du fichier de base de données. Dans le deuxième cas, le <chemin> est enregistré dans la liste avec un nom généré mais seulement pendant la période de la session actuelle. Après la reprise de la l’application une telle base de données n’est pas rétablie dans la liste. @@ -522,7 +522,7 @@ The ROW mode is recommended if you need to see whole values and you don't e This is the same as 'pwd' command on Unix systems and 'cd' command without arguments on Windows. It prints current working directory. You can change the current working directory with %1 command and you can also list contents of the current working directory with %2 command. - C’est la même commande d’un système Unix « pwd » ou « cd » sans arguments de Windows. Ceci imprimele répertoire de travail courant. Vous pouvez changer le répertoire avec le commande %1 et avoir la liste des répertoire de travail avec la commande %2. + C’est la même commande d’un système Unix « pwd » ou « cd » sans arguments de Windows. Ceci imprimele répertoire de travail courant. Vous pouvez changer le répertoire avec le commande %1 et avoir la liste des répertoire de travail avec la commande %2. @@ -530,17 +530,17 @@ The ROW mode is recommended if you need to see whole values and you don't e No such database: %1 - Aucune base de données: %1 + Aucune base de données : %1 Database removed: %1 - Base de données enlevée: %1 + Base de données enlevée : %1 New current database set: - Nouvelle base de données actuelle: + Nouvelle base de données actuelle : @@ -550,7 +550,7 @@ The ROW mode is recommended if you need to see whole values and you don't e Removes <name> database from the list of registered databases. If the database was not on the list (see %1 command), then error message is printed and nothing more happens. - Enlève la base de données <nom> de la liste des bases enregistrées.si la base de données n’est pas dans la liste (voir la commande %1), alors message d’erreur est imprimé sans aucunes autres lignes. + Enlève la base de données <nom> de la liste des bases enregistrées.si la base de données n’est pas dans la liste (voir la commande %1), alors message d’erreur est imprimé sans aucunes autres lignes. @@ -566,14 +566,14 @@ The ROW mode is recommended if you need to see whole values and you don't e No working database is set. Call %1 command to set working database. Call %2 to see list of all databases. - Aucune base de données de travail n’est activée. + Aucune base de données de travail n’est activée. Appelez la commande %1 pour activer la base de données active. Appelez %2 pour voir la liste de toutes les bases de données. Database is not open. - La base de données n’est pas ouverte. + La base de données n’est pas ouverte. @@ -583,7 +583,7 @@ Appelez %2 pour voir la liste de toutes les bases de données. This command is executed every time you enter SQL query in command prompt. It executes the query on the current working database (see help for %1 for details). There's no sense in executing this command explicitly. Instead just type the SQL query in the command prompt, without any command prefixed. - Cette commande est exécutée chaque fois vous saississez une requête SQL au prompt de commande. Il exécute la requête sur la base de données actuelle (voir l’aide %1 pour des détails). Il n’y a aucun sens dans l’exécution de cette commande explicitement. Instead just type the SQL query in the command prompt, without any command prefixed. + Cette commande est exécutée chaque fois vous saississez une requête SQL au prompt de commande. Il exécute la requête sur la base de données actuelle (voir l’aide %1 pour les détails). Il n’y a aucun sens dans l’exécution de cette commande explicitement. Instead just type the SQL query in the command prompt, without any command prefixed. @@ -592,20 +592,20 @@ Appelez %2 pour voir la liste de toutes les bases de données. SQL - - + + Too many columns to display in %1 mode. Trop de colonnes à afficher avec le mode %1. - + Row %1 Ligne %1 - + Query execution error: %1 - Erreur d’exécution de la requête: %1 + Erreur d’exécution de la requête : %1 @@ -613,12 +613,12 @@ Appelez %2 pour voir la liste de toutes les bases de données. No such database: %1. Use %2 to see list of known databases. - Aucune base de données: %1. Utilisez %2pour voir la liste des base de données connues. + Aucune base de données : %1. Utilisez %2pour voir la liste des base de données connues. Cannot call %1 when no database is set to be current. Specify current database with %2 command or pass database name to %3. - Impossible d’appeler %1 quand aucune base de données n’est active. Spécifiez la base de données active avec la commade %2 ou nommez la base de données avec %3. + Impossible d’appeler %1 quand aucune base de données n’est active. Spécifiez la base de données active avec la commade %2 ou nommez la base de données avec %3. @@ -645,8 +645,8 @@ Appelez %2 pour voir la liste de toutes les bases de données. Prints list of tables in given <database> or in the current working database. Note, that the <database> should be the name of the registered database (see %1). The output list includes all tables from any other databases attached to the queried database. When the -s option is given, then system tables are also listed. - Imprime la liste des tables d’une <database> donnée ou la base de données actuelle. Notez que la <database> devrait être le nom enregistré de la base de données (voir %1). L’affichage de la liste inclus toutes les tables d’autres bases de données attachées à celle-ci. -Lorsque l’option « -s » est ajouté, les tables système sont aussi listées. + Imprime la liste des tables de la <base de données> sélectionnée ou de la base de données actuelle. Notez que la <base de données> devrait être le nom enregistré de la base de données (voir %1). L’affichage de la liste inclus toutes les tables d’autres bases de données attachées à celle-ci. +Lorsque l’option « -s » est ajouté, les tables système sont aussi listées. @@ -660,7 +660,7 @@ Lorsque l’option « -s » est ajouté, les tables système sont No current working database is selected. Use %1 to define one and then run %2. - Aucune base de données actuelle n’est sélectionnée. Utilisez %1 pour en définir uneet lancez avec %2. + Aucune base de données actuelle n’est sélectionnée. Utilisez %1 pour en définir uneet lancez avec %2. @@ -699,10 +699,10 @@ Lorsque l’option « -s » est ajouté, les tables système sont When -c option is given, then also columns will be listed under each table. When -s option is given, then also system objects will be printed (sqlite_* tables, autoincrement indexes, etc). The database argument is optional and if provided, then only given database will be printed. This is not a registered database name, but instead it's an internal SQLite database name, like 'main', 'temp', or any attached database name. To print tree for other registered database, call %1 first to switch the working database, and then use %2 command. - Imprime tous les objets (tables, index, déclencheurs et vues) qui sont dans la base de données comme un arbre. L’arbre est très semblable à celui que vous pouvez voir dans lGUI client de SQLiteStudio. -Quand on ajoute l’option-c, alors aussi les colonnes seront inscrites sous chaque table. -Quand on ajoute l’option-s, alors aussi les objets de système seront imprimés (sqlite_* tables, des index d’autoincrément, etc). -L’argument de base de données est facultatif et si fourni, alors seulement la base de données donnée sera imprimée. Ceci n’est pas un nom de base de données enregistré, mais au lieu de cela c’est un nom de base de données SQLite interne, comme « principal », « temporaire », ou n’importe quel nom de base de données attaché. Pour imprimer l’arbre pour d’autre base de données enregistrée, appelez %1 d’abord pour changer la base de données actuelleet utiliser la commande %2. + Imprime tous les objets (tables, index, déclencheurs et vues) qui sont dans la base de données comme un arbre. L’arbre est très semblable à celui que vous pouvez voir dans lGUI client de SQLiteStudio. +Quand on ajoute l’option -c, alors les colonnes seront aussi inscrites sous chaque table. +Quand on ajoute l’option -s, alors les objets de système seront aussi imprimés (sqlite_* tables, des index d’auto-incrément, etc). +L’argument de base de données est facultatif et si fourni, alors seulement la base de données indiquée sera imprimée. Ceci n’est pas un nom de base de données enregistré, mais au lieu de cela c’est un nom de base de données SQLite interne, comme « principal », « temporaire », ou n’importe quel nom de base de données attaché. Pour imprimer l’arbre pour d’autre base de données enregistrée, appelez %1 d’abord pour changer la base de données actuelleet utiliser la commande %2. @@ -716,7 +716,7 @@ L’argument de base de données est facultatif et si fourni, alors seulemen Current database: %1 - Base de données actuelle: %1 + Base de données actuelle : %1 @@ -741,17 +741,17 @@ The default database can be selected in various ways: - by passing registered database name to the application startup parameters, - by restoring previously selected default database from saved configuration, - or when default database was not selected by any of the above, then first database from the registered databases list becomes the default one. - Changet la base de données actuelle <nom>. Si le <nom > de la base de données n’est pas enregistrée dans l’application, le message d’erreur est imprimé et aucun changement n’est fait. + Changet la base de données actuelle <nom>. Si le <nom > de la base de données n’est pas enregistrée dans l’application, le message d’erreur est imprimé et aucun changement n’est fait. -Quel est la base de données actuelle? -Quand vous saississez une requête SQL à exécuter, celle-ci est exécutée sur la base de données par défaut, que l’on connaît aussi comme la base de données actuelle. La plupart de commandes concernant la base de données utilise la base de données de défaut d’utilisation, si on n’a fourni aucune base de données dans leurs arguments. La base de données actuelle est toujours identifiée par la ligne de commande. La base de données par défaut est toujours définie (à moins qu’il n’y ait aucune base de données dans la liste). +Quel est la base de données actuelle ? +Quand vous saississez une requête SQL à exécuter, celle-ci est exécutée sur la base de données par défaut, que l’on connaît aussi comme la base de données actuelle. La plupart de commandes concernant la base de données utilise la base de données de défaut d’utilisation, si on n’a fourni aucune base de données dans leurs arguments. La base de données actuelle est toujours identifiée par la ligne de commande. La base de données par défaut est toujours définie (à moins qu’il n’y ait aucune base de données dans la liste). -La base de données par défaut peut être choisie de diverses manières: -- Utilisation de la commande%1, -- En passant nom de fichier de base de données aux paramètres de démarrage d’application, -- En passantle nom la base de données enregistrée aux paramètres de démarrage d’application, +La base de données par défaut peut être choisie de diverses manières : +- Utilisation de la commande %1, +- En passant nom de fichier de base de données aux paramètres de démarrage d’application, +- En passantle nom la base de données enregistrée aux paramètres de démarrage d’application, - En restaurant la base de données par défaut précédemment choisie dans la configuration sauvée, -- Ou quand la base de données par défaut n’a été choisie par aucun du susdit, l’alors première base de données de la liste de bases de données enregistrée devient le par défaut. +- Ou quand la base de données par défaut n’a été choisie par aucun du susdit, l’alors première base de données de la liste de bases de données enregistrée devient le par défaut. @@ -765,18 +765,18 @@ La base de données par défaut peut être choisie de diverses manières: Insufficient number of arguments. - Nombre d’arguments insuffisant. + Nombre d’arguments insuffisant. Too many arguments. - Trop d’arguements. + Trop d’arguements. Invalid argument value: %1. Expected one of: %2 - Valeur invalide de l’arguement %1. Exepté l’un d’eux: %2 + Valeur invalide de l’arguement %1. Excepté l’un d’eux : %2 @@ -788,13 +788,13 @@ Expected one of: %2 Option %1 requires an argument. CLI command syntax - L’option %1 nécessite un argument. + L’option %1 nécessite un argument. string CLI command syntax - Chaine + Chaîne @@ -804,12 +804,12 @@ Expected one of: %2 Enables debug messages on standard error output. - Messages de débogage valides sur sortie d’erreur standard. + Messages de débogage valides sur sortie d’erreur standard. Enables Lemon parser debug messages for SQL code assistant. - Permet le débogage avec l’analyseur syntaxique de Lemo pour l’assistant SQL. + Permet le débogage avec l’analyseur syntaxique de Lemon pour l’assistant SQL. diff --git a/SQLiteStudio3/sqlitestudiocli/translations/sqlitestudiocli_it.ts b/SQLiteStudio3/sqlitestudiocli/translations/sqlitestudiocli_it.ts index 5ef2bff..ede41bc 100644 --- a/SQLiteStudio3/sqlitestudiocli/translations/sqlitestudiocli_it.ts +++ b/SQLiteStudio3/sqlitestudiocli/translations/sqlitestudiocli_it.ts @@ -1,6 +1,6 @@ - + CLI @@ -564,18 +564,18 @@ Call %2 to see list of all databases. - - + + Too many columns to display in %1 mode. - + Row %1 - + Query execution error: %1 diff --git a/SQLiteStudio3/sqlitestudiocli/translations/sqlitestudiocli_pl.qm b/SQLiteStudio3/sqlitestudiocli/translations/sqlitestudiocli_pl.qm index 6af2684..5334188 100644 Binary files a/SQLiteStudio3/sqlitestudiocli/translations/sqlitestudiocli_pl.qm and b/SQLiteStudio3/sqlitestudiocli/translations/sqlitestudiocli_pl.qm differ diff --git a/SQLiteStudio3/sqlitestudiocli/translations/sqlitestudiocli_pl.ts b/SQLiteStudio3/sqlitestudiocli/translations/sqlitestudiocli_pl.ts index e1dfd31..5b4d6fb 100644 --- a/SQLiteStudio3/sqlitestudiocli/translations/sqlitestudiocli_pl.ts +++ b/SQLiteStudio3/sqlitestudiocli/translations/sqlitestudiocli_pl.ts @@ -1,6 +1,6 @@ - + CLI diff --git a/SQLiteStudio3/sqlitestudiocli/translations/sqlitestudiocli_pt_BR.ts b/SQLiteStudio3/sqlitestudiocli/translations/sqlitestudiocli_pt_BR.ts index f874e9b..490addf 100644 --- a/SQLiteStudio3/sqlitestudiocli/translations/sqlitestudiocli_pt_BR.ts +++ b/SQLiteStudio3/sqlitestudiocli/translations/sqlitestudiocli_pt_BR.ts @@ -1,6 +1,6 @@ - + CLI @@ -564,18 +564,18 @@ Call %2 to see list of all databases. - - + + Too many columns to display in %1 mode. - + Row %1 - + Query execution error: %1 diff --git a/SQLiteStudio3/sqlitestudiocli/translations/sqlitestudiocli_ru.ts b/SQLiteStudio3/sqlitestudiocli/translations/sqlitestudiocli_ru.ts index ef35f51..379b0e0 100644 --- a/SQLiteStudio3/sqlitestudiocli/translations/sqlitestudiocli_ru.ts +++ b/SQLiteStudio3/sqlitestudiocli/translations/sqlitestudiocli_ru.ts @@ -1,6 +1,6 @@ - + CLI @@ -590,18 +590,18 @@ Call %2 to see list of all databases. sql - - + + Too many columns to display in %1 mode. Слишком много столбцов для отображения в режиме %1. - + Row %1 Строка %1 - + Query execution error: %1 Ошибка выполнения запроса: %1 diff --git a/SQLiteStudio3/sqlitestudiocli/translations/sqlitestudiocli_sk.ts b/SQLiteStudio3/sqlitestudiocli/translations/sqlitestudiocli_sk.ts index 8f71f1d..e7e2933 100644 --- a/SQLiteStudio3/sqlitestudiocli/translations/sqlitestudiocli_sk.ts +++ b/SQLiteStudio3/sqlitestudiocli/translations/sqlitestudiocli_sk.ts @@ -1,6 +1,6 @@ - + CLI @@ -564,18 +564,18 @@ Call %2 to see list of all databases. - - + + Too many columns to display in %1 mode. - + Row %1 - + Query execution error: %1 diff --git a/SQLiteStudio3/sqlitestudiocli/translations/sqlitestudiocli_zh_CN.ts b/SQLiteStudio3/sqlitestudiocli/translations/sqlitestudiocli_zh_CN.ts index 072f362..7cf3e27 100644 --- a/SQLiteStudio3/sqlitestudiocli/translations/sqlitestudiocli_zh_CN.ts +++ b/SQLiteStudio3/sqlitestudiocli/translations/sqlitestudiocli_zh_CN.ts @@ -1,6 +1,6 @@ - + CLI @@ -564,18 +564,18 @@ Call %2 to see list of all databases. - - + + Too many columns to display in %1 mode. - + Row %1 - + Query execution error: %1 -- cgit v1.2.3