convert OSQLStatementType to scoped enum

Change-Id: I2df117cf0f405e88899e7ccab380156284720449

9 files changed, 51 insertions, 51 deletions

diff --git a/connectivity/source/drivers/evoab2/NStatement.cxx b/connectivity/source/drivers/evoab2/NStatement.cxx
index 6b86c967efbb..1c5a4c4256c1 100644
--- a/connectivity/source/drivers/evoab2/NStatement.cxx
+++ b/connectivity/source/drivers/evoab2/NStatement.cxx
@@ -412,7 +412,7 @@ OUString OCommonStatement::getTableName()
 {
     OUString aTableName;
 
-    if( m_pParseTree && m_aSQLIterator.getStatementType() == SQL_STATEMENT_SELECT )
+    if( m_pParseTree && m_aSQLIterator.getStatementType() == OSQLStatementType::Select )
     {
         Any aCatalog;
         OUString aSchema;
diff --git a/connectivity/source/drivers/file/FPreparedStatement.cxx b/connectivity/source/drivers/file/FPreparedStatement.cxx
index aa46c7cb38d4..b5d8d51d7470 100644
--- a/connectivity/source/drivers/file/FPreparedStatement.cxx
+++ b/connectivity/source/drivers/file/FPreparedStatement.cxx
@@ -84,7 +84,7 @@ void OPreparedStatement::construct(const OUString& sql)  throw(SQLException, Run
 
     Reference<XIndexAccess> xNames(m_xColNames,UNO_QUERY);
 
-    if ( m_aSQLIterator.getStatementType() == SQL_STATEMENT_SELECT )
+    if ( m_aSQLIterator.getStatementType() == OSQLStatementType::Select )
         m_xParamColumns = m_aSQLIterator.getParameters();
     else
     {
@@ -158,7 +158,7 @@ sal_Bool SAL_CALL OPreparedStatement::execute(  ) throw(SQLException, RuntimeExc
     if(xRS.is())
         xRS->dispose();
 
-    return m_aSQLIterator.getStatementType() == SQL_STATEMENT_SELECT;
+    return m_aSQLIterator.getStatementType() == OSQLStatementType::Select;
 }
 
 
diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx
index e335d00494d8..fd2798217968 100644
--- a/connectivity/source/drivers/file/FResultSet.cxx
+++ b/connectivity/source/drivers/file/FResultSet.cxx
@@ -847,7 +847,7 @@ again:
 
     // Evaluate may only be set,
     // if the Keyset will be constructed further
-    if  (   ( m_aSQLIterator.getStatementType() == SQL_STATEMENT_SELECT )
+    if  (   ( m_aSQLIterator.getStatementType() == OSQLStatementType::Select )
         &&  !isCount()
         &&  bEvaluate
         )
@@ -863,7 +863,7 @@ again:
             m_pFileSet->get().push_back(nBookmarkValue);
         }
     }
-    else if (m_aSQLIterator.getStatementType() == SQL_STATEMENT_UPDATE)
+    else if (m_aSQLIterator.getStatementType() == OSQLStatementType::Update)
     {
         bool bOK = true;
         if (bEvaluate)
@@ -879,7 +879,7 @@ again:
                 return false;
         }
     }
-    else if (m_aSQLIterator.getStatementType() == SQL_STATEMENT_DELETE)
+    else if (m_aSQLIterator.getStatementType() == OSQLStatementType::Delete)
     {
         bool bOK = true;
         if (bEvaluate)
@@ -900,7 +900,7 @@ bool OResultSet::Move(IResultSetHelper::Movement eCursorPosition, sal_Int32 nOff
 {
     sal_Int32 nTempPos = m_nRowPos;
 
-    if (m_aSQLIterator.getStatementType() == SQL_STATEMENT_SELECT &&
+    if (m_aSQLIterator.getStatementType() == OSQLStatementType::Select &&
         !isCount())
     {
         if (!m_pFileSet.is()) //no Index available
@@ -1004,7 +1004,7 @@ bool OResultSet::Move(IResultSetHelper::Movement eCursorPosition, sal_Int32 nOff
             }
         }
     }
-    else if (m_aSQLIterator.getStatementType() == SQL_STATEMENT_SELECT && isCount())
+    else if (m_aSQLIterator.getStatementType() == OSQLStatementType::Select && isCount())
     {
         // Fetch the COUNT(*)
         switch (eCursorPosition)
@@ -1224,7 +1224,7 @@ bool OResultSet::OpenImpl()
 
     switch(m_aSQLIterator.getStatementType())
     {
-        case SQL_STATEMENT_SELECT:
+        case OSQLStatementType::Select:
         {
             if(isCount())
             {
@@ -1363,8 +1363,8 @@ bool OResultSet::OpenImpl()
             }
         }   break;
 
-        case SQL_STATEMENT_UPDATE:
-        case SQL_STATEMENT_DELETE:
+        case OSQLStatementType::Update:
+        case OSQLStatementType::Delete:
             // during processing count the number of processed Rows
             m_nRowCountResult = 0;
             // for now simply iterate over all rows and
@@ -1386,7 +1386,7 @@ bool OResultSet::OpenImpl()
                 // nRowCount (number of rows in the result-set) = 1 for this request!
             }
             break;
-        case SQL_STATEMENT_INSERT:
+        case OSQLStatementType::Insert:
             m_nRowCountResult = 0;
 
             OSL_ENSURE(m_aAssignValues.is(),"No assign values set!");
diff --git a/connectivity/source/drivers/file/FStatement.cxx b/connectivity/source/drivers/file/FStatement.cxx
index 677a46c06bb9..1f43f59b9354 100644
--- a/connectivity/source/drivers/file/FStatement.cxx
+++ b/connectivity/source/drivers/file/FStatement.cxx
@@ -256,7 +256,7 @@ sal_Bool SAL_CALL OStatement::execute( const OUString& sql ) throw(SQLException,
 
     executeQuery(sql);
 
-    return m_aSQLIterator.getStatementType() == SQL_STATEMENT_SELECT;
+    return m_aSQLIterator.getStatementType() == OSQLStatementType::Select;
 }
 
 
@@ -405,15 +405,15 @@ void OStatement_Base::construct(const OUString& sql)  throw(SQLException, Runtim
             // more than one table -> can't operate on them -> error
             m_pConnection->throwGenericSQLException(STR_QUERY_MORE_TABLES,*this);
 
-        if ( (m_aSQLIterator.getStatementType() == SQL_STATEMENT_SELECT) && m_aSQLIterator.getSelectColumns()->get().empty() )
+        if ( (m_aSQLIterator.getStatementType() == OSQLStatementType::Select) && m_aSQLIterator.getSelectColumns()->get().empty() )
             // SELECT statement without columns -> error
             m_pConnection->throwGenericSQLException(STR_QUERY_NO_COLUMN,*this);
 
         switch(m_aSQLIterator.getStatementType())
         {
-            case SQL_STATEMENT_CREATE_TABLE:
-            case SQL_STATEMENT_ODBC_CALL:
-            case SQL_STATEMENT_UNKNOWN:
+            case OSQLStatementType::CreateTable:
+            case OSQLStatementType::OdbcCall:
+            case OSQLStatementType::Unknown:
                 m_pConnection->throwGenericSQLException(STR_QUERY_TOO_COMPLEX,*this);
                 break;
             default:
diff --git a/connectivity/source/drivers/kab/KStatement.cxx b/connectivity/source/drivers/kab/KStatement.cxx
index 5eab3b7a28a5..a25d857e7c0e 100644
--- a/connectivity/source/drivers/kab/KStatement.cxx
+++ b/connectivity/source/drivers/kab/KStatement.cxx
@@ -417,7 +417,7 @@ OSL_TRACE("KDE Address book - SQL Request: %s", OUtoCStr(sql));
     m_aSQLIterator.traverseAll();
     switch (m_aSQLIterator.getStatementType())
     {
-        case SQL_STATEMENT_SELECT:
+        case OSQLStatementType::Select:
             if (isTableKnown(pResult))      // FROM which table ?
             {
                 setKabFields(pResult);      // SELECT which columns ?
diff --git a/connectivity/source/drivers/macab/MacabStatement.cxx b/connectivity/source/drivers/macab/MacabStatement.cxx
index 5cdfc1ca0e0c..0cacb2d67dfe 100644
--- a/connectivity/source/drivers/macab/MacabStatement.cxx
+++ b/connectivity/source/drivers/macab/MacabStatement.cxx
@@ -424,7 +424,7 @@ OSL_TRACE("Mac OS Address book - SQL Request: %s", OUtoCStr(sql));
     m_aSQLIterator.traverseAll();
     switch (m_aSQLIterator.getStatementType())
     {
-        case SQL_STATEMENT_SELECT:
+        case OSQLStatementType::Select:
             {
             OUString sTableName = getTableName(); // FROM which table ?
             if (sTableName.getLength() != 0) // a match
diff --git a/connectivity/source/drivers/mork/MResultSet.cxx b/connectivity/source/drivers/mork/MResultSet.cxx
index 2488db761c3d..c00e34e97c13 100644
--- a/connectivity/source/drivers/mork/MResultSet.cxx
+++ b/connectivity/source/drivers/mork/MResultSet.cxx
@@ -1144,7 +1144,7 @@ void SAL_CALL OResultSet::executeQuery() throw( ::com::sun::star::sdbc::SQLExcep
 
     switch( m_pSQLIterator->getStatementType() )
     {
-        case SQL_STATEMENT_SELECT:
+        case OSQLStatementType::Select:
         {
             if(m_bIsAlwaysFalseQuery) {
                 break;
@@ -1285,9 +1285,9 @@ void SAL_CALL OResultSet::executeQuery() throw( ::com::sun::star::sdbc::SQLExcep
             }
         }   break;
 
-        case SQL_STATEMENT_UPDATE:
-        case SQL_STATEMENT_DELETE:
-        case SQL_STATEMENT_INSERT:
+        case OSQLStatementType::Update:
+        case OSQLStatementType::Delete:
+        case OSQLStatementType::Insert:
             break;
         default:
             m_pStatement->getOwnConnection()->throwSQLException( STR_STMT_TYPE_NOT_SUPPORTED, *this );
diff --git a/connectivity/source/drivers/mork/MStatement.cxx b/connectivity/source/drivers/mork/MStatement.cxx
index 936bd21ed535..272f49b1f65a 100644
--- a/connectivity/source/drivers/mork/MStatement.cxx
+++ b/connectivity/source/drivers/mork/MStatement.cxx
@@ -157,7 +157,7 @@ OCommonStatement::StatementType OCommonStatement::parseSql( const OUString& sql
         Reference<XIndexAccess> xNames;
         switch(m_pSQLIterator->getStatementType())
         {
-        case SQL_STATEMENT_SELECT:
+        case OSQLStatementType::Select:
 
             // at this moment we support only one table per select statement
 
@@ -176,7 +176,7 @@ OCommonStatement::StatementType OCommonStatement::parseSql( const OUString& sql
             analyseSQL();
             return eSelect;
 
-        case SQL_STATEMENT_CREATE_TABLE:
+        case OSQLStatementType::CreateTable:
             return eCreateTable;
 
         default:
diff --git a/connectivity/source/parse/sqliterator.cxx b/connectivity/source/parse/sqliterator.cxx
index 60203c21f738..bb2906c0b683 100644
--- a/connectivity/source/parse/sqliterator.cxx
+++ b/connectivity/source/parse/sqliterator.cxx
@@ -198,7 +198,7 @@ void OSQLParseTreeIterator::setParseTree(const OSQLParseNode * pNewParseTree)
     m_pParseTree = pNewParseTree;
     if (!m_pParseTree)
     {
-        m_eStatementType = SQL_STATEMENT_UNKNOWN;
+        m_eStatementType = OSQLStatementType::Unknown;
         return;
     }
 
@@ -212,32 +212,32 @@ void OSQLParseTreeIterator::setParseTree(const OSQLParseNode * pNewParseTree)
     // Determine statement type ...
     if (SQL_ISRULE(m_pParseTree,select_statement) || SQL_ISRULE(m_pParseTree,union_statement) )
     {
-        m_eStatementType = SQL_STATEMENT_SELECT;
+        m_eStatementType = OSQLStatementType::Select;
     }
     else if (SQL_ISRULE(m_pParseTree,insert_statement))
     {
-        m_eStatementType = SQL_STATEMENT_INSERT;
+        m_eStatementType = OSQLStatementType::Insert;
     }
     else if (SQL_ISRULE(m_pParseTree,update_statement_searched))
     {
-        m_eStatementType = SQL_STATEMENT_UPDATE;
+        m_eStatementType = OSQLStatementType::Update;
     }
     else if (SQL_ISRULE(m_pParseTree,delete_statement_searched))
     {
-        m_eStatementType = SQL_STATEMENT_DELETE;
+        m_eStatementType = OSQLStatementType::Delete;
     }
     else if (m_pParseTree->count() == 3 && SQL_ISRULE(m_pParseTree->getChild(1),odbc_call_spec))
     {
-        m_eStatementType = SQL_STATEMENT_ODBC_CALL;
+        m_eStatementType = OSQLStatementType::OdbcCall;
     }
     else if (SQL_ISRULE(m_pParseTree->getChild(0),base_table_def))
     {
-        m_eStatementType = SQL_STATEMENT_CREATE_TABLE;
+        m_eStatementType = OSQLStatementType::CreateTable;
         m_pParseTree = m_pParseTree->getChild(0);
     }
     else
     {
-        m_eStatementType = SQL_STATEMENT_UNKNOWN;
+        m_eStatementType = OSQLStatementType::Unknown;
         //aIteratorStatus.setInvalidStatement();
         return;
     }
@@ -378,7 +378,7 @@ OSQLTable OSQLParseTreeIterator::impl_locateRecordSource( const OUString& _rComp
 
         // if we're creating a table, and there already is a table or query with the same name,
         // this is worth an error
-        if ( SQL_STATEMENT_CREATE_TABLE == m_eStatementType )
+        if ( OSQLStatementType::CreateTable == m_eStatementType )
         {
             if ( bQueryDoesExist )
                 impl_appendError( IParseContext::ErrorCode::InvalidQueryExist, &sName );
@@ -666,17 +666,17 @@ bool OSQLParseTreeIterator::traverseTableNames(OSQLTables& _rTables)
 
     switch ( m_eStatementType )
     {
-        case SQL_STATEMENT_SELECT:
+        case OSQLStatementType::Select:
             getSelect_statement( _rTables, m_pParseTree );
             break;
 
-        case SQL_STATEMENT_CREATE_TABLE:
-        case SQL_STATEMENT_INSERT:
-        case SQL_STATEMENT_DELETE:
+        case OSQLStatementType::CreateTable:
+        case OSQLStatementType::Insert:
+        case OSQLStatementType::Delete:
             pTableName = m_pParseTree->getChild(2);
             break;
 
-        case SQL_STATEMENT_UPDATE:
+        case OSQLStatementType::Update:
             pTableName = m_pParseTree->getChild(1);
             break;
         default:
@@ -858,7 +858,7 @@ void OSQLParseTreeIterator::traverseCreateColumns(const OSQLParseNode* pSelectNo
 {
     //  aIteratorStatus.Clear();
 
-    if (!pSelectNode || m_eStatementType != SQL_STATEMENT_CREATE_TABLE || m_pImpl->m_pTables->empty())
+    if (!pSelectNode || m_eStatementType != OSQLStatementType::CreateTable || m_pImpl->m_pTables->empty())
     {
         impl_appendError( IParseContext::ErrorCode::General );
         return;
@@ -919,7 +919,7 @@ bool OSQLParseTreeIterator::traverseSelectColumnNames(const OSQLParseNode* pSele
     if ( ( m_pImpl->m_nIncludeMask & SelectColumns ) != SelectColumns )
         return true;
 
-    if (!pSelectNode || m_eStatementType != SQL_STATEMENT_SELECT || m_pImpl->m_pTables->empty())
+    if (!pSelectNode || m_eStatementType != OSQLStatementType::Select || m_pImpl->m_pTables->empty())
     {
         impl_appendError( IParseContext::ErrorCode::General );
         return false;
@@ -1033,7 +1033,7 @@ void OSQLParseTreeIterator::traverseByColumnNames(const OSQLParseNode* pSelectNo
         return;
     }
 
-    if (m_eStatementType != SQL_STATEMENT_SELECT)
+    if (m_eStatementType != OSQLStatementType::Select)
     {
         //aIteratorStatus.setInvalidStatement();
         return;
@@ -1196,7 +1196,7 @@ bool OSQLParseTreeIterator::traverseSelectionCriteria(const OSQLParseNode* pSele
     // and set pointer to WHERE clause:
     OSQLParseNode * pWhereClause = nullptr;
 
-    if (m_eStatementType == SQL_STATEMENT_SELECT)
+    if (m_eStatementType == OSQLStatementType::Select)
     {
         if(SQL_ISRULE(pSelectNode,union_statement))
         {
@@ -1562,7 +1562,7 @@ void OSQLParseTreeIterator::impl_traverse( sal_uInt32 _nIncludeMask )
 
     switch ( m_eStatementType )
     {
-    case SQL_STATEMENT_SELECT:
+    case OSQLStatementType::Select:
     {
         const OSQLParseNode* pSelectNode = m_pParseTree;
         traverseParameters( pSelectNode );
@@ -1574,7 +1574,7 @@ void OSQLParseTreeIterator::impl_traverse( sal_uInt32 _nIncludeMask )
             return;
     }
     break;
-    case SQL_STATEMENT_CREATE_TABLE:
+    case OSQLStatementType::CreateTable:
     {
         //0     |  1  |  2   |3|        4         |5
         //create table sc.foo ( a char(20), b char )
@@ -1582,7 +1582,7 @@ void OSQLParseTreeIterator::impl_traverse( sal_uInt32 _nIncludeMask )
         traverseCreateColumns(pCreateNode);
     }
     break;
-    case SQL_STATEMENT_INSERT:
+    case OSQLStatementType::Insert:
         break;
     default:
         break;
@@ -1595,7 +1595,7 @@ void OSQLParseTreeIterator::impl_traverse( sal_uInt32 _nIncludeMask )
 OSQLTable OSQLParseTreeIterator::impl_createTableObject( const OUString& rTableName,
     const OUString& rCatalogName, const OUString& rSchemaName )
 {
-    OSL_PRECOND( m_eStatementType == SQL_STATEMENT_CREATE_TABLE,
+    OSL_PRECOND( m_eStatementType == OSQLStatementType::CreateTable,
         "OSQLParseTreeIterator::impl_createTableObject: only to be called for CREATE TABLE statements!" );
         // (in all other cases, m_pTables is to contain the table objects as obtained from the tables
         // container of the connection (m_xTablesContainer)
@@ -1889,7 +1889,7 @@ const OSQLParseNode* OSQLParseTreeIterator::getWhereTree() const
     // Analyse parse tree (depending on statement type)
     // and set pointer to WHERE clause:
     OSQLParseNode * pWhereClause = nullptr;
-    if(getStatementType() == SQL_STATEMENT_SELECT)
+    if(getStatementType() == OSQLStatementType::Select)
     {
         OSL_ENSURE(m_pParseTree->count() >= 4,"ParseTreeIterator: error in parse tree!");
         OSQLParseNode * pTableExp = m_pParseTree->getChild(3);
@@ -1912,7 +1912,7 @@ const OSQLParseNode* OSQLParseTreeIterator::getWhereTree() const
 
 const OSQLParseNode* OSQLParseTreeIterator::getOrderTree() const
 {
-    if (!m_pParseTree || getStatementType() != SQL_STATEMENT_SELECT)
+    if (!m_pParseTree || getStatementType() != OSQLStatementType::Select)
         return nullptr;
 
     // Analyse parse tree (depending on statement type)
@@ -1933,7 +1933,7 @@ const OSQLParseNode* OSQLParseTreeIterator::getOrderTree() const
 
 const OSQLParseNode* OSQLParseTreeIterator::getGroupByTree() const
 {
-    if (!m_pParseTree || getStatementType() != SQL_STATEMENT_SELECT)
+    if (!m_pParseTree || getStatementType() != OSQLStatementType::Select)
         return nullptr;
 
     // Analyse parse tree (depending on statement type)
@@ -1954,7 +1954,7 @@ const OSQLParseNode* OSQLParseTreeIterator::getGroupByTree() const
 
 const OSQLParseNode* OSQLParseTreeIterator::getHavingTree() const
 {
-    if (!m_pParseTree || getStatementType() != SQL_STATEMENT_SELECT)
+    if (!m_pParseTree || getStatementType() != OSQLStatementType::Select)
         return nullptr;
 
     // Analyse parse tree (depending on statement type)