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

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Wed Feb 20 06:08:52 UTC 2019


 dbaccess/source/filter/hsqldb/parseschema.cxx |    7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

New commits:
commit 95a0a24d6172c4620432c20798a6727c732d8e86
Author:     Julien Nabet <serval2412 at yahoo.fr>
AuthorDate: Tue Feb 19 23:40:34 2019 +0100
Commit:     Julien Nabet <serval2412 at yahoo.fr>
CommitDate: Wed Feb 20 07:08:26 2019 +0100

    Revert "tdf#123020: migration to Firebird fix tablename for indexes (2)"
    
    As Michael indicated in https://gerrit.libreoffice.org/#/c/67698/,
    nothing garantees m_sql is at least SET_TABLE_LITERAL_SIZE characters long
    
    This reverts commit 2a08db9a0473e2f87715aacfc7b481beaa490dcf.
    
    Change-Id: Ib927666043c197527bd73043980d2800453d0843
    Reviewed-on: https://gerrit.libreoffice.org/68034
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
    Tested-by: Julien Nabet <serval2412 at yahoo.fr>

diff --git a/dbaccess/source/filter/hsqldb/parseschema.cxx b/dbaccess/source/filter/hsqldb/parseschema.cxx
index c17369f4950a..e04998c80f28 100644
--- a/dbaccess/source/filter/hsqldb/parseschema.cxx
+++ b/dbaccess/source/filter/hsqldb/parseschema.cxx
@@ -75,12 +75,7 @@ public:
     OUString getTableName() const
     {
         // SET TABLE <tableName>
-        constexpr int SET_TABLE_LITERAL_SIZE = 9;
-        if (m_sql.indexOf("\"") >= 0) // delimited identifier
-            return m_sql.copy(m_sql.indexOf("\""),
-                              m_sql.lastIndexOf("\"") - SET_TABLE_LITERAL_SIZE);
-        else
-            return string::split(m_sql, u' ')[2];
+        return string::split(m_sql, u' ')[2];
     }
 };
 


More information about the Libreoffice-commits mailing list