[Libreoffice-commits] core.git: connectivity/source dbaccess/qa

[Andreas Heinisch (via logerrit)]

 connectivity/source/drivers/firebird/ResultSetMetaData.cxx |   12 -
 dbaccess/qa/unit/data/tdf132924.odb|binary
 dbaccess/qa/unit/firebird.cxx  |   28 +
 3 files changed, 37 insertions(+), 3 deletions(-)

New commits:
commit 4590048952a9e62124641c512dc2d19122f7fb2d
Author: Andreas Heinisch 
AuthorDate: Wed Mar 23 21:14:46 2022 +0100
Commit: Andreas Heinisch 
CommitDate: Fri Mar 25 13:37:57 2022 +0100

tdf#132924 - Firebird findColumn: return column alias if specified

The function findColumn in a Basic macro should also find aliases for
columns specified in an SQL query using a Firebird database.

Change-Id: I96adb2564da1e18cee58f1c6803526d8ff4deabb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131990
Tested-by: Jenkins
Reviewed-by: Andreas Heinisch 

diff --git a/connectivity/source/drivers/firebird/ResultSetMetaData.cxx 
b/connectivity/source/drivers/firebird/ResultSetMetaData.cxx
index 78d684a725a2..5653d29c4211 100644
--- a/connectivity/source/drivers/firebird/ResultSetMetaData.cxx
+++ b/connectivity/source/drivers/firebird/ResultSetMetaData.cxx
@@ -128,9 +128,15 @@ OUString SAL_CALL 
OResultSetMetaData::getSchemaName(sal_Int32)
 OUString SAL_CALL OResultSetMetaData::getColumnName(sal_Int32 column)
 {
 verifyValidColumn(column);
-OUString sRet(m_pSqlda->sqlvar[column-1].sqlname,
-m_pSqlda->sqlvar[column-1].sqlname_length,
-RTL_TEXTENCODING_UTF8);
+char* pColumnName = m_pSqlda->sqlvar[column - 1].sqlname;
+sal_Int32 nColumnNameLength = m_pSqlda->sqlvar[column - 1].sqlname_length;
+// tdf#132924 - return column alias if specified
+if (m_pSqlda->sqlvar[column - 1].aliasname_length > 0)
+{
+pColumnName = m_pSqlda->sqlvar[column - 1].aliasname;
+nColumnNameLength = m_pSqlda->sqlvar[column - 1].aliasname_length;
+}
+OUString sRet(pColumnName, nColumnNameLength, RTL_TEXTENCODING_UTF8);
 sanitizeIdentifier(sRet);
 return sRet;
 }
diff --git a/dbaccess/qa/unit/data/tdf132924.odb 
b/dbaccess/qa/unit/data/tdf132924.odb
new file mode 100644
index ..8cee7bcbabfd
Binary files /dev/null and b/dbaccess/qa/unit/data/tdf132924.odb differ
diff --git a/dbaccess/qa/unit/firebird.cxx b/dbaccess/qa/unit/firebird.cxx
index e67a4d10c097..7a8143810097 100644
--- a/dbaccess/qa/unit/firebird.cxx
+++ b/dbaccess/qa/unit/firebird.cxx
@@ -27,10 +27,12 @@ class FirebirdTest
 public:
 void testEmptyDBConnection();
 void testIntegerDatabase();
+void testTdf132924();
 
 CPPUNIT_TEST_SUITE(FirebirdTest);
 CPPUNIT_TEST(testEmptyDBConnection);
 CPPUNIT_TEST(testIntegerDatabase);
+CPPUNIT_TEST(testTdf132924);
 CPPUNIT_TEST_SUITE_END();
 };
 
@@ -90,6 +92,32 @@ void FirebirdTest::testIntegerDatabase()
 closeDocument(uno::Reference(xDocument, uno::UNO_QUERY));
 }
 
