New tests for the new standard quoting and for the other quoting styles

Modified some tests for taking into account the new standard quoting and added some more for testing the quoting configuration and for correct parsing of different quoting styles. Default branch in escapeIdentifier() for trying to avoid warning.
2026-01-17 17:29:37 -06:00 · 2018-06-23 17:57:18 +02:00
parent 9e0e3309df
commit 2803e163e0
5 changed files with 121 additions and 27 deletions
--- a/src/Settings.cpp
+++ b/src/Settings.cpp
@@ -296,7 +296,7 @@ QVariant Settings::getDefaultValue(const QString& group, const QString& name)

    // editor/identifier_quotes
    if(group == "editor" && name == "identifier_quotes")
-        return 1; // sqlb::GraveAccents
+        return 0; // sqlb::DoubleQuotes

    // editor/auto_completion?
    if(group == "editor" && name == "auto_completion")
--- a/src/sqlitetypes.cpp
+++ b/src/sqlitetypes.cpp
@@ -11,7 +11,7 @@ namespace sqlb {

 QStringList Field::Datatypes = QStringList() << "INTEGER" << "TEXT" << "BLOB" << "REAL" << "NUMERIC";

-escapeQuoting customQuoting = GraveAccents;
+static escapeQuoting customQuoting = DoubleQuotes;

 void setIdentifierQuoting(escapeQuoting toQuoting)
 {
@@ -21,8 +21,6 @@ void setIdentifierQuoting(escapeQuoting toQuoting)
 QString escapeIdentifier(QString id)
 {
    switch(customQuoting) {
-    case DoubleQuotes:
-        return '"' + id.replace('"', "\"\"") + '"';
    case GraveAccents:
        return '`' + id.replace('`', "``") + '`';
    case SquareBrackets:
@@ -30,6 +28,12 @@ QString escapeIdentifier(QString id)
        // so we rely on the user to not enter these characters when this kind of quoting is
        // selected.
        return '[' + id + ']';
+    case DoubleQuotes:
+    default:
+        // This may produce a 'control reaches end of non-void function' warning if the
+        // default branch is removed, even though we have covered all possibilities in the
+        // switch statement.
+        return '"' + id.replace('"', "\"\"") + '"';
    }
 }

--- a/src/sqltextedit.cpp
+++ b/src/sqltextedit.cpp
@@ -56,8 +56,11 @@ void SqlTextEdit::reloadSettings()
    switch(static_cast<sqlb::escapeQuoting>(Settings::getValue("editor", "identifier_quotes").toInt())) {
    case sqlb::DoubleQuotes:
        setupSyntaxHighlightingFormat(sqlLexer, "identifier", QsciLexerSQL::DoubleQuotedString);
+        sqlLexer->setQuotedIdentifiers(false);
        break;
    case sqlb::GraveAccents:
+        sqlLexer->setQuotedIdentifiers(true);
+        // Fall through, treat quoted string as literal string
    case sqlb::SquareBrackets:
        setupSyntaxHighlightingFormat(sqlLexer, "string", QsciLexerSQL::DoubleQuotedString);
        break;
--- a/src/tests/testsqlobjects.cpp
+++ b/src/tests/testsqlobjects.cpp
@@ -17,12 +17,55 @@ void TestTable::sqlOutput()
    tt.addField(fkm);
    tt.addConstraint({f, fkm}, ConstraintPtr(new PrimaryKeyConstraint()));

+    QCOMPARE(tt.sql(), QString("CREATE TABLE \"testtable\" (\n"
+                               "\t\"id\"\tinteger,\n"
+                               "\t\"car\"\ttext,\n"
+                               "\t\"km\"\tinteger CHECK(km > 1000),\n"
+                               "\tPRIMARY KEY(\"id\",\"km\")\n"
+                               ");"));
+}
+
+void TestTable::sqlGraveAccentOutput()
+{
+    Table tt("testtable");
+    FieldPtr f = FieldPtr(new Field("id", "integer"));
+    FieldPtr fkm = FieldPtr(new Field("km", "integer", false, "", "km > 1000"));
+    tt.addField(f);
+    tt.addField(FieldPtr(new Field("car", "text")));
+    tt.addField(fkm);
+    tt.addConstraint({f, fkm}, ConstraintPtr(new PrimaryKeyConstraint()));
+    sqlb::setIdentifierQuoting(sqlb::GraveAccents);
+
    QCOMPARE(tt.sql(), QString("CREATE TABLE `testtable` (\n"
                               "\t`id`\tinteger,\n"
                               "\t`car`\ttext,\n"
                               "\t`km`\tinteger CHECK(km > 1000),\n"
                               "\tPRIMARY KEY(`id`,`km`)\n"
                               ");"));
+
+    sqlb::setIdentifierQuoting(sqlb::DoubleQuotes);
+}
+
+
+void TestTable::sqlSquareBracketsOutput()
+{
+    Table tt("testtable");
+    FieldPtr f = FieldPtr(new Field("id", "integer"));
+    FieldPtr fkm = FieldPtr(new Field("km", "integer", false, "", "km > 1000"));
+    tt.addField(f);
+    tt.addField(FieldPtr(new Field("car", "text")));
+    tt.addField(fkm);
+    tt.addConstraint({f, fkm}, ConstraintPtr(new PrimaryKeyConstraint()));
+    sqlb::setIdentifierQuoting(sqlb::SquareBrackets);
+
+    QCOMPARE(tt.sql(), QString("CREATE TABLE [testtable] (\n"
+                               "\t[id]\tinteger,\n"
+                               "\t[car]\ttext,\n"
+                               "\t[km]\tinteger CHECK(km > 1000),\n"
+                               "\tPRIMARY KEY([id],[km])\n"
+                               ");"));
+
+    sqlb::setIdentifierQuoting(sqlb::DoubleQuotes);
 }

 void TestTable::autoincrement()
@@ -36,10 +79,10 @@ void TestTable::autoincrement()
    tt.addField(fkm);
    tt.addConstraint({f}, ConstraintPtr(new PrimaryKeyConstraint()));

-    QCOMPARE(tt.sql(), QString("CREATE TABLE `testtable` (\n"
-                               "\t`id`\tinteger PRIMARY KEY AUTOINCREMENT,\n"
-                               "\t`car`\ttext,\n"
-                               "\t`km`\tinteger\n"
+    QCOMPARE(tt.sql(), QString("CREATE TABLE \"testtable\" (\n"
+                               "\t\"id\"\tinteger PRIMARY KEY AUTOINCREMENT,\n"
+                               "\t\"car\"\ttext,\n"
+                               "\t\"km\"\tinteger\n"
                               ");"));
 }

@@ -54,10 +97,10 @@ void TestTable::notnull()
    tt.addField(fkm);
    tt.addConstraint({f}, ConstraintPtr(new PrimaryKeyConstraint()));

-    QCOMPARE(tt.sql(), QString("CREATE TABLE `testtable` (\n"
-                               "\t`id`\tinteger PRIMARY KEY AUTOINCREMENT,\n"
-                               "\t`car`\ttext NOT NULL,\n"
-                               "\t`km`\tinteger\n"
+    QCOMPARE(tt.sql(), QString("CREATE TABLE \"testtable\" (\n"
+                               "\t\"id\"\tinteger PRIMARY KEY AUTOINCREMENT,\n"
+                               "\t\"car\"\ttext NOT NULL,\n"
+                               "\t\"km\"\tinteger\n"
                               ");"));
 }

@@ -71,9 +114,9 @@ void TestTable::withoutRowid()
    tt.setRowidColumn("a");
    tt.addConstraint({f}, ConstraintPtr(new PrimaryKeyConstraint()));

-    QCOMPARE(tt.sql(), QString("CREATE TABLE `testtable` (\n"
-                               "\t`a`\tinteger PRIMARY KEY AUTOINCREMENT,\n"
-                               "\t`b`\tinteger\n"
+    QCOMPARE(tt.sql(), QString("CREATE TABLE \"testtable\" (\n"
+                               "\t\"a\"\tinteger PRIMARY KEY AUTOINCREMENT,\n"
+                               "\t\"b\"\tinteger\n"
                               ") WITHOUT ROWID;"));
 }

@@ -84,9 +127,9 @@ void TestTable::foreignKeys()
    tt.addField(f);
    tt.addConstraint({f}, sqlb::ConstraintPtr(new sqlb::ForeignKeyClause("b", QStringList("c"))));

-    QCOMPARE(tt.sql(), QString("CREATE TABLE `testtable` (\n"
-                               "\t`a`\tinteger,\n"
-                               "\tFOREIGN KEY(`a`) REFERENCES `b`(`c`)\n"
+    QCOMPARE(tt.sql(), QString("CREATE TABLE \"testtable\" (\n"
+                               "\t\"a\"\tinteger,\n"
+                               "\tFOREIGN KEY(\"a\") REFERENCES \"b\"(\"c\")\n"
                               ");"));
 }

@@ -102,11 +145,11 @@ void TestTable::uniqueConstraint()
    tt.addField(f3);
    tt.addConstraint({f2, f3}, sqlb::ConstraintPtr(new sqlb::UniqueConstraint()));

-    QCOMPARE(tt.sql(), QString("CREATE TABLE `testtable` (\n"
-                               "\t`a`\tinteger UNIQUE,\n"
-                               "\t`b`\tinteger,\n"
-                               "\t`c`\tinteger,\n"
-                               "\tUNIQUE(`b`,`c`)\n"
+    QCOMPARE(tt.sql(), QString("CREATE TABLE \"testtable\" (\n"
+                               "\t\"a\"\tinteger UNIQUE,\n"
+                               "\t\"b\"\tinteger,\n"
+                               "\t\"c\"\tinteger,\n"
+                               "\tUNIQUE(\"b\",\"c\")\n"
                               ");"));
 }

@@ -177,7 +220,7 @@ void TestTable::parseSQLMultiPk()
            "\tid1 integer,\n"
            "\tid2 integer,\n"
            "\tnonpkfield blob,\n"
-            "PRIMARY KEY(`id1`,`id2`)\n"
+            "PRIMARY KEY(\"id1\",\"id2\")\n"
            ");";

    Table tab = *(Table::parseSQL(sSQL).dynamicCast<sqlb::Table>());
@@ -215,6 +258,18 @@ void TestTable::parseSQLSingleQuotes()
    QVERIFY(tab.fields().at(1)->name() == "test");
 }

+void TestTable::parseSQLSquareBrackets()
+{
+    QString sSQL = "CREATE TABLE [test]([id],[test]);";
+
+    Table tab = *(Table::parseSQL(sSQL).dynamicCast<sqlb::Table>());
+
+    QVERIFY(tab.name() == "test");
+    QVERIFY(tab.fields().at(0)->name() == "id");
+    QVERIFY(tab.fields().at(1)->name() == "test");
+}
+
+
 void TestTable::parseSQLKeywordInIdentifier()
 {
    QString sSQL = "CREATE TABLE deffered(key integer primary key, if text);";
@@ -226,6 +281,20 @@ void TestTable::parseSQLKeywordInIdentifier()
    QVERIFY(tab.fields().at(1)->name() == "if");
 }

+
+void TestTable::parseSQLSomeKeywordsInIdentifier()
+{
+    QString sSQL = "CREATE TABLE \"Average Number of Volunteers by Area of Work\" ("
+      "`Area of Work`	TEXT,"
+      "`Average Number of Volunteers`	INTEGER);";
+
+    Table tab = *(Table::parseSQL(sSQL).dynamicCast<sqlb::Table>());
+
+    QVERIFY(tab.name() == "Average Number of Volunteers by Area of Work");
+    QVERIFY(tab.fields().at(0)->name() == "Area of Work");
+    QVERIFY(tab.fields().at(1)->name() == "Average Number of Volunteers");
+}
+
 void TestTable::parseSQLWithoutRowid()
 {
    QString sSQL = "CREATE TABLE test(a integer primary key, b integer) WITHOUT ROWID;";
@@ -249,6 +318,19 @@ void TestTable::parseNonASCIIChars()
    QVERIFY(tab.fields().at(0)->name() == "Fieldöäüß");
 }

+void TestTable::parseNonASCIICharsEs()
+{
+    QString sSQL = "CREATE TABLE \"Cigüeñas de Alcalá\" ("
+            "\"Field áéíóúÁÉÍÓÚñÑçÇ\"	INTEGER,"
+            "PRIMARY KEY(\"Field áéíóúÁÉÍÓÚñÑçÇ\")"
+            ");";
+
+    Table tab = *(Table::parseSQL(sSQL).dynamicCast<sqlb::Table>());
+
+    QVERIFY(tab.name() == "Cigüeñas de Alcalá");
+    QVERIFY(tab.fields().at(0)->name() == "Field áéíóúÁÉÍÓÚñÑçÇ");
+}
+
 void TestTable::parseSQLEscapedQuotes()
 {
    QString sSql = "CREATE TABLE double_quotes(a text default 'a''a');";
@@ -272,19 +354,19 @@ void TestTable::parseSQLForeignKeys()
    QCOMPARE(tab.constraint({tab.fields().at(0)}, sqlb::Constraint::ForeignKeyConstraintType).dynamicCast<sqlb::ForeignKeyClause>()->table(), QString("x"));
    QCOMPARE(tab.fields().at(1)->name(), QString("b"));
    QCOMPARE(tab.fields().at(1)->type(), QString("int"));
-    QCOMPARE(tab.constraint({tab.fields().at(1)}, sqlb::Constraint::ForeignKeyConstraintType).dynamicCast<sqlb::ForeignKeyClause>()->toString(), QString("`w`(`y`,`z`) on delete set null"));
+    QCOMPARE(tab.constraint({tab.fields().at(1)}, sqlb::Constraint::ForeignKeyConstraintType).dynamicCast<sqlb::ForeignKeyClause>()->toString(), QString("\"w\"(\"y\",\"z\") on delete set null"));
 }

 void TestTable::parseSQLCheckConstraint()
 {
-    QString sql = "CREATE TABLE a (`b` text CHECK(`b`='A' or `b`='B'));";
+    QString sql = "CREATE TABLE a (\"b\" text CHECK(\"b\"='A' or \"b\"='B'));";

    Table tab = *(Table::parseSQL(sql).dynamicCast<sqlb::Table>());

    QCOMPARE(tab.name(), QString("a"));
    QCOMPARE(tab.fields().at(0)->name(), QString("b"));
    QCOMPARE(tab.fields().at(0)->type(), QString("text"));
-    QCOMPARE(tab.fields().at(0)->check(), QString("`b` = 'A' or `b` = 'B'"));
+    QCOMPARE(tab.fields().at(0)->check(), QString("\"b\" = 'A' or \"b\" = 'B'"));
 }

 void TestTable::parseDefaultValues()
--- a/src/tests/testsqlobjects.h
+++ b/src/tests/testsqlobjects.h
@@ -8,6 +8,8 @@ class TestTable: public QObject
    Q_OBJECT
 private slots:
    void sqlOutput();
+    void sqlGraveAccentOutput();
+    void sqlSquareBracketsOutput();
    void autoincrement();
    void notnull();
    void withoutRowid();
@@ -15,13 +17,16 @@ private slots:
    void uniqueConstraint();

    void parseSQL();
+    void parseSQLSquareBrackets();
    void parseSQLdefaultexpr();
    void parseSQLMultiPk();
    void parseSQLForeignKey();
    void parseSQLSingleQuotes();
    void parseSQLKeywordInIdentifier();
+    void parseSQLSomeKeywordsInIdentifier();
    void parseSQLWithoutRowid();
    void parseNonASCIIChars();
+    void parseNonASCIICharsEs();
    void parseSQLEscapedQuotes();
    void parseSQLForeignKeys();
    void parseSQLCheckConstraint();