From 868b0763ac47f765cb48c277897274a595b831d0 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 3 Jun 2020 09:20:59 +0200 Subject: Upcoming loplugin:elidestringvar: dbaccess Change-Id: I5dc074a250ee169812f3ffd0cc4e598972ab87dd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95396 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- dbaccess/qa/extras/hsql_schema_import.cxx | 66 +++++++++++-------------------- dbaccess/qa/extras/macros-test.cxx | 3 +- dbaccess/qa/unit/hsql_binary_import.cxx | 6 +-- dbaccess/qa/unit/tdf119625.cxx | 7 ++-- dbaccess/qa/unit/tdf126268.cxx | 4 +- 5 files changed, 31 insertions(+), 55 deletions(-) (limited to 'dbaccess/qa') diff --git a/dbaccess/qa/extras/hsql_schema_import.cxx b/dbaccess/qa/extras/hsql_schema_import.cxx index 89ee74ce03aa..6d714ae9a8ae 100644 --- a/dbaccess/qa/extras/hsql_schema_import.cxx +++ b/dbaccess/qa/extras/hsql_schema_import.cxx @@ -61,10 +61,8 @@ public: void HsqlSchemaImportTest::testIntegerPrimaryKeyNotNull() { - const OUString sql{ "CREATE CACHED TABLE \"myTable\"(\"id\" INTEGER NOT NULL PRIMARY KEY)" }; - FbCreateStmtParser aCreateParser; - aCreateParser.parse(sql); + aCreateParser.parse("CREATE CACHED TABLE \"myTable\"(\"id\" INTEGER NOT NULL PRIMARY KEY)"); CPPUNIT_ASSERT_EQUAL(OUString{ "\"myTable\"" }, aCreateParser.getTableName()); const auto& columns = aCreateParser.getColumnDef(); @@ -79,13 +77,10 @@ void HsqlSchemaImportTest::testIntegerPrimaryKeyNotNull() void HsqlSchemaImportTest::testVarcharWithParam() { - const OUString sql{ - "CREATE CACHED TABLE \"myTable\"(\"id\" INTEGER NOT NULL PRIMARY KEY, \"myText\" " - "VARCHAR(50))" - }; - FbCreateStmtParser aCreateParser; - aCreateParser.parse(sql); + aCreateParser.parse( + "CREATE CACHED TABLE \"myTable\"(\"id\" INTEGER NOT NULL PRIMARY KEY, \"myText\" " + "VARCHAR(50))"); const auto& columns = aCreateParser.getColumnDef(); CPPUNIT_ASSERT_EQUAL(2_z, columns.size()); @@ -104,13 +99,10 @@ void HsqlSchemaImportTest::testVarcharWithParam() **/ void HsqlSchemaImportTest::testVarcharWithoutParam() { - const OUString sql{ - "CREATE CACHED TABLE \"myTable\"(\"id\" INTEGER NOT NULL PRIMARY KEY, \"myText\" " - "VARCHAR)" - }; - FbCreateStmtParser aCreateParser; - aCreateParser.parse(sql); + aCreateParser.parse( + "CREATE CACHED TABLE \"myTable\"(\"id\" INTEGER NOT NULL PRIMARY KEY, \"myText\" " + "VARCHAR)"); const auto& columns = aCreateParser.getColumnDef(); CPPUNIT_ASSERT_EQUAL(2_z, columns.size()); @@ -122,13 +114,10 @@ void HsqlSchemaImportTest::testVarcharWithoutParam() void HsqlSchemaImportTest::testNumericWithTwoParam() { - const OUString sql{ - "CREATE CACHED TABLE \"myTable\"(\"id\" INTEGER NOT NULL PRIMARY KEY, \"Betrag\" " - "NUMERIC(8,2))" - }; - FbCreateStmtParser aCreateParser; - aCreateParser.parse(sql); + aCreateParser.parse( + "CREATE CACHED TABLE \"myTable\"(\"id\" INTEGER NOT NULL PRIMARY KEY, \"Betrag\" " + "NUMERIC(8,2))"); const auto& columns = aCreateParser.getColumnDef(); CPPUNIT_ASSERT_EQUAL(2_z, columns.size()); @@ -146,13 +135,10 @@ void HsqlSchemaImportTest::testNumericWithTwoParam() void HsqlSchemaImportTest::testIntegerAutoincremental() { - const OUString sql{ - "CREATE CACHED TABLE \"myTable\"(\"id\" INTEGER NOT NULL PRIMARY KEY GENERATED " - "BY DEFAULT AS IDENTITY(START WITH 0), \"myText\" VARCHAR(50))" - }; - FbCreateStmtParser aCreateParser; - aCreateParser.parse(sql); + aCreateParser.parse( + "CREATE CACHED TABLE \"myTable\"(\"id\" INTEGER NOT NULL PRIMARY KEY GENERATED " + "BY DEFAULT AS IDENTITY(START WITH 0), \"myText\" VARCHAR(50))"); const auto& columns = aCreateParser.getColumnDef(); const auto column = columns.at(0); @@ -169,13 +155,10 @@ void HsqlSchemaImportTest::testIntegerAutoincremental() */ void HsqlSchemaImportTest::testTimestampWithParam() { - const OUString sql{ - "CREATE CACHED TABLE \"myTable\"(\"id\" INTEGER NOT NULL PRIMARY KEY, \"myText\" " - "TIMESTAMP(0))" - }; - FbCreateStmtParser aCreateParser; - aCreateParser.parse(sql); + aCreateParser.parse( + "CREATE CACHED TABLE \"myTable\"(\"id\" INTEGER NOT NULL PRIMARY KEY, \"myText\" " + "TIMESTAMP(0))"); const auto& columns = aCreateParser.getColumnDef(); const ColumnDefinition* colTimeStamp = lcl_findByType(columns, css::sdbc::DataType::TIMESTAMP); @@ -194,13 +177,10 @@ void HsqlSchemaImportTest::testTimestampWithParam() */ void HsqlSchemaImportTest::testDefaultValueNow() { - const OUString sql{ - "CREATE CACHED TABLE \"myTable\"(\"id\" INTEGER NOT NULL PRIMARY KEY, \"myDate\" " - "TIMESTAMP DEFAULT NOW)" - }; - FbCreateStmtParser aCreateParser; - aCreateParser.parse(sql); + aCreateParser.parse( + "CREATE CACHED TABLE \"myTable\"(\"id\" INTEGER NOT NULL PRIMARY KEY, \"myDate\" " + "TIMESTAMP DEFAULT NOW)"); const auto& columns = aCreateParser.getColumnDef(); const ColumnDefinition* colTimeStamp = lcl_findByType(columns, css::sdbc::DataType::TIMESTAMP); @@ -213,12 +193,10 @@ void HsqlSchemaImportTest::testDefaultValueNow() void HsqlSchemaImportTest::testEvilNullColumnName() { - const OUString sql{ "CREATE CACHED TABLE \"myTable\"(\"id\" INTEGER NOT NULL PRIMARY KEY, " - "\"myEvilNOT NULLName\" " - "VARCHAR(20))" }; - FbCreateStmtParser aCreateParser; - aCreateParser.parse(sql); + aCreateParser.parse("CREATE CACHED TABLE \"myTable\"(\"id\" INTEGER NOT NULL PRIMARY KEY, " + "\"myEvilNOT NULLName\" " + "VARCHAR(20))"); const auto& columns = aCreateParser.getColumnDef(); CPPUNIT_ASSERT_EQUAL(2_z, columns.size()); diff --git a/dbaccess/qa/extras/macros-test.cxx b/dbaccess/qa/extras/macros-test.cxx index d5b7538f9fc5..dbc6488db051 100644 --- a/dbaccess/qa/extras/macros-test.cxx +++ b/dbaccess/qa/extras/macros-test.cxx @@ -36,9 +36,8 @@ DBAccessTest::DBAccessTest() void DBAccessTest::test() { - const OUString aFileNameBase("testdb.odb"); OUString aFileName; - createFileURL(aFileNameBase, aFileName); + createFileURL("testdb.odb", aFileName); uno::Reference< lang::XComponent > xComponent = loadFromDesktop(aFileName); CPPUNIT_ASSERT(xComponent.is()); xComponent->dispose(); diff --git a/dbaccess/qa/unit/hsql_binary_import.cxx b/dbaccess/qa/unit/hsql_binary_import.cxx index fbf12f929019..1f5ecb310efc 100644 --- a/dbaccess/qa/unit/hsql_binary_import.cxx +++ b/dbaccess/qa/unit/hsql_binary_import.cxx @@ -49,10 +49,10 @@ void HsqlBinaryImportTest::testBinaryImport() // at this point migration is already done uno::Reference statement = xConnection->createStatement(); - OUString sql{ "SELECT \"ID\", \"Power_value\", \"Power_name\", \"Retired\", " - "\"Birth_date\" FROM \"TestTable\" ORDER BY \"ID\"" }; - uno::Reference xRes = statement->executeQuery(sql); + uno::Reference xRes + = statement->executeQuery("SELECT \"ID\", \"Power_value\", \"Power_name\", \"Retired\", " + "\"Birth_date\" FROM \"TestTable\" ORDER BY \"ID\""); uno::Reference xRow(xRes, UNO_QUERY_THROW); // assert first row diff --git a/dbaccess/qa/unit/tdf119625.cxx b/dbaccess/qa/unit/tdf119625.cxx index 8431c5426e90..5486a476f166 100644 --- a/dbaccess/qa/unit/tdf119625.cxx +++ b/dbaccess/qa/unit/tdf119625.cxx @@ -86,11 +86,10 @@ void Tdf119625Test::testTime() // select basically everything from the .odb uno::Reference statement = xConnection->createStatement(); - const OUString sql{ " SELECT id, tst_dt, tst_d, tst_t " - " FROM tst_data " - "ORDER BY id" }; - uno::Reference xRes = statement->executeQuery(sql); + uno::Reference xRes = statement->executeQuery(" SELECT id, tst_dt, tst_d, tst_t " + " FROM tst_data " + "ORDER BY id"); uno::Reference xRow(xRes, UNO_QUERY_THROW); // check result diff --git a/dbaccess/qa/unit/tdf126268.cxx b/dbaccess/qa/unit/tdf126268.cxx index b0719936f588..426edee37f0c 100644 --- a/dbaccess/qa/unit/tdf126268.cxx +++ b/dbaccess/qa/unit/tdf126268.cxx @@ -64,9 +64,9 @@ void Tdf126268Test::testNumbers() // select basically everything from the .odb uno::Reference statement = xConnection->createStatement(); - const OUString sql{ "SELECT ID, Column1, Column2 FROM tableTest ORDER BY ID" }; - uno::Reference xRes = statement->executeQuery(sql); + uno::Reference xRes + = statement->executeQuery("SELECT ID, Column1, Column2 FROM tableTest ORDER BY ID"); uno::Reference xRow(xRes, UNO_QUERY_THROW); // check result -- cgit