+void FirebirdTest::testTdf132924()
+{
+uno::Reference xDocument = 
getDocumentForFileName(u"tdf132924.odb");
+uno::Reference xConnection = 
getConnectionForDocument(xDocument);
+
+uno::Reference xStatement = xConnection->createStatement();
+CPPUNIT_ASSERT(xStatement.is());
+
+uno::Reference xResultSet = xStatement->executeQuery("SELECT * 
FROM AliasTest");
+CPPUNIT_ASSERT(xResultSet.is());
+CPPUNIT_ASSERT(xResultSet->next());
+
+uno::Reference xRow(xResultSet, UNO_QUERY);
+CPPUNIT_ASSERT(xRow.is());
+uno::Reference xColumnLocate(xRow, UNO_QUERY);
+CPPUNIT_ASSERT(xColumnLocate.is());
+
+// Without the fix in place, this test would have failed with:
+// - Expected: 1
+// - Actual  : The column name 'TestId' is not valid
+CPPUNIT_ASSERT_EQUAL(sal_Int16(1), 
xRow->getShort(xColumnLocate->findColumn("TestId")));
+CPPUNIT_ASSERT_EQUAL(OUString("TestName"), 
xRow->getString(xColumnLocate->findColumn("TestName")));
+
+closeDocument(uno::Reference(xDocument, uno::UNO_QUERY));
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(FirebirdTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();

[Libreoffice-commits] core.git: connectivity/source dbaccess/qa editeng/qa sax/source sccomp/qa sc/source sd/qa sw/qa tools/qa vcl/qa vcl/source

[Libreoffice Gerrit user]

 connectivity/source/drivers/mysqlc/mysqlc_connection.cxx |6 -
 dbaccess/qa/extras/hsql_schema_import.cxx|   44 +++-
 dbaccess/qa/unit/tdf119625.cxx   |6 -
 editeng/qa/unit/core-test.cxx|3 
 sax/source/tools/fastserializer.cxx  |2 
 sc/source/ui/Accessibility/AccessibleDocument.cxx|9 --
 sc/source/ui/dataprovider/datatransformation.cxx |   27 ++-
 sccomp/qa/unit/SwarmSolverTest.cxx   |   10 +-
 sd/qa/unit/import-tests.cxx  |4 -
 sw/qa/extras/layout/layout.cxx   |7 +
 sw/qa/extras/odfexport/odfexport.cxx |4 -
 sw/qa/extras/uiwriter/uiwriter.cxx   |3 
 tools/qa/cppunit/test_color.cxx  |3 
 tools/qa/cppunit/test_config.cxx |9 --
 tools/qa/cppunit/test_date.cxx   |   54 +--
 vcl/qa/cppunit/FontFeatureTest.cxx   |2 
 vcl/qa/cppunit/bitmapcolor.cxx   |   12 +--
 vcl/source/gdi/pdfwriter_impl.cxx|3 
 18 files changed, 88 insertions(+), 120 deletions(-)

New commits:
commit 41eeaace84b45c803fff3ebd5ab981f0ad09393b
Author: Noel Grandin 
AuthorDate: Mon Oct 29 08:58:11 2018 +0200
Commit: Noel Grandin 
CommitDate: Mon Oct 29 15:12:26 2018 +0100

loplugin:oncevar

Change-Id: Iba892694acb378887a1d15ab59104c55f591f0bd
Reviewed-on: https://gerrit.libreoffice.org/62498
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/connectivity/source/drivers/mysqlc/mysqlc_connection.cxx 
b/connectivity/source/drivers/mysqlc/mysqlc_connection.cxx
index cb1b06261042..981fe7392aa5 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_connection.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_connection.cxx
@@ -268,9 +268,8 @@ OUString SAL_CALL OConnection::nativeSQL(const OUString& 
/*_sSql*/)
 MutexGuard aGuard(m_aMutex);
 
 // const OUString sSqlStatement = transFormPreparedStatement( _sSql );
-OUString sNativeSQL;
 // TODO
-return sNativeSQL;
+return OUString();
 }
 
 void SAL_CALL OConnection::setAutoCommit(sal_Bool autoCommit)
@@ -291,8 +290,7 @@ sal_Bool SAL_CALL OConnection::getAutoCommit()
 MutexGuard aGuard(m_aMutex);
 checkDisposed(OConnection_BASE::rBHelper.bDisposed);
 
-bool autoCommit = false;
-return autoCommit;
+return false;
 }
 
 void SAL_CALL OConnection::commit()
diff --git a/dbaccess/qa/extras/hsql_schema_import.cxx 
b/dbaccess/qa/extras/hsql_schema_import.cxx
index dd75eb2dc38c..89ee74ce03aa 100644
--- a/dbaccess/qa/extras/hsql_schema_import.cxx
+++ b/dbaccess/qa/extras/hsql_schema_import.cxx
@@ -61,7 +61,7 @@ public:
 
 void HsqlSchemaImportTest::testIntegerPrimaryKeyNotNull()
 {
-OUString sql{ "CREATE CACHED TABLE \"myTable\"(\"id\" INTEGER NOT NULL 
PRIMARY KEY)" };
+const OUString sql{ "CREATE CACHED TABLE \"myTable\"(\"id\" INTEGER NOT 
NULL PRIMARY KEY)" };
 
 FbCreateStmtParser aCreateParser;
 aCreateParser.parse(sql);
@@ -79,8 +79,10 @@ void HsqlSchemaImportTest::testIntegerPrimaryKeyNotNull()
 
 void HsqlSchemaImportTest::testVarcharWithParam()
 {
-OUString sql{ "CREATE CACHED TABLE \"myTable\"(\"id\" INTEGER NOT NULL 
PRIMARY KEY, \"myText\" "
-  "VARCHAR(50))" };
+const OUString sql{
+"CREATE CACHED TABLE \"myTable\"(\"id\" INTEGER NOT NULL PRIMARY KEY, 
\"myText\" "
+"VARCHAR(50))"
+};
 
 FbCreateStmtParser aCreateParser;
 aCreateParser.parse(sql);
@@ -102,8 +104,10 @@ void HsqlSchemaImportTest::testVarcharWithParam()
  **/
 void HsqlSchemaImportTest::testVarcharWithoutParam()
 {
-OUString sql{ "CREATE CACHED TABLE \"myTable\"(\"id\" INTEGER NOT NULL 
PRIMARY KEY, \"myText\" "
-  "VARCHAR)" };
+const OUString sql{
+"CREATE CACHED TABLE \"myTable\"(\"id\" INTEGER NOT NULL PRIMARY KEY, 
\"myText\" "
+"VARCHAR)"
+};
 
 FbCreateStmtParser aCreateParser;
 aCreateParser.parse(sql);
@@ -118,8 +122,10 @@ void HsqlSchemaImportTest::testVarcharWithoutParam()
 
 void HsqlSchemaImportTest::testNumericWithTwoParam()
 {
-OUString sql{ "CREATE CACHED TABLE \"myTable\"(\"id\" INTEGER NOT NULL 
PRIMARY KEY, \"Betrag\" "
-  "NUMERIC(8,2))" };
+const OUString sql{
+"CREATE CACHED TABLE \"myTable\"(\"id\" INTEGER NOT NULL PRIMARY KEY, 
\"Betrag\" "
+"NUMERIC(8,2))"
+};
 
 FbCreateStmtParser aCreateParser;
 aCreateParser.parse(sql);
@@ -140,8 +146,10 @@ void HsqlSchemaImportTest::testNumericWithTwoParam()
 
 void HsqlSchemaImportTest::testIntegerAutoincremental()
 {
-OUString sql{ "CREATE CACHED TABLE \"myTable\"(\"id\" INTEGER NOT NULL 
PRIMARY KEY GENERATED "
-  "BY DEFAULT AS IDENTITY(START WITH 0), \"myText\"