[Libreoffice-commits] core.git: 10 commits - connectivity/source dbaccess/source extensions/source forms/source include/connectivity include/dbaccess svx/source
Noel Grandin
noel at peralex.com
Thu Feb 25 11:51:24 UTC 2016
connectivity/source/commontools/TColumnsHelper.cxx | 4
connectivity/source/commontools/TIndexes.cxx | 8
connectivity/source/commontools/TKeys.cxx | 6
connectivity/source/commontools/TTableHelper.cxx | 12
connectivity/source/commontools/dbexception.cxx | 110 +-
connectivity/source/commontools/dbmetadata.cxx | 2
connectivity/source/commontools/dbtools.cxx | 16
connectivity/source/commontools/dbtools2.cxx | 6
connectivity/source/commontools/filtermanager.cxx | 54 -
connectivity/source/commontools/parameters.cxx | 12
connectivity/source/commontools/predicateinput.cxx | 4
connectivity/source/commontools/statementcomposer.cxx | 2
connectivity/source/drivers/ado/APreparedStatement.cxx | 4
connectivity/source/drivers/evoab2/NStatement.cxx | 34
connectivity/source/drivers/file/FNoException.cxx | 2
connectivity/source/drivers/file/FPreparedStatement.cxx | 4
connectivity/source/drivers/file/FResultSet.cxx | 18
connectivity/source/drivers/file/FStatement.cxx | 18
connectivity/source/drivers/file/fanalyzer.cxx | 2
connectivity/source/drivers/file/fcode.cxx | 6
connectivity/source/drivers/file/fcomp.cxx | 38
connectivity/source/drivers/firebird/PreparedStatement.cxx | 6
connectivity/source/drivers/firebird/ResultSet.cxx | 4
connectivity/source/drivers/hsqldb/HConnection.cxx | 2
connectivity/source/drivers/hsqldb/HTable.cxx | 10
connectivity/source/drivers/hsqldb/HTables.cxx | 8
connectivity/source/drivers/hsqldb/HUser.cxx | 6
connectivity/source/drivers/hsqldb/HView.cxx | 2
connectivity/source/drivers/hsqldb/HViews.cxx | 8
connectivity/source/drivers/kab/KStatement.cxx | 10
connectivity/source/drivers/macab/MacabStatement.cxx | 10
connectivity/source/drivers/mork/MPreparedStatement.cxx | 2
connectivity/source/drivers/mork/MResultSet.cxx | 26
connectivity/source/drivers/mork/MStatement.cxx | 4
connectivity/source/drivers/mysql/YTable.cxx | 2
connectivity/source/drivers/mysql/YTables.cxx | 8
connectivity/source/drivers/mysql/YUser.cxx | 6
connectivity/source/drivers/mysql/YViews.cxx | 8
connectivity/source/parse/sqlbison.y | 620 ++++++-------
connectivity/source/parse/sqlflex.l | 188 +--
connectivity/source/parse/sqliterator.cxx | 104 +-
connectivity/source/parse/sqlnode.cxx | 214 ++--
connectivity/source/sdbcx/VCatalog.cxx | 2
connectivity/source/sdbcx/VTable.cxx | 2
connectivity/source/sdbcx/VView.cxx | 2
dbaccess/source/core/api/BookmarkSet.cxx | 8
dbaccess/source/core/api/CacheSet.cxx | 4
dbaccess/source/core/api/FilteredContainer.cxx | 4
dbaccess/source/core/api/KeySet.cxx | 16
dbaccess/source/core/api/OptimisticSet.cxx | 14
dbaccess/source/core/api/RowSet.cxx | 36
dbaccess/source/core/api/RowSetBase.cxx | 10
dbaccess/source/core/api/RowSetCache.cxx | 2
dbaccess/source/core/api/SingleSelectQueryComposer.cxx | 48 -
dbaccess/source/core/api/definitioncolumn.cxx | 2
dbaccess/source/core/api/query.cxx | 2
dbaccess/source/core/api/resultset.cxx | 4
dbaccess/source/core/api/tablecontainer.cxx | 4
dbaccess/source/core/api/viewcontainer.cxx | 6
dbaccess/source/core/dataaccess/connection.cxx | 2
dbaccess/source/core/misc/DatabaseDataProvider.cxx | 4
dbaccess/source/sdbtools/connection/objectnames.cxx | 2
dbaccess/source/sdbtools/connection/tablename.cxx | 12
dbaccess/source/ui/app/AppController.cxx | 6
dbaccess/source/ui/app/AppControllerGen.cxx | 2
dbaccess/source/ui/control/tabletree.cxx | 6
dbaccess/source/ui/dlg/adtabdlg.cxx | 2
dbaccess/source/ui/dlg/dlgsave.cxx | 4
dbaccess/source/ui/dlg/queryfilter.cxx | 4
dbaccess/source/ui/dlg/sqlmessage.cxx | 26
dbaccess/source/ui/dlg/tablespage.cxx | 2
dbaccess/source/ui/misc/DExport.cxx | 2
dbaccess/source/ui/misc/TokenWriter.cxx | 2
dbaccess/source/ui/misc/UITools.cxx | 4
dbaccess/source/ui/misc/WCPage.cxx | 4
dbaccess/source/ui/misc/WCopyTable.cxx | 12
dbaccess/source/ui/misc/databaseobjectview.cxx | 2
dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx | 2
dbaccess/source/ui/querydesign/QueryDesignView.cxx | 60 -
dbaccess/source/ui/querydesign/QueryTableView.cxx | 4
dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx | 24
dbaccess/source/ui/querydesign/querycontroller.cxx | 20
dbaccess/source/ui/relationdesign/RelationController.cxx | 4
dbaccess/source/ui/tabledesign/TableController.cxx | 4
dbaccess/source/ui/uno/copytablewizard.cxx | 6
extensions/source/bibliography/datman.cxx | 6
extensions/source/dbpilots/listcombowizard.cxx | 2
forms/source/component/ComboBox.cxx | 2
forms/source/component/DatabaseForm.cxx | 8
forms/source/component/Filter.cxx | 2
forms/source/component/ListBox.cxx | 2
include/connectivity/IParseContext.hxx | 80 -
include/connectivity/dbexception.hxx | 6
include/connectivity/dbtools.hxx | 16
include/connectivity/filtermanager.hxx | 26
include/connectivity/parameters.hxx | 12
include/connectivity/sqliterator.hxx | 57 -
include/connectivity/sqlnode.hxx | 16
include/connectivity/standardsqlstate.hxx | 46
include/dbaccess/dbsubcomponentcontroller.hxx | 2
svx/source/form/ParseContext.cxx | 92 -
svx/source/form/formcontroller.cxx | 2
102 files changed, 1186 insertions(+), 1189 deletions(-)
New commits:
commit 414a66587b73dfc69c121118e9a6337de4e843d2
Author: Noel Grandin <noel at peralex.com>
Date: Thu Feb 25 13:38:38 2016 +0200
convert StandardSQLState to scoped enum
Change-Id: Ia0a1526140cfed35a73a6fea1a173d2fb5005960
diff --git a/connectivity/source/commontools/dbexception.cxx b/connectivity/source/commontools/dbexception.cxx
index c46a0d8..911c212 100644
--- a/connectivity/source/commontools/dbexception.cxx
+++ b/connectivity/source/commontools/dbexception.cxx
@@ -349,7 +349,7 @@ void throwFunctionSequenceException(const Reference< XInterface >& _Context, con
throw SQLException(
aResources.getResourceString(STR_ERRORMSG_SEQUENCE),
_Context,
- getStandardSQLState( SQL_FUNCTION_SEQUENCE_ERROR ),
+ getStandardSQLState( StandardSQLState::FUNCTION_SEQUENCE_ERROR ),
0,
_Next
);
@@ -362,7 +362,7 @@ void throwInvalidIndexException(const ::com::sun::star::uno::Reference< ::com::s
throw SQLException(
aResources.getResourceString(STR_INVALID_INDEX),
_Context,
- getStandardSQLState( SQL_INVALID_DESCRIPTOR_INDEX ),
+ getStandardSQLState( StandardSQLState::INVALID_DESCRIPTOR_INDEX ),
0,
_Next
);
@@ -380,7 +380,7 @@ void throwFunctionNotSupportedSQLException(const OUString& _rFunctionName,
throw SQLException(
sError,
_rxContext,
- getStandardSQLState( SQL_FUNCTION_NOT_SUPPORTED ),
+ getStandardSQLState( StandardSQLState::FUNCTION_NOT_SUPPORTED ),
0,
_rNextException
);
@@ -410,7 +410,7 @@ void throwGenericSQLException(const OUString& _rMsg, const ::com::sun::star::uno
void throwGenericSQLException(const OUString& _rMsg, const Reference< XInterface >& _rxSource, const Any& _rNextException)
throw (SQLException)
{
- throw SQLException( _rMsg, _rxSource, getStandardSQLState( SQL_GENERAL_ERROR ), 0, _rNextException);
+ throw SQLException( _rMsg, _rxSource, getStandardSQLState( StandardSQLState::GENERAL_ERROR ), 0, _rNextException);
}
void throwFeatureNotImplementedSQLException( const OUString& _rFeatureName, const Reference< XInterface >& _rxContext, const Any* _pNextException )
@@ -425,7 +425,7 @@ void throwFeatureNotImplementedSQLException( const OUString& _rFeatureName, cons
throw SQLException(
sError,
_rxContext,
- getStandardSQLState( SQL_FEATURE_NOT_IMPLEMENTED ),
+ getStandardSQLState( StandardSQLState::FEATURE_NOT_IMPLEMENTED ),
0,
_pNextException ? *_pNextException : Any()
);
@@ -450,7 +450,7 @@ void throwInvalidColumnException( const OUString& _rColumnName, const Reference<
OUString sErrorMessage( aResources.getResourceStringWithSubstitution(
STR_INVALID_COLUMNNAME,
"$columnname$",_rColumnName) );
- throwSQLException( sErrorMessage, SQL_COLUMN_NOT_FOUND, _rxContext );
+ throwSQLException( sErrorMessage, StandardSQLState::COLUMN_NOT_FOUND, _rxContext );
}
void throwSQLException( const OUString& _rMessage, const OUString& _rSQLState,
@@ -478,27 +478,27 @@ OUString getStandardSQLState( StandardSQLState _eState )
{
switch ( _eState )
{
- case SQL_WRONG_PARAMETER_NUMBER: return OUString("07001");
- case SQL_INVALID_DESCRIPTOR_INDEX: return OUString("07009");
- case SQL_UNABLE_TO_CONNECT: return OUString("08001");
- case SQL_NUMERIC_OUT_OF_RANGE: return OUString("22003");
- case SQL_INVALID_DATE_TIME: return OUString("22007");
- case SQL_INVALID_CURSOR_STATE: return OUString("24000");
- case SQL_TABLE_OR_VIEW_EXISTS: return OUString("42S01");
- case SQL_TABLE_OR_VIEW_NOT_FOUND: return OUString("42S02");
- case SQL_INDEX_ESISTS: return OUString("42S11");
- case SQL_INDEX_NOT_FOUND: return OUString("42S12");
- case SQL_COLUMN_EXISTS: return OUString("42S21");
- case SQL_COLUMN_NOT_FOUND: return OUString("42S22");
- case SQL_GENERAL_ERROR: return OUString("HY000");
- case SQL_INVALID_SQL_DATA_TYPE: return OUString("HY004");
- case SQL_OPERATION_CANCELED: return OUString("HY008");
- case SQL_FUNCTION_SEQUENCE_ERROR: return OUString("HY010");
- case SQL_INVALID_CURSOR_POSITION: return OUString("HY109");
- case SQL_INVALID_BOOKMARK_VALUE: return OUString("HY111");
- case SQL_FEATURE_NOT_IMPLEMENTED: return OUString("HYC00");
- case SQL_FUNCTION_NOT_SUPPORTED: return OUString("IM001");
- case SQL_CONNECTION_DOES_NOT_EXIST: return OUString("08003");
+ case StandardSQLState::WRONG_PARAMETER_NUMBER: return OUString("07001");
+ case StandardSQLState::INVALID_DESCRIPTOR_INDEX: return OUString("07009");
+ case StandardSQLState::UNABLE_TO_CONNECT: return OUString("08001");
+ case StandardSQLState::NUMERIC_OUT_OF_RANGE: return OUString("22003");
+ case StandardSQLState::INVALID_DATE_TIME: return OUString("22007");
+ case StandardSQLState::INVALID_CURSOR_STATE: return OUString("24000");
+ case StandardSQLState::TABLE_OR_VIEW_EXISTS: return OUString("42S01");
+ case StandardSQLState::TABLE_OR_VIEW_NOT_FOUND: return OUString("42S02");
+ case StandardSQLState::INDEX_ESISTS: return OUString("42S11");
+ case StandardSQLState::INDEX_NOT_FOUND: return OUString("42S12");
+ case StandardSQLState::COLUMN_EXISTS: return OUString("42S21");
+ case StandardSQLState::COLUMN_NOT_FOUND: return OUString("42S22");
+ case StandardSQLState::GENERAL_ERROR: return OUString("HY000");
+ case StandardSQLState::INVALID_SQL_DATA_TYPE: return OUString("HY004");
+ case StandardSQLState::OPERATION_CANCELED: return OUString("HY008");
+ case StandardSQLState::FUNCTION_SEQUENCE_ERROR: return OUString("HY010");
+ case StandardSQLState::INVALID_CURSOR_POSITION: return OUString("HY109");
+ case StandardSQLState::INVALID_BOOKMARK_VALUE: return OUString("HY111");
+ case StandardSQLState::FEATURE_NOT_IMPLEMENTED: return OUString("HYC00");
+ case StandardSQLState::FUNCTION_NOT_SUPPORTED: return OUString("IM001");
+ case StandardSQLState::CONNECTION_DOES_NOT_EXIST: return OUString("08003");
default: return OUString("HY001"); // General Error
}
}
diff --git a/connectivity/source/commontools/dbmetadata.cxx b/connectivity/source/commontools/dbmetadata.cxx
index 1498478..26f857f 100644
--- a/connectivity/source/commontools/dbmetadata.cxx
+++ b/connectivity/source/commontools/dbmetadata.cxx
@@ -113,7 +113,7 @@ namespace dbtools
{
::connectivity::SharedResources aResources;
const OUString sError( aResources.getResourceString(STR_NO_CONNECTION_GIVEN));
- throwSQLException( sError, SQL_CONNECTION_DOES_NOT_EXIST, nullptr );
+ throwSQLException( sError, StandardSQLState::CONNECTION_DOES_NOT_EXIST, nullptr );
}
}
diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx
index e7b11fc..3baab99 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -737,7 +737,7 @@ SQLException prependErrorInfo( const SQLException& _rChainedException, const Ref
const OUString& _rAdditionalError, const StandardSQLState _eSQLState, const sal_Int32 _nErrorCode )
{
return SQLException( _rAdditionalError, _rxContext,
- _eSQLState == SQL_ERROR_UNSPECIFIED ? OUString() : getStandardSQLState( _eSQLState ),
+ _eSQLState == StandardSQLState::ERROR_UNSPECIFIED ? OUString() : getStandardSQLState( _eSQLState ),
_nErrorCode, makeAny( _rChainedException ) );
}
diff --git a/connectivity/source/drivers/firebird/PreparedStatement.cxx b/connectivity/source/drivers/firebird/PreparedStatement.cxx
index 6ebc8ac..ac2778f 100644
--- a/connectivity/source/drivers/firebird/PreparedStatement.cxx
+++ b/connectivity/source/drivers/firebird/PreparedStatement.cxx
@@ -226,7 +226,7 @@ void SAL_CALL OPreparedStatement::setString(sal_Int32 nParameterIndex,
default:
::dbtools::throwSQLException(
"Incorrect type for setString",
- ::dbtools::SQL_INVALID_SQL_DATA_TYPE,
+ ::dbtools::StandardSQLState::INVALID_SQL_DATA_TYPE,
*this);
}
}
@@ -342,7 +342,7 @@ void OPreparedStatement::setValue(sal_Int32 nIndex, T& nValue, ISC_SHORT nType)
{
::dbtools::throwSQLException(
"Incorrect type for setString",
- ::dbtools::SQL_INVALID_SQL_DATA_TYPE,
+ ::dbtools::StandardSQLState::INVALID_SQL_DATA_TYPE,
*this);
}
@@ -693,7 +693,7 @@ void OPreparedStatement::checkParameterIndex(sal_Int32 nParameterIndex)
{
::dbtools::throwSQLException(
"No column " + OUString::number(nParameterIndex),
- ::dbtools::SQL_COLUMN_NOT_FOUND,
+ ::dbtools::StandardSQLState::COLUMN_NOT_FOUND,
*this);
}
}
diff --git a/connectivity/source/drivers/firebird/ResultSet.cxx b/connectivity/source/drivers/firebird/ResultSet.cxx
index 764f561..edb0926 100644
--- a/connectivity/source/drivers/firebird/ResultSet.cxx
+++ b/connectivity/source/drivers/firebird/ResultSet.cxx
@@ -288,7 +288,7 @@ void SAL_CALL OResultSet::checkColumnIndex(sal_Int32 nIndex)
{
::dbtools::throwSQLException(
"No column " + OUString::number(nIndex),
- ::dbtools::SQL_COLUMN_NOT_FOUND,
+ ::dbtools::StandardSQLState::COLUMN_NOT_FOUND,
*this);
}
}
@@ -303,7 +303,7 @@ void SAL_CALL OResultSet::checkRowIndex()
{
::dbtools::throwSQLException(
"Invalid Row",
- ::dbtools::SQL_INVALID_CURSOR_POSITION,
+ ::dbtools::StandardSQLState::INVALID_CURSOR_POSITION,
*this);
}
}
diff --git a/connectivity/source/parse/sqliterator.cxx b/connectivity/source/parse/sqliterator.cxx
index 64942d3..4f42b96 100644
--- a/connectivity/source/parse/sqliterator.cxx
+++ b/connectivity/source/parse/sqliterator.cxx
@@ -2088,7 +2088,7 @@ void OSQLParseTreeIterator::impl_appendError( IParseContext::ErrorCode _eError,
}
impl_appendError( SQLException(
- sErrorMessage, nullptr, getStandardSQLState( SQL_GENERAL_ERROR ), 1000, Any() ) );
+ sErrorMessage, nullptr, getStandardSQLState( StandardSQLState::GENERAL_ERROR ), 1000, Any() ) );
}
diff --git a/dbaccess/source/core/api/BookmarkSet.cxx b/dbaccess/source/core/api/BookmarkSet.cxx
index 154af39..faca631 100644
--- a/dbaccess/source/core/api/BookmarkSet.cxx
+++ b/dbaccess/source/core/api/BookmarkSet.cxx
@@ -76,7 +76,7 @@ void SAL_CALL OBookmarkSet::insertRow( const ORowSetRow& _rInsertRow,const conne
{
Reference<XRowUpdate> xUpdRow(m_xRowLocate,UNO_QUERY);
if(!xUpdRow.is())
- ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_NO_XROWUPDATE ), SQL_GENERAL_ERROR, *this );
+ ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_NO_XROWUPDATE ), StandardSQLState::GENERAL_ERROR, *this );
Reference<XResultSetUpdate> xUpd(m_xRowLocate,UNO_QUERY);
if(xUpd.is())
@@ -93,14 +93,14 @@ void SAL_CALL OBookmarkSet::insertRow( const ORowSetRow& _rInsertRow,const conne
(*_rInsertRow->get().begin()) = m_xRowLocate->getBookmark();
}
else
- ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_NO_XRESULTSETUPDATE ), SQL_GENERAL_ERROR, *this );
+ ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_NO_XRESULTSETUPDATE ), StandardSQLState::GENERAL_ERROR, *this );
}
void SAL_CALL OBookmarkSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& /*_xTable*/ ) throw(SQLException, RuntimeException, std::exception)
{
Reference<XRowUpdate> xUpdRow(m_xRowLocate,UNO_QUERY);
if(!xUpdRow.is())
- ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_NO_XROWUPDATE ), SQL_GENERAL_ERROR, *this );
+ ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_NO_XROWUPDATE ), StandardSQLState::GENERAL_ERROR, *this );
sal_Int32 i = 1;
connectivity::ORowVector< ORowSetValue > ::Vector::const_iterator aOrgIter = _rOriginalRow->get().begin()+1;
@@ -116,7 +116,7 @@ void SAL_CALL OBookmarkSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowS
if(xUpd.is())
xUpd->updateRow();
else
- ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_NO_XRESULTSETUPDATE ), SQL_GENERAL_ERROR, *this );
+ ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_NO_XRESULTSETUPDATE ), StandardSQLState::GENERAL_ERROR, *this );
}
void SAL_CALL OBookmarkSet::deleteRow(const ORowSetRow& /*_rDeleteRow*/ ,const connectivity::OSQLTable& /*_xTable*/ ) throw(SQLException, RuntimeException)
diff --git a/dbaccess/source/core/api/CacheSet.cxx b/dbaccess/source/core/api/CacheSet.cxx
index 5618df0..5bb75ba 100644
--- a/dbaccess/source/core/api/CacheSet.cxx
+++ b/dbaccess/source/core/api/CacheSet.cxx
@@ -296,7 +296,7 @@ void SAL_CALL OCacheSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetR
}
else
::dbtools::throwSQLException(
- DBACORE_RESSTRING( RID_STR_NO_UPDATE_MISSING_CONDITION ), SQL_GENERAL_ERROR, *this );
+ DBACORE_RESSTRING( RID_STR_NO_UPDATE_MISSING_CONDITION ), StandardSQLState::GENERAL_ERROR, *this );
// now create end execute the prepared statement
Reference< XPreparedStatement > xPrep(m_xConnection->prepareStatement(aSql.makeStringAndClear()));
diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx
index 12e74c4..b24e44f 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -526,7 +526,7 @@ void SAL_CALL OKeySet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow
aSql.setLength(aSql.getLength()-1);
}
else
- ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_NO_VALUE_CHANGED ), SQL_GENERAL_ERROR, m_xConnection );
+ ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_NO_VALUE_CHANGED ), StandardSQLState::GENERAL_ERROR, m_xConnection );
if(!sKeyCondition.isEmpty() || !sIndexCondition.isEmpty())
{
@@ -546,7 +546,7 @@ void SAL_CALL OKeySet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow
aSql.setLength(aSql.getLength()-5); // remove the last AND
}
else
- ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_NO_CONDITION_FOR_PK ), SQL_GENERAL_ERROR, m_xConnection );
+ ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_NO_CONDITION_FOR_PK ), StandardSQLState::GENERAL_ERROR, m_xConnection );
// now create end execute the prepared statement
executeUpdate(_rInsertRow ,_rOriginalRow,aSql.makeStringAndClear(),"",aIndexColumnPositions);
@@ -650,7 +650,7 @@ void SAL_CALL OKeySet::insertRow( const ORowSetRow& _rInsertRow,const connectivi
}
}
if ( !bModified )
- ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_NO_VALUE_CHANGED ), SQL_GENERAL_ERROR, m_xConnection );
+ ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_NO_VALUE_CHANGED ), StandardSQLState::GENERAL_ERROR, m_xConnection );
aSql[aSql.getLength() - 1] = ')';
aValues[aValues.getLength() - 1] = ')';
diff --git a/dbaccess/source/core/api/OptimisticSet.cxx b/dbaccess/source/core/api/OptimisticSet.cxx
index 67f6850..154ed3d 100644
--- a/dbaccess/source/core/api/OptimisticSet.cxx
+++ b/dbaccess/source/core/api/OptimisticSet.cxx
@@ -210,10 +210,10 @@ void SAL_CALL OptimisticSet::updateRow(const ORowSetRow& _rInsertRow ,const ORow
}
if( aSql.empty() )
- ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_NO_VALUE_CHANGED ), SQL_GENERAL_ERROR, m_xConnection );
+ ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_NO_VALUE_CHANGED ), StandardSQLState::GENERAL_ERROR, m_xConnection );
if( aKeyConditions.empty() )
- ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_NO_CONDITION_FOR_PK ), SQL_GENERAL_ERROR, m_xConnection );
+ ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_NO_CONDITION_FOR_PK ), StandardSQLState::GENERAL_ERROR, m_xConnection );
static const char s_sUPDATE[] = "UPDATE ";
static const char s_sSET[] = " SET ";
@@ -280,7 +280,7 @@ void SAL_CALL OptimisticSet::insertRow( const ORowSetRow& _rInsertRow,const conn
}
}
if ( aParameter.empty() )
- ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_NO_VALUE_CHANGED ), SQL_GENERAL_ERROR, m_xConnection );
+ ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_NO_VALUE_CHANGED ), StandardSQLState::GENERAL_ERROR, m_xConnection );
Reference<XDatabaseMetaData> xMetaData = m_xConnection->getMetaData();
static const char s_sINSERT[] = "INSERT INTO ";
diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx
index 3762ec5..74d3e79 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -973,7 +973,7 @@ void SAL_CALL ORowSet::updateRow( ) throw(SQLException, RuntimeException, std::
}
else if ( !m_bAfterLast ) // the update went wrong
{
- ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_UPDATE_FAILED ), SQL_INVALID_CURSOR_POSITION, *this );
+ ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_UPDATE_FAILED ), StandardSQLState::INVALID_CURSOR_POSITION, *this );
}
}
}
@@ -986,15 +986,15 @@ void SAL_CALL ORowSet::deleteRow( ) throw(SQLException, RuntimeException, std::
checkCache();
if ( m_bBeforeFirst || m_bAfterLast )
- ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_NO_DELETE_BEFORE_AFTER ), SQL_INVALID_CURSOR_POSITION, *this );
+ ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_NO_DELETE_BEFORE_AFTER ), StandardSQLState::INVALID_CURSOR_POSITION, *this );
if ( m_bNew )
- ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_NO_DELETE_INSERT_ROW ), SQL_INVALID_CURSOR_POSITION, *this );
+ ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_NO_DELETE_INSERT_ROW ), StandardSQLState::INVALID_CURSOR_POSITION, *this );
if ( m_nResultSetConcurrency == ResultSetConcurrency::READ_ONLY )
- ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_RESULT_IS_READONLY ), SQL_FUNCTION_SEQUENCE_ERROR, *this );
+ ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_RESULT_IS_READONLY ), StandardSQLState::FUNCTION_SEQUENCE_ERROR, *this );
if ( ( m_pCache->m_nPrivileges & Privilege::DELETE ) != Privilege::DELETE )
- ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_NO_DELETE_PRIVILEGE ), SQL_FUNCTION_SEQUENCE_ERROR, *this );
+ ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_NO_DELETE_PRIVILEGE ), StandardSQLState::FUNCTION_SEQUENCE_ERROR, *this );
if ( rowDeleted() )
- ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_ROW_ALREADY_DELETED ), SQL_FUNCTION_SEQUENCE_ERROR, *this );
+ ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_ROW_ALREADY_DELETED ), StandardSQLState::FUNCTION_SEQUENCE_ERROR, *this );
// this call position the cache indirect
Any aBookmarkToDelete( m_aBookmark );
@@ -1160,7 +1160,7 @@ void SAL_CALL ORowSet::moveToInsertRow( ) throw(SQLException, RuntimeException,
::osl::ResettableMutexGuard aGuard( *m_pMutex );
checkPositioningAllowed();
if ( ( m_pCache->m_nPrivileges & Privilege::INSERT ) != Privilege::INSERT )
- ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_NO_INSERT_PRIVILEGE ), SQL_GENERAL_ERROR, *this );
+ ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_NO_INSERT_PRIVILEGE ), StandardSQLState::GENERAL_ERROR, *this );
if ( notifyAllListenersCursorBeforeMove( aGuard ) )
{
@@ -1258,7 +1258,7 @@ void SAL_CALL ORowSet::moveToCurrentRow( ) throw(SQLException, RuntimeException
// m_bModified should be true. Also, as soon as somebody calls moveToInsertRow,
// our current row should not be deleted anymore. So, we should not have survived the above
// check "if ( !m_pCache->m_bNew && !m_bModified )"
- ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_ROW_ALREADY_DELETED ), SQL_FUNCTION_SEQUENCE_ERROR, *this );
+ ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_ROW_ALREADY_DELETED ), StandardSQLState::FUNCTION_SEQUENCE_ERROR, *this );
if ( notifyAllListenersCursorBeforeMove( aGuard ) )
{
@@ -1631,7 +1631,7 @@ void ORowSet::impl_ensureStatement_throw()
m_xStatement = m_xActiveConnection->prepareStatement( sCommandToExecute );
if ( !m_xStatement.is() )
{
- ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_INTERNAL_ERROR ), SQL_GENERAL_ERROR, *this );
+ ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_INTERNAL_ERROR ), StandardSQLState::GENERAL_ERROR, *this );
}
Reference< XPropertySet > xStatementProps( m_xStatement, UNO_QUERY_THROW );
@@ -2408,7 +2408,7 @@ bool ORowSet::impl_buildActiveCommand_throw()
m_aActiveCommand = sCommand;
if ( m_aActiveCommand.isEmpty() && !bDoEscapeProcessing )
- ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_NO_SQL_COMMAND ), SQL_FUNCTION_SEQUENCE_ERROR, *this );
+ ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_NO_SQL_COMMAND ), StandardSQLState::FUNCTION_SEQUENCE_ERROR, *this );
return bDoEscapeProcessing;
}
@@ -2704,16 +2704,16 @@ void ORowSet::checkUpdateConditions(sal_Int32 columnIndex)
{
checkCache();
if ( m_nResultSetConcurrency == ResultSetConcurrency::READ_ONLY)
- ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_RESULT_IS_READONLY ), SQL_GENERAL_ERROR, *this );
+ ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_RESULT_IS_READONLY ), StandardSQLState::GENERAL_ERROR, *this );
if ( rowDeleted() )
- ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_ROW_ALREADY_DELETED ), SQL_INVALID_CURSOR_POSITION, *this );
+ ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_ROW_ALREADY_DELETED ), StandardSQLState::INVALID_CURSOR_POSITION, *this );
if ( m_aCurrentRow.isNull() )
- ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_INVALID_CURSOR_STATE ), SQL_INVALID_CURSOR_STATE, *this );
+ ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_INVALID_CURSOR_STATE ), StandardSQLState::INVALID_CURSOR_STATE, *this );
if ( columnIndex <= 0 || sal_Int32((*m_aCurrentRow)->get().size()) <= columnIndex )
- ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_INVALID_INDEX ), SQL_INVALID_DESCRIPTOR_INDEX, *this );
+ ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_INVALID_INDEX ), StandardSQLState::INVALID_DESCRIPTOR_INDEX, *this );
}
void SAL_CALL ORowSet::refreshRow( ) throw(SQLException, RuntimeException, std::exception)
diff --git a/dbaccess/source/core/api/RowSetBase.cxx b/dbaccess/source/core/api/RowSetBase.cxx
index 2ad04ad..85d9a71 100644
--- a/dbaccess/source/core/api/RowSetBase.cxx
+++ b/dbaccess/source/core/api/RowSetBase.cxx
@@ -207,7 +207,7 @@ const ORowSetValue& ORowSetBase::impl_getValue(sal_Int32 columnIndex)
if ( m_bBeforeFirst || m_bAfterLast )
{
SAL_WARN("dbaccess", "ORowSetBase::getValue: Illegal call here (we're before first or after last)!");
- ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_CURSOR_BEFORE_OR_AFTER ), SQL_INVALID_CURSOR_POSITION, *m_pMySelf );
+ ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_CURSOR_BEFORE_OR_AFTER ), StandardSQLState::INVALID_CURSOR_POSITION, *m_pMySelf );
}
if ( impl_rowDeleted() )
@@ -333,7 +333,7 @@ Reference< css::io::XInputStream > SAL_CALL ORowSetBase::getBinaryStream( sal_In
if ( m_bBeforeFirst || m_bAfterLast )
{
SAL_WARN("dbaccess", "ORowSetBase::getBinaryStream: Illegal call here (we're before first or after last)!");
- ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_CURSOR_BEFORE_OR_AFTER ), SQL_INVALID_CURSOR_POSITION, *m_pMySelf );
+ ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_CURSOR_BEFORE_OR_AFTER ), StandardSQLState::INVALID_CURSOR_POSITION, *m_pMySelf );
}
if ( impl_rowDeleted() )
@@ -403,10 +403,10 @@ Any SAL_CALL ORowSetBase::getBookmark( ) throw(SQLException, RuntimeException,
checkCache();
if ( m_bBeforeFirst || m_bAfterLast )
- ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_NO_BOOKMARK_BEFORE_OR_AFTER ), SQL_INVALID_CURSOR_POSITION, *m_pMySelf );
+ ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_NO_BOOKMARK_BEFORE_OR_AFTER ), StandardSQLState::INVALID_CURSOR_POSITION, *m_pMySelf );
if ( impl_rowDeleted() )
- ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_NO_BOOKMARK_DELETED ), SQL_INVALID_CURSOR_POSITION, *m_pMySelf );
+ ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_NO_BOOKMARK_DELETED ), StandardSQLState::INVALID_CURSOR_POSITION, *m_pMySelf );
OSL_ENSURE( m_aBookmark.hasValue(), "ORowSetBase::getBookmark: bookmark has no value!" );
return m_aBookmark;
@@ -1094,7 +1094,7 @@ void SAL_CALL ORowSetBase::refreshRow( ) throw(SQLException, RuntimeException,
::osl::MutexGuard aGuard( *m_pMutex );
checkCache();
if ( impl_rowDeleted() )
- throwSQLException( "The current row is deleted", SQL_INVALID_CURSOR_STATE, Reference< XRowSet >( this ) );
+ throwSQLException( "The current row is deleted", StandardSQLState::INVALID_CURSOR_STATE, Reference< XRowSet >( this ) );
if(!(m_bBeforeFirst || m_bAfterLast))
{
diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
index 4da4c70..f97daac 100644
--- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
+++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
@@ -107,7 +107,7 @@ namespace
const OSQLParseNode* pNewSqlParseNode = _rParser.parseTree( aErrorMsg, _rStatement );
if ( !pNewSqlParseNode )
{
- OUString sSQLStateGeneralError( getStandardSQLState( SQL_GENERAL_ERROR ) );
+ OUString sSQLStateGeneralError( getStandardSQLState( StandardSQLState::GENERAL_ERROR ) );
SQLException aError2( aErrorMsg, _rxContext, sSQLStateGeneralError, 1000, Any() );
SQLException aError1( _rStatement, _rxContext, sSQLStateGeneralError, 1000, makeAny( aError2 ) );
throw SQLException(_rParser.getContext().getErrorMessage(OParseContext::ErrorCode::General),_rxContext,sSQLStateGeneralError,1000,makeAny(aError1));
@@ -134,9 +134,9 @@ namespace
// restore the old node before throwing the exception
_rIterator.setParseTree( pOldNode );
// and now really ...
- SQLException aError1( _rOriginatingCommand, _rxContext, getStandardSQLState( SQL_GENERAL_ERROR ), 1000, Any() );
+ SQLException aError1( _rOriginatingCommand, _rxContext, getStandardSQLState( StandardSQLState::GENERAL_ERROR ), 1000, Any() );
throw SQLException( DBACORE_RESSTRING( RID_STR_ONLY_QUERY ), _rxContext,
- getStandardSQLState( SQL_GENERAL_ERROR ), 1000, makeAny( aError1 ) );
+ getStandardSQLState( StandardSQLState::GENERAL_ERROR ), 1000, makeAny( aError1 ) );
}
delete pOldNode;
diff --git a/dbaccess/source/core/api/query.cxx b/dbaccess/source/core/api/query.cxx
index abe8735..dfb7580 100644
--- a/dbaccess/source/core/api/query.cxx
+++ b/dbaccess/source/core/api/query.cxx
@@ -159,7 +159,7 @@ void OQuery::rebuildColumns()
if ( !xResultSetMeta.is() )
{
OUString sError( DBA_RES( RID_STR_STATEMENT_WITHOUT_RESULT_SET ) );
- ::dbtools::throwSQLException( sError, SQL_GENERAL_ERROR, *this );
+ ::dbtools::throwSQLException( sError, StandardSQLState::GENERAL_ERROR, *this );
}
Reference< XDatabaseMetaData > xDBMeta( m_xConnection->getMetaData(), UNO_QUERY_THROW );
diff --git a/dbaccess/source/core/api/resultset.cxx b/dbaccess/source/core/api/resultset.cxx
index f32168a..e69cf2b 100644
--- a/dbaccess/source/core/api/resultset.cxx
+++ b/dbaccess/source/core/api/resultset.cxx
@@ -992,13 +992,13 @@ void OResultSet::checkReadOnly() const
if ( ( m_nResultSetConcurrency == ResultSetConcurrency::READ_ONLY )
|| !m_xDelegatorResultSetUpdate.is()
)
- throwSQLException( "The result set is read-only.", SQL_GENERAL_ERROR, *const_cast< OResultSet* >( this ) );
+ throwSQLException( "The result set is read-only.", StandardSQLState::GENERAL_ERROR, *const_cast< OResultSet* >( this ) );
}
void OResultSet::checkBookmarkable() const
{
if ( !m_bIsBookmarkable )
- throwSQLException( "The result set does not have bookmark support.", SQL_GENERAL_ERROR, *const_cast< OResultSet* >( this ) );
+ throwSQLException( "The result set does not have bookmark support.", StandardSQLState::GENERAL_ERROR, *const_cast< OResultSet* >( this ) );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/querydesign/QueryTableView.cxx b/dbaccess/source/ui/querydesign/QueryTableView.cxx
index ab8fcda..0fa5f28 100644
--- a/dbaccess/source/ui/querydesign/QueryTableView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryTableView.cxx
@@ -949,7 +949,7 @@ bool OQueryTableView::ExistsAVisitedConn(const OQueryTableWindow* pFrom) const
void OQueryTableView::onNoColumns_throw()
{
OUString sError( ModuleRes( STR_STATEMENT_WITHOUT_RESULT_SET ) );
- ::dbtools::throwSQLException( sError, ::dbtools::SQL_GENERAL_ERROR, nullptr );
+ ::dbtools::throwSQLException( sError, ::dbtools::StandardSQLState::GENERAL_ERROR, nullptr );
}
bool OQueryTableView::supressCrossNaturalJoin(const TTableConnectionData::value_type& _pData) const
diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx b/dbaccess/source/ui/uno/copytablewizard.cxx
index 03f8a4c..9e6c9c2 100644
--- a/dbaccess/source/ui/uno/copytablewizard.cxx
+++ b/dbaccess/source/ui/uno/copytablewizard.cxx
@@ -1201,7 +1201,7 @@ void CopyTableWizard::impl_copyRows_throw( const Reference< XResultSet >& _rxSou
if ( ( nSourceColumn < 1 ) || ( nSourceColumn >= (sal_Int32)aSourceColTypes.size() ) )
{ // ( we have to check here against 1 because the parameters are 1 based)
::dbtools::throwSQLException("Internal error: invalid column type index.",
- ::dbtools::SQL_INVALID_DESCRIPTOR_INDEX, *this);
+ ::dbtools::StandardSQLState::INVALID_DESCRIPTOR_INDEX, *this);
}
switch ( aSourceColTypes[ nSourceColumn ] )
@@ -1285,7 +1285,7 @@ void CopyTableWizard::impl_copyRows_throw( const Reference< XResultSet >& _rxSou
::dbtools::throwSQLException(
aMessage,
- ::dbtools::SQL_INVALID_SQL_DATA_TYPE,
+ ::dbtools::StandardSQLState::INVALID_SQL_DATA_TYPE,
*this
);
}
diff --git a/include/connectivity/dbtools.hxx b/include/connectivity/dbtools.hxx
index 78b61cd..515a4dc 100644
--- a/include/connectivity/dbtools.hxx
+++ b/include/connectivity/dbtools.hxx
@@ -306,7 +306,7 @@ namespace dbtools
const css::sdbc::SQLException& _rChainedException,
const css::uno::Reference< css::uno::XInterface >& _rxContext,
const OUString& _rAdditionalError,
- const StandardSQLState _eSQLState = SQL_ERROR_UNSPECIFIED,
+ const StandardSQLState _eSQLState = StandardSQLState::ERROR_UNSPECIFIED,
const sal_Int32 _nErrorCode = 0);
/** search the parent hierarchy for a data source.
diff --git a/include/connectivity/standardsqlstate.hxx b/include/connectivity/standardsqlstate.hxx
index 0d3971f..9af461d 100644
--- a/include/connectivity/standardsqlstate.hxx
+++ b/include/connectivity/standardsqlstate.hxx
@@ -31,31 +31,31 @@ namespace dbtools
@see http://msdn.microsoft.com/library/default.asp?url=/library/en-us/odbc/htm/odbcodbc_error_codes.asp
*/
- enum StandardSQLState
+ enum class StandardSQLState
{
- SQL_WRONG_PARAMETER_NUMBER, // 07001
- SQL_INVALID_DESCRIPTOR_INDEX, // 07009
- SQL_UNABLE_TO_CONNECT, // 08001
- SQL_NUMERIC_OUT_OF_RANGE, // 22003
- SQL_INVALID_DATE_TIME, // 22007
- SQL_INVALID_CURSOR_STATE, // 24000
- SQL_TABLE_OR_VIEW_EXISTS, // 42S01
- SQL_TABLE_OR_VIEW_NOT_FOUND, // 42S02
- SQL_INDEX_ESISTS, // 42S11
- SQL_INDEX_NOT_FOUND, // 42S12
- SQL_COLUMN_EXISTS, // 42S21
- SQL_COLUMN_NOT_FOUND, // 42S22
- SQL_GENERAL_ERROR, // HY000
- SQL_INVALID_SQL_DATA_TYPE, // HY004
- SQL_OPERATION_CANCELED, // HY008
- SQL_FUNCTION_SEQUENCE_ERROR, // HY010
- SQL_INVALID_CURSOR_POSITION, // HY109
- SQL_INVALID_BOOKMARK_VALUE, // HY111
- SQL_FEATURE_NOT_IMPLEMENTED, // HYC00
- SQL_FUNCTION_NOT_SUPPORTED, // IM001
- SQL_CONNECTION_DOES_NOT_EXIST, // 08003
+ WRONG_PARAMETER_NUMBER, // 07001
+ INVALID_DESCRIPTOR_INDEX, // 07009
+ UNABLE_TO_CONNECT, // 08001
+ NUMERIC_OUT_OF_RANGE, // 22003
+ INVALID_DATE_TIME, // 22007
+ INVALID_CURSOR_STATE, // 24000
+ TABLE_OR_VIEW_EXISTS, // 42S01
+ TABLE_OR_VIEW_NOT_FOUND, // 42S02
+ INDEX_ESISTS, // 42S11
+ INDEX_NOT_FOUND, // 42S12
+ COLUMN_EXISTS, // 42S21
+ COLUMN_NOT_FOUND, // 42S22
+ GENERAL_ERROR, // HY000
+ INVALID_SQL_DATA_TYPE, // HY004
+ OPERATION_CANCELED, // HY008
+ FUNCTION_SEQUENCE_ERROR, // HY010
+ INVALID_CURSOR_POSITION, // HY109
+ INVALID_BOOKMARK_VALUE, // HY111
+ FEATURE_NOT_IMPLEMENTED, // HYC00
+ FUNCTION_NOT_SUPPORTED, // IM001
+ CONNECTION_DOES_NOT_EXIST, // 08003
- SQL_ERROR_UNSPECIFIED = SAL_MAX_ENUM // special value indicating that an SQLState is not to be specified
+ ERROR_UNSPECIFIED = SAL_MAX_ENUM // special value indicating that an SQLState is not to be specified
};
diff --git a/include/dbaccess/dbsubcomponentcontroller.hxx b/include/dbaccess/dbsubcomponentcontroller.hxx
index 69b486e..9e4248a 100644
--- a/include/dbaccess/dbsubcomponentcontroller.hxx
+++ b/include/dbaccess/dbsubcomponentcontroller.hxx
@@ -107,7 +107,7 @@ namespace dbaui
*/
void appendError(
const OUString& _rErrorMessage,
- const ::dbtools::StandardSQLState _eSQLState = ::dbtools::SQL_GENERAL_ERROR,
+ const ::dbtools::StandardSQLState _eSQLState = ::dbtools::StandardSQLState::GENERAL_ERROR,
const sal_Int32 _nErrorCode = 1000
);
commit 960d4ebf76d3e7c757d2625a1e52a22556da9d40
Author: Noel Grandin <noel at peralex.com>
Date: Thu Feb 25 12:28:07 2016 +0200
convert SQLNodeType to scoped enum
Change-Id: I622e55622d38e6017993c8bc52625c85d0f74d74
diff --git a/connectivity/source/commontools/predicateinput.cxx b/connectivity/source/commontools/predicateinput.cxx
index 7de98df..63446ed 100644
--- a/connectivity/source/commontools/predicateinput.cxx
+++ b/connectivity/source/commontools/predicateinput.cxx
@@ -399,7 +399,7 @@ namespace dbtools
else
{
OSQLParseNode* pValueNode = pOdbcSpec->getChild(1);
- if ( SQL_NODE_STRING == pValueNode->getNodeType() )
+ if ( SQLNodeType::String == pValueNode->getNodeType() )
sReturn = pValueNode->getTokenValue();
else
pValueNode->parseNodeToStr(sReturn, m_xConnection, &m_aParser.getContext());
@@ -419,7 +419,7 @@ namespace dbtools
assert(pValueNode && "OPredicateInputController::getPredicateValue: invalid node child!");
if ( !_bForStatementUse )
{
- if ( SQL_NODE_STRING == pValueNode->getNodeType() )
+ if ( SQLNodeType::String == pValueNode->getNodeType() )
sReturn = pValueNode->getTokenValue();
else
pValueNode->parseNodeToStr(
diff --git a/connectivity/source/drivers/ado/APreparedStatement.cxx b/connectivity/source/drivers/ado/APreparedStatement.cxx
index 1546e27..5fc031b 100644
--- a/connectivity/source/drivers/ado/APreparedStatement.cxx
+++ b/connectivity/source/drivers/ado/APreparedStatement.cxx
@@ -459,11 +459,11 @@ void OPreparedStatement::replaceParameterNodeName(OSQLParseNode* _pNode,
OSQLParseNode* pChildNode = _pNode->getChild(i);
if(SQL_ISRULE(pChildNode,parameter) && pChildNode->count() == 1)
{
- OSQLParseNode* pNewNode = new OSQLParseNode(OUString(":") ,SQL_NODE_PUNCTUATION,0);
+ OSQLParseNode* pNewNode = new OSQLParseNode(OUString(":") ,SQLNodeType::Punctuation,0);
delete pChildNode->replace(pChildNode->getChild(0),pNewNode);
OUString sParameterName = _sDefaultName;
sParameterName += OUString::number(++_rParameterCount);
- pChildNode->append(new OSQLParseNode( sParameterName,SQL_NODE_NAME,0));
+ pChildNode->append(new OSQLParseNode( sParameterName,SQLNodeType::Name,0));
}
else
replaceParameterNodeName(pChildNode,_sDefaultName,_rParameterCount);
diff --git a/connectivity/source/drivers/evoab2/NStatement.cxx b/connectivity/source/drivers/evoab2/NStatement.cxx
index 1c5a4c4..0731d0d 100644
--- a/connectivity/source/drivers/evoab2/NStatement.cxx
+++ b/connectivity/source/drivers/evoab2/NStatement.cxx
@@ -289,33 +289,33 @@ EBookQuery *OCommonStatement::whereAnalysis( const OSQLParseNode* parseTree )
OSQLParseNode* pRHS = parseTree->getChild( 2 );
if ( ( !( SQL_ISRULE( pLHS, column_ref ) ) // on the LHS, we accept a column or a constant int value
- && ( pLHS->getNodeType() != SQL_NODE_INTNUM )
+ && ( pLHS->getNodeType() != SQLNodeType::IntNum )
)
- || ( ( pRHS->getNodeType() != SQL_NODE_STRING ) // on the RHS, certain literals are acceptable
- && ( pRHS->getNodeType() != SQL_NODE_INTNUM )
- && ( pRHS->getNodeType() != SQL_NODE_APPROXNUM )
+ || ( ( pRHS->getNodeType() != SQLNodeType::String ) // on the RHS, certain literals are acceptable
+ && ( pRHS->getNodeType() != SQLNodeType::IntNum )
+ && ( pRHS->getNodeType() != SQLNodeType::ApproxNum )
&& !( SQL_ISTOKEN( pRHS, TRUE ) )
&& !( SQL_ISTOKEN( pRHS, FALSE ) )
)
- || ( ( pLHS->getNodeType() == SQL_NODE_INTNUM ) // an int on LHS requires an int on RHS
- && ( pRHS->getNodeType() != SQL_NODE_INTNUM )
+ || ( ( pLHS->getNodeType() == SQLNodeType::IntNum ) // an int on LHS requires an int on RHS
+ && ( pRHS->getNodeType() != SQLNodeType::IntNum )
)
)
{
m_pConnection->throwGenericSQLException( STR_QUERY_TOO_COMPLEX, *this );
}
- if ( ( pPrec->getNodeType() != SQL_NODE_EQUAL )
- && ( pPrec->getNodeType() != SQL_NODE_NOTEQUAL )
+ if ( ( pPrec->getNodeType() != SQLNodeType::Equal )
+ && ( pPrec->getNodeType() != SQLNodeType::NotEqual )
)
{
m_pConnection->throwGenericSQLException( STR_OPERATOR_TOO_COMPLEX, *this );
}
// recognize the special "0 = 1" condition
- if ( ( pLHS->getNodeType() == SQL_NODE_INTNUM )
- && ( pRHS->getNodeType() == SQL_NODE_INTNUM )
- && ( pPrec->getNodeType() == SQL_NODE_EQUAL )
+ if ( ( pLHS->getNodeType() == SQLNodeType::IntNum )
+ && ( pRHS->getNodeType() == SQLNodeType::IntNum )
+ && ( pPrec->getNodeType() == SQLNodeType::Equal )
)
{
const sal_Int32 nLHS = pLHS->getTokenValue().toInt64();
@@ -333,7 +333,7 @@ EBookQuery *OCommonStatement::whereAnalysis( const OSQLParseNode* parseTree )
pResult = createTest( aColumnName, E_BOOK_QUERY_IS, aMatchString );
- if ( pResult && ( pPrec->getNodeType() == SQL_NODE_NOTEQUAL ) )
+ if ( pResult && ( pPrec->getNodeType() == SQLNodeType::NotEqual ) )
pResult = e_book_query_not( pResult, TRUE );
}
// SQL like
@@ -350,11 +350,11 @@ EBookQuery *OCommonStatement::whereAnalysis( const OSQLParseNode* parseTree )
OSQLParseNode *pAtom = pPart2->getChild( pPart2->count() - 2 ); // Match String
bool bNotLike = pPart2->getChild(0)->isToken();
- if( !( pAtom->getNodeType() == SQL_NODE_STRING ||
- pAtom->getNodeType() == SQL_NODE_NAME ||
+ if( !( pAtom->getNodeType() == SQLNodeType::String ||
+ pAtom->getNodeType() == SQLNodeType::Name ||
SQL_ISRULE( pAtom,parameter ) ||
- ( pAtom->getChild( 0 ) && pAtom->getChild( 0 )->getNodeType() == SQL_NODE_NAME ) ||
- ( pAtom->getChild( 0 ) && pAtom->getChild( 0 )->getNodeType() == SQL_NODE_STRING ) ) )
+ ( pAtom->getChild( 0 ) && pAtom->getChild( 0 )->getNodeType() == SQLNodeType::Name ) ||
+ ( pAtom->getChild( 0 ) && pAtom->getChild( 0 )->getNodeType() == SQLNodeType::String ) ) )
{
SAL_INFO(
"connectivity.evoab2",
diff --git a/connectivity/source/drivers/file/FNoException.cxx b/connectivity/source/drivers/file/FNoException.cxx
index e60b24c..ed6fbc9 100644
--- a/connectivity/source/drivers/file/FNoException.cxx
+++ b/connectivity/source/drivers/file/FNoException.cxx
@@ -75,7 +75,7 @@ void OPreparedStatement::scanParameter(OSQLParseNode* pParseNode,::std::vector<
if (SQL_ISRULE(pParseNode,parameter))
{
DBG_ASSERT(pParseNode->count() >= 1,"OResultSet: Parse Tree fehlerhaft");
- DBG_ASSERT(pParseNode->getChild(0)->getNodeType() == SQL_NODE_PUNCTUATION,"OResultSet: Parse Tree fehlerhaft");
+ DBG_ASSERT(pParseNode->getChild(0)->getNodeType() == SQLNodeType::Punctuation,"OResultSet: Parse Tree fehlerhaft");
_rParaNodes.push_back(pParseNode);
// Further descend not necessary
diff --git a/connectivity/source/drivers/file/FStatement.cxx b/connectivity/source/drivers/file/FStatement.cxx
index 1f43f59..f61c06e 100644
--- a/connectivity/source/drivers/file/FStatement.cxx
+++ b/connectivity/source/drivers/file/FStatement.cxx
@@ -625,7 +625,7 @@ void OStatement_Base::GetAssignValues()
OSQLParseNode * pComp = pAssignment->getChild(1);
OSL_ENSURE(pComp != nullptr,"OResultSet: pComp == NULL");
- OSL_ENSURE(pComp->getNodeType() == SQL_NODE_EQUAL,"OResultSet: pComp->getNodeType() != SQL_NODE_COMPARISON");
+ OSL_ENSURE(pComp->getNodeType() == SQLNodeType::Equal,"OResultSet: pComp->getNodeType() != SQLNodeType::Comparison");
if (pComp->getTokenValue().toChar() != '=')
{
throwFunctionSequenceException(*this);
@@ -647,9 +647,9 @@ void OStatement_Base::ParseAssignValues(const ::std::vector< OUString>& aColumnN
OSL_ENSURE(aColumnName.getLength() > 0,"OResultSet: Column-Name nicht gefunden");
OSL_ENSURE(pRow_Value_Constructor_Elem != nullptr,"OResultSet: pRow_Value_Constructor_Elem darf nicht NULL sein!");
- if (pRow_Value_Constructor_Elem->getNodeType() == SQL_NODE_STRING ||
- pRow_Value_Constructor_Elem->getNodeType() == SQL_NODE_INTNUM ||
- pRow_Value_Constructor_Elem->getNodeType() == SQL_NODE_APPROXNUM)
+ if (pRow_Value_Constructor_Elem->getNodeType() == SQLNodeType::String ||
+ pRow_Value_Constructor_Elem->getNodeType() == SQLNodeType::IntNum ||
+ pRow_Value_Constructor_Elem->getNodeType() == SQLNodeType::ApproxNum)
{
// set value:
SetAssignValue(aColumnName, pRow_Value_Constructor_Elem->getTokenValue());
diff --git a/connectivity/source/drivers/file/fanalyzer.cxx b/connectivity/source/drivers/file/fanalyzer.cxx
index fe134b1..151f70b 100644
--- a/connectivity/source/drivers/file/fanalyzer.cxx
+++ b/connectivity/source/drivers/file/fanalyzer.cxx
@@ -93,7 +93,7 @@ void OSQLAnalyzer::start(OSQLParseNode* pSQLParseNode)
if ( SQL_ISPUNCTUATION( pColumnRef, "*" )
|| ( SQL_ISRULE( pColumnRef, column_ref )
&& ( pColumnRef->count() == 3 )
- && ( pColumnRef->getChild(0)->getNodeType() == SQL_NODE_NAME )
+ && ( pColumnRef->getChild(0)->getNodeType() == SQLNodeType::Name )
&& SQL_ISPUNCTUATION( pColumnRef->getChild(1), "." )
&& SQL_ISRULE( pColumnRef->getChild(2), column_val )
&& SQL_ISPUNCTUATION( pColumnRef->getChild(2)->getChild(0), "*" )
diff --git a/connectivity/source/drivers/file/fcode.cxx b/connectivity/source/drivers/file/fcode.cxx
index df70e20..071ff80 100644
--- a/connectivity/source/drivers/file/fcode.cxx
+++ b/connectivity/source/drivers/file/fcode.cxx
@@ -112,13 +112,13 @@ OOperandConst::OOperandConst(const OSQLParseNode& rColumnRef, const OUString& aS
{
switch (rColumnRef.getNodeType())
{
- case SQL_NODE_STRING:
+ case SQLNodeType::String:
m_aValue = aStrValue;
m_eDBType = DataType::VARCHAR;
m_aValue.setBound(true);
return;
- case SQL_NODE_INTNUM:
- case SQL_NODE_APPROXNUM:
+ case SQLNodeType::IntNum:
+ case SQLNodeType::ApproxNum:
m_aValue = aStrValue.toDouble();
m_eDBType = DataType::DOUBLE;
m_aValue.setBound(true);
diff --git a/connectivity/source/drivers/file/fcomp.cxx b/connectivity/source/drivers/file/fcomp.cxx
index 182c550..4133b4c 100644
--- a/connectivity/source/drivers/file/fcomp.cxx
+++ b/connectivity/source/drivers/file/fcomp.cxx
@@ -226,9 +226,9 @@ OOperand* OPredicateCompiler::execute_COMPARE(OSQLParseNode* pPredicateNode) th
DBG_ASSERT(pPredicateNode->count() == 3,"OFILECursor: Fehler im Parse Tree");
if ( !(SQL_ISRULE(pPredicateNode->getChild(0),column_ref) ||
- pPredicateNode->getChild(2)->getNodeType() == SQL_NODE_STRING ||
- pPredicateNode->getChild(2)->getNodeType() == SQL_NODE_INTNUM ||
- pPredicateNode->getChild(2)->getNodeType() == SQL_NODE_APPROXNUM ||
+ pPredicateNode->getChild(2)->getNodeType() == SQLNodeType::String ||
+ pPredicateNode->getChild(2)->getNodeType() == SQLNodeType::IntNum ||
+ pPredicateNode->getChild(2)->getNodeType() == SQLNodeType::ApproxNum ||
SQL_ISTOKEN(pPredicateNode->getChild(2),TRUE) ||
SQL_ISTOKEN(pPredicateNode->getChild(2),FALSE) ||
SQL_ISRULE(pPredicateNode->getChild(2),parameter) ||
@@ -246,17 +246,17 @@ OOperand* OPredicateCompiler::execute_COMPARE(OSQLParseNode* pPredicateNode) th
sal_Int32 ePredicateType( SQLFilterOperator::EQUAL );
OSQLParseNode *pPrec = pPredicateNode->getChild(1);
- if (pPrec->getNodeType() == SQL_NODE_EQUAL)
+ if (pPrec->getNodeType() == SQLNodeType::Equal)
ePredicateType = SQLFilterOperator::EQUAL;
- else if (pPrec->getNodeType() == SQL_NODE_NOTEQUAL)
+ else if (pPrec->getNodeType() == SQLNodeType::NotEqual)
ePredicateType = SQLFilterOperator::NOT_EQUAL;
- else if (pPrec->getNodeType() == SQL_NODE_LESS)
+ else if (pPrec->getNodeType() == SQLNodeType::Less)
ePredicateType = SQLFilterOperator::LESS;
- else if (pPrec->getNodeType() == SQL_NODE_LESSEQ)
+ else if (pPrec->getNodeType() == SQLNodeType::LessEq)
ePredicateType = SQLFilterOperator::LESS_EQUAL;
- else if (pPrec->getNodeType() == SQL_NODE_GREATEQ)
+ else if (pPrec->getNodeType() == SQLNodeType::GreatEq)
ePredicateType = SQLFilterOperator::GREATER_EQUAL;
- else if (pPrec->getNodeType() == SQL_NODE_GREAT)
+ else if (pPrec->getNodeType() == SQLNodeType::Great)
ePredicateType = SQLFilterOperator::GREATER;
else
OSL_FAIL( "OPredicateCompiler::execute_COMPARE: unexpected node type!" );
@@ -280,7 +280,7 @@ OOperand* OPredicateCompiler::execute_LIKE(OSQLParseNode* pPredicateNode) throw(
OSQLParseNode* pAtom = pPart2->getChild(pPart2->count()-2);
OSQLParseNode* pOptEscape = pPart2->getChild(pPart2->count()-1);
- if (!(pAtom->getNodeType() == SQL_NODE_STRING ||
+ if (!(pAtom->getNodeType() == SQLNodeType::String ||
SQL_ISRULE(pAtom,parameter) ||
// odbc date
SQL_ISRULE(pAtom,set_fct_spec) ||
@@ -300,7 +300,7 @@ OOperand* OPredicateCompiler::execute_LIKE(OSQLParseNode* pPredicateNode) throw(
m_pAnalyzer->getConnection()->throwGenericSQLException(STR_QUERY_INVALID_LIKE_STRING,nullptr);
}
OSQLParseNode *pEscNode = pOptEscape->getChild(1);
- if (pEscNode->getNodeType() != SQL_NODE_STRING)
+ if (pEscNode->getNodeType() != SQLNodeType::String)
{
m_pAnalyzer->getConnection()->throwGenericSQLException(STR_QUERY_INVALID_LIKE_STRING,nullptr);
}
@@ -329,8 +329,8 @@ OOperand* OPredicateCompiler::execute_BETWEEN(OSQLParseNode* pPredicateNode) thr
OSQLParseNode* p2ndtValue = pPart2->getChild(4);
if (
- !(p1stValue->getNodeType() == SQL_NODE_STRING || SQL_ISRULE(p1stValue,parameter))
- && !(p2ndtValue->getNodeType() == SQL_NODE_STRING || SQL_ISRULE(p2ndtValue,parameter))
+ !(p1stValue->getNodeType() == SQLNodeType::String || SQL_ISRULE(p1stValue,parameter))
+ && !(p2ndtValue->getNodeType() == SQLNodeType::String || SQL_ISRULE(p2ndtValue,parameter))
)
{
m_pAnalyzer->getConnection()->throwGenericSQLException(STR_QUERY_INVALID_BETWEEN,nullptr);
@@ -470,10 +470,10 @@ OOperand* OPredicateCompiler::execute_Operand(OSQLParseNode* pPredicateNode) thr
{
pOperand = new OOperandParam(pPredicateNode, ++m_nParamCounter);
}
- else if (pPredicateNode->getNodeType() == SQL_NODE_STRING ||
- pPredicateNode->getNodeType() == SQL_NODE_INTNUM ||
- pPredicateNode->getNodeType() == SQL_NODE_APPROXNUM ||
- pPredicateNode->getNodeType() == SQL_NODE_NAME ||
+ else if (pPredicateNode->getNodeType() == SQLNodeType::String ||
+ pPredicateNode->getNodeType() == SQLNodeType::IntNum ||
+ pPredicateNode->getNodeType() == SQLNodeType::ApproxNum ||
+ pPredicateNode->getNodeType() == SQLNodeType::Name ||
SQL_ISTOKEN(pPredicateNode,TRUE) ||
SQL_ISTOKEN(pPredicateNode,FALSE) ||
SQL_ISRULE(pPredicateNode,parameter))
@@ -482,7 +482,7 @@ OOperand* OPredicateCompiler::execute_Operand(OSQLParseNode* pPredicateNode) thr
}
else if((pPredicateNode->count() == 2) &&
(SQL_ISPUNCTUATION(pPredicateNode->getChild(0),"+") || SQL_ISPUNCTUATION(pPredicateNode->getChild(0),"-")) &&
- pPredicateNode->getChild(1)->getNodeType() == SQL_NODE_INTNUM)
+ pPredicateNode->getChild(1)->getNodeType() == SQLNodeType::IntNum)
{ // if -1 or +1 is there
OUString aValue(pPredicateNode->getChild(0)->getTokenValue());
aValue += pPredicateNode->getChild(1)->getTokenValue();
@@ -494,7 +494,7 @@ OOperand* OPredicateCompiler::execute_Operand(OSQLParseNode* pPredicateNode) thr
const OSQLParseNode* pODBCNodeChild = pODBCNode->getChild(0);
// Odbc Date or time
- if (pODBCNodeChild->getNodeType() == SQL_NODE_KEYWORD && (
+ if (pODBCNodeChild->getNodeType() == SQLNodeType::Keyword && (
SQL_ISTOKEN(pODBCNodeChild,D) ||
SQL_ISTOKEN(pODBCNodeChild,T) ||
SQL_ISTOKEN(pODBCNodeChild,TS) ))
diff --git a/connectivity/source/drivers/kab/KStatement.cxx b/connectivity/source/drivers/kab/KStatement.cxx
index a25d857..1c5f494 100644
--- a/connectivity/source/drivers/kab/KStatement.cxx
+++ b/connectivity/source/drivers/kab/KStatement.cxx
@@ -110,11 +110,11 @@ KabCondition *KabCommonStatement::analyseWhereClause(const OSQLParseNode *pParse
{
switch (pMiddle->getNodeType())
{
- case SQL_NODE_EQUAL:
+ case SQLNodeType::Equal:
// WHERE 0 = 1
return new KabConditionConstant(pLeft->getTokenValue() == pRight->getTokenValue());
- case SQL_NODE_NOTEQUAL:
+ case SQLNodeType::NotEqual:
// WHERE 0 <> 1
// (might not be correct SQL... don't care, handling anyway)
return new KabConditionConstant(pLeft->getTokenValue() != pRight->getTokenValue());
@@ -141,11 +141,11 @@ KabCondition *KabCommonStatement::analyseWhereClause(const OSQLParseNode *pParse
switch (pMiddle->getNodeType())
{
- case SQL_NODE_EQUAL:
+ case SQLNodeType::Equal:
// WHERE Name = 'Smith'
return new KabConditionEqual(sColumnName, sMatchString);
- case SQL_NODE_NOTEQUAL:
+ case SQLNodeType::NotEqual:
// WHERE Name <> 'Jones'
return new KabConditionDifferent(sColumnName, sMatchString);
diff --git a/connectivity/source/drivers/macab/MacabStatement.cxx b/connectivity/source/drivers/macab/MacabStatement.cxx
index 0cacb2d..ec11b22 100644
--- a/connectivity/source/drivers/macab/MacabStatement.cxx
+++ b/connectivity/source/drivers/macab/MacabStatement.cxx
@@ -112,11 +112,11 @@ MacabCondition *MacabCommonStatement::analyseWhereClause(const OSQLParseNode *pP
{
switch (pMiddle->getNodeType())
{
- case SQL_NODE_EQUAL:
+ case SQLNodeType::Equal:
// WHERE 0 = 1
return new MacabConditionConstant(pLeft->getTokenValue() == pRight->getTokenValue());
- case SQL_NODE_NOTEQUAL:
+ case SQLNodeType::NotEqual:
// WHERE 0 <> 1
// (might not be correct SQL... don't care, handling anyway)
return new MacabConditionConstant(pLeft->getTokenValue() != pRight->getTokenValue());
@@ -143,11 +143,11 @@ MacabCondition *MacabCommonStatement::analyseWhereClause(const OSQLParseNode *pP
switch (pMiddle->getNodeType())
{
- case SQL_NODE_EQUAL:
+ case SQLNodeType::Equal:
// WHERE Name = 'Smith'
return new MacabConditionEqual(m_pHeader, sColumnName, sMatchString);
- case SQL_NODE_NOTEQUAL:
+ case SQLNodeType::NotEqual:
// WHERE Name <> 'Jones'
return new MacabConditionDifferent(m_pHeader, sColumnName, sMatchString);
diff --git a/connectivity/source/drivers/mork/MPreparedStatement.cxx b/connectivity/source/drivers/mork/MPreparedStatement.cxx
index 99b8d7f..2591cda 100644
--- a/connectivity/source/drivers/mork/MPreparedStatement.cxx
+++ b/connectivity/source/drivers/mork/MPreparedStatement.cxx
@@ -466,7 +466,7 @@ void OPreparedStatement::scanParameter(OSQLParseNode* pParseNode,::std::vector<
if (SQL_ISRULE(pParseNode,parameter))
{
OSL_ENSURE(pParseNode->count() >= 1,"OResultSet: Faulty Parse Tree");
- OSL_ENSURE(pParseNode->getChild(0)->getNodeType() == SQL_NODE_PUNCTUATION,"OResultSet: Faulty Parse Tree");
+ OSL_ENSURE(pParseNode->getChild(0)->getNodeType() == SQLNodeType::Punctuation,"OResultSet: Faulty Parse Tree");
_rParaNodes.push_back(pParseNode);
// further search isn't necessary
diff --git a/connectivity/source/drivers/mork/MResultSet.cxx b/connectivity/source/drivers/mork/MResultSet.cxx
index c00e34e..a05037d 100644
--- a/connectivity/source/drivers/mork/MResultSet.cxx
+++ b/connectivity/source/drivers/mork/MResultSet.cxx
@@ -805,9 +805,9 @@ void OResultSet::analyseWhereClause( const OSQLParseNode* parseT
{
OSL_ENSURE(parseTree->count() == 3, "Error parsing COMPARE predicate");
if (!(SQL_ISRULE(parseTree->getChild(0),column_ref) ||
- parseTree->getChild(2)->getNodeType() == SQL_NODE_STRING ||
- parseTree->getChild(2)->getNodeType() == SQL_NODE_INTNUM ||
- parseTree->getChild(2)->getNodeType() == SQL_NODE_APPROXNUM ||
+ parseTree->getChild(2)->getNodeType() == SQLNodeType::String ||
+ parseTree->getChild(2)->getNodeType() == SQLNodeType::IntNum ||
+ parseTree->getChild(2)->getNodeType() == SQLNodeType::ApproxNum ||
SQL_ISTOKEN(parseTree->getChild(2),TRUE) ||
SQL_ISTOKEN(parseTree->getChild(2),FALSE) ||
SQL_ISRULE(parseTree->getChild(2),parameter) ||
@@ -818,9 +818,9 @@ void OResultSet::analyseWhereClause( const OSQLParseNode* parseT
}
OSQLParseNode *pPrec = parseTree->getChild(1);
- if (pPrec->getNodeType() == SQL_NODE_EQUAL)
+ if (pPrec->getNodeType() == SQLNodeType::Equal)
op = MQueryOp::Is;
- else if (pPrec->getNodeType() == SQL_NODE_NOTEQUAL)
+ else if (pPrec->getNodeType() == SQLNodeType::NotEqual)
op = MQueryOp::IsNot;
OUString sTableRange;
@@ -864,11 +864,11 @@ void OResultSet::analyseWhereClause( const OSQLParseNode* parseT
(void)pOptEscape;
const bool bNot = SQL_ISTOKEN(pPart2->getChild(0), NOT);
- if (!(pAtom->getNodeType() == SQL_NODE_STRING ||
- pAtom->getNodeType() == SQL_NODE_NAME ||
+ if (!(pAtom->getNodeType() == SQLNodeType::String ||
+ pAtom->getNodeType() == SQLNodeType::Name ||
SQL_ISRULE(pAtom,parameter) ||
- ( pAtom->getChild(0) && pAtom->getChild(0)->getNodeType() == SQL_NODE_NAME ) ||
- ( pAtom->getChild(0) && pAtom->getChild(0)->getNodeType() == SQL_NODE_STRING )
+ ( pAtom->getChild(0) && pAtom->getChild(0)->getNodeType() == SQLNodeType::Name ) ||
+ ( pAtom->getChild(0) && pAtom->getChild(0)->getNodeType() == SQLNodeType::String )
) )
{
OSL_TRACE("analyseSQL : pAtom->count() = %zu", pAtom->count() );
diff --git a/connectivity/source/parse/sqlbison.y b/connectivity/source/parse/sqlbison.y
index 2c34608..b5289df 100644
--- a/connectivity/source/parse/sqlbison.y
+++ b/connectivity/source/parse/sqlbison.y
@@ -71,9 +71,9 @@ inline connectivity::OSQLInternalNode* newNode(const OUString& _NewValue,
// yyi is the internal number of the rule that is currently being reduced
// This can be mapped to external rule number via the yyrmap.
-#define SQL_NEW_RULE newNode("", SQL_NODE_RULE, yyr1[yyn])
-#define SQL_NEW_LISTRULE newNode("", SQL_NODE_LISTRULE, yyr1[yyn])
-#define SQL_NEW_COMMALISTRULE newNode("", SQL_NODE_COMMALISTRULE, yyr1[yyn])
+#define SQL_NEW_RULE newNode("", SQLNodeType::Rule, yyr1[yyn])
+#define SQL_NEW_LISTRULE newNode("", SQLNodeType::ListRule, yyr1[yyn])
+#define SQL_NEW_COMMALISTRULE newNode("", SQLNodeType::CommaListRule, yyr1[yyn])
extern connectivity::OSQLParser* xxx_pGLOBAL_SQLPARSER;
@@ -298,7 +298,7 @@ op_schema:
{
$$ = SQL_NEW_RULE;
$$->append($1);
- $$->append(newNode(".", SQL_NODE_PUNCTUATION));
+ $$->append(newNode(".", SQLNodeType::Punctuation));
$$->append($3);
}
;
@@ -343,9 +343,9 @@ base_table_def:
$$->append($1);
$$->append($2);
$$->append($3);
- $$->append(newNode("(", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("(", SQLNodeType::Punctuation));
$$->append($5);
- $$->append(newNode(")", SQL_NODE_PUNCTUATION));}
+ $$->append(newNode(")", SQLNodeType::Punctuation));}
;
base_table_element_commalist:
@@ -418,9 +418,9 @@ column_def_opt:
| SQL_TOKEN_CHECK '(' search_condition ')'
{$$ = SQL_NEW_RULE;
$$->append($1);
- $$->append(newNode("(", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("(", SQLNodeType::Punctuation));
$$->append($3);
- $$->append(newNode(")", SQL_NODE_PUNCTUATION));}
+ $$->append(newNode(")", SQLNodeType::Punctuation));}
| SQL_TOKEN_REFERENCES table_node
{$$ = SQL_NEW_RULE;
$$->append($1);
@@ -429,53 +429,53 @@ column_def_opt:
{$$ = SQL_NEW_RULE;
$$->append($1);
$$->append($2);
- $$->append(newNode("(", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("(", SQLNodeType::Punctuation));
$$->append($4);
- $$->append(newNode(")", SQL_NODE_PUNCTUATION));}
+ $$->append(newNode(")", SQLNodeType::Punctuation));}
;
table_constraint_def:
unique_spec '(' column_commalist ')'
{$$ = SQL_NEW_RULE;
$$->append($1);
- $$->append(newNode("(", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("(", SQLNodeType::Punctuation));
$$->append($3);
- $$->append(newNode(")", SQL_NODE_PUNCTUATION));}
+ $$->append(newNode(")", SQLNodeType::Punctuation));}
| SQL_TOKEN_FOREIGN SQL_TOKEN_KEY '(' column_commalist ')' SQL_TOKEN_REFERENCES table_node
{$$ = SQL_NEW_RULE;
$$->append($1);
$$->append($2);
- $$->append(newNode("(", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("(", SQLNodeType::Punctuation));
$$->append($4);
- $$->append(newNode(")", SQL_NODE_PUNCTUATION));
+ $$->append(newNode(")", SQLNodeType::Punctuation));
$$->append($6);
$$->append($7);}
| SQL_TOKEN_FOREIGN SQL_TOKEN_KEY '(' column_commalist ')' SQL_TOKEN_REFERENCES table_node '(' column_commalist ')'
{$$ = SQL_NEW_RULE;
$$->append($1);
$$->append($2);
- $$->append(newNode("(", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("(", SQLNodeType::Punctuation));
$$->append($4);
- $$->append(newNode(")", SQL_NODE_PUNCTUATION));
+ $$->append(newNode(")", SQLNodeType::Punctuation));
$$->append($6);
$$->append($7);
- $$->append(newNode("(", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("(", SQLNodeType::Punctuation));
$$->append($9);
- $$->append(newNode(")", SQL_NODE_PUNCTUATION));}
+ $$->append(newNode(")", SQLNodeType::Punctuation));}
| SQL_TOKEN_CHECK '(' search_condition ')'
{$$ = SQL_NEW_RULE;
$$->append($1);
- $$->append(newNode("(", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("(", SQLNodeType::Punctuation));
$$->append($3);
- $$->append(newNode(")", SQL_NODE_PUNCTUATION));}
+ $$->append(newNode(")", SQLNodeType::Punctuation));}
;
op_column_commalist:
/* empty */ {$$ = SQL_NEW_RULE;}
| '(' column_commalist ')'
{$$ = SQL_NEW_RULE;
- $$->append(newNode("(", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("(", SQLNodeType::Punctuation));
$$->append($2);
- $$->append(newNode(")", SQL_NODE_PUNCTUATION));
+ $$->append(newNode(")", SQLNodeType::Punctuation));
}
;
column_commalist:
@@ -512,9 +512,9 @@ opt_column_commalist:
/* empty */ {$$ = SQL_NEW_RULE;}
| '(' column_commalist ')'
{$$ = SQL_NEW_RULE;
- $$->append(newNode("(", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("(", SQLNodeType::Punctuation));
$$->append($2);
- $$->append(newNode(")", SQL_NODE_PUNCTUATION));}
+ $$->append(newNode(")", SQLNodeType::Punctuation));}
;
privilege_def:
@@ -666,9 +666,9 @@ manipulative_statement:
| '{' odbc_call_spec '}'
{
$$ = SQL_NEW_RULE;
- $$->append(newNode("{", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("{", SQLNodeType::Punctuation));
$$->append($2);
- $$->append(newNode("}", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("}", SQLNodeType::Punctuation));
}
;
@@ -733,9 +733,9 @@ values_or_query_spec:
SQL_TOKEN_VALUES '(' table_value_const_list ')'
{$$ = SQL_NEW_RULE;
$$->append($1);
- $$->append(newNode("(", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("(", SQLNodeType::Punctuation));
$$->append($3);
- $$->append(newNode(")", SQL_NODE_PUNCTUATION));
+ $$->append(newNode(")", SQLNodeType::Punctuation));
}
;
@@ -762,9 +762,9 @@ row_value_constructor:
/* | '(' row_value_const_list ')'
{
$$ = SQL_NEW_RULE;
- $$->append(newNode("(", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("(", SQLNodeType::Punctuation));
$$->append($2);
- $$->append(newNode(")", SQL_NODE_PUNCTUATION));
+ $$->append(newNode(")", SQLNodeType::Punctuation));
}
*/
;
@@ -888,7 +888,7 @@ selection:
'*'
{
$$ = SQL_NEW_RULE;
- $$->append(newNode("*", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("*", SQLNodeType::Punctuation));
}
| scalar_exp_commalist
;
@@ -1030,17 +1030,17 @@ table_ref:
| '{' SQL_TOKEN_OJ joined_table '}'
{
$$ = SQL_NEW_RULE;
- $$->append(newNode("{", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("{", SQLNodeType::Punctuation));
$$->append($2);
$$->append($3);
- $$->append(newNode("}", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("}", SQLNodeType::Punctuation));
}
| '(' joined_table ')'
{
$$ = SQL_NEW_RULE;
- $$->append(newNode("(", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("(", SQLNodeType::Punctuation));
$$->append($2);
- $$->append(newNode(")", SQL_NODE_PUNCTUATION));
+ $$->append(newNode(")", SQLNodeType::Punctuation));
}
;
where_clause:
@@ -1088,9 +1088,9 @@ boolean_primary:
| '(' search_condition ')'
{ // boolean_primary: rule 2
$$ = SQL_NEW_RULE;
- $$->append(newNode("(", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("(", SQLNodeType::Punctuation));
$$->append($2);
- $$->append(newNode(")", SQL_NODE_PUNCTUATION));
+ $$->append(newNode(")", SQLNodeType::Punctuation));
}
| row_value_constructor_elem /*[^')' ',']*/
{
@@ -1100,15 +1100,15 @@ boolean_primary:
sal_Int16 nErg = 0;
if ( SQL_ISTOKEN( $1, NULL))
{
- OSQLParseNode* pColumnRef = newNode("", SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::column_ref));
- pColumnRef->append(newNode(xxx_pGLOBAL_SQLPARSER->getFieldName(),SQL_NODE_NAME));
- OSQLParseNode* pTFN = new OSQLInternalNode("", SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::test_for_null));
+ OSQLParseNode* pColumnRef = newNode("", SQLNodeType::Rule,OSQLParser::RuleID(OSQLParseNode::column_ref));
+ pColumnRef->append(newNode(xxx_pGLOBAL_SQLPARSER->getFieldName(),SQLNodeType::Name));
+ OSQLParseNode* pTFN = new OSQLInternalNode("", SQLNodeType::Rule,OSQLParser::RuleID(OSQLParseNode::test_for_null));
pTFN->append(pColumnRef);
- OSQLParseNode* pNPP2 = new OSQLInternalNode("", SQL_NODE_RULE, OSQLParser::RuleID(OSQLParseNode::null_predicate_part_2));
- pNPP2->append(new OSQLInternalNode("", SQL_NODE_KEYWORD, SQL_TOKEN_IS));
- pNPP2->append(new OSQLInternalNode("", SQL_NODE_RULE, OSQLParser::RuleID(OSQLParseNode::sql_not)));
- pNPP2->append(new OSQLInternalNode("", SQL_NODE_KEYWORD, SQL_TOKEN_NULL));
+ OSQLParseNode* pNPP2 = new OSQLInternalNode("", SQLNodeType::Rule, OSQLParser::RuleID(OSQLParseNode::null_predicate_part_2));
+ pNPP2->append(new OSQLInternalNode("", SQLNodeType::Keyword, SQL_TOKEN_IS));
+ pNPP2->append(new OSQLInternalNode("", SQLNodeType::Rule, OSQLParser::RuleID(OSQLParseNode::sql_not)));
+ pNPP2->append(new OSQLInternalNode("", SQLNodeType::Keyword, SQL_TOKEN_NULL));
pTFN->append(pNPP2);
$$->append(pTFN);
@@ -1142,9 +1142,9 @@ parenthesized_boolean_value_expression:
'(' search_condition ')'
{ // boolean_primary: rule 2
$$ = SQL_NEW_RULE;
- $$->append(newNode("(", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("(", SQLNodeType::Punctuation));
$$->append($2);
- $$->append(newNode(")", SQL_NODE_PUNCTUATION));
+ $$->append(newNode(")", SQLNodeType::Punctuation));
}
;
boolean_factor:
@@ -1261,7 +1261,7 @@ between_predicate_part_2:
$$ = pTemp->removeAt((sal_uInt32)0);
OSQLParseNode* pColumnRef = $$->removeAt((sal_uInt32)0);
$$->insert(0,$1);
- OSQLParseNode* pBetween_predicate = new OSQLInternalNode("", SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::between_predicate));
+ OSQLParseNode* pBetween_predicate = new OSQLInternalNode("", SQLNodeType::Rule,OSQLParser::RuleID(OSQLParseNode::between_predicate));
pBetween_predicate->append(pColumnRef);
pBetween_predicate->append($$);
$$ = pBetween_predicate;
@@ -1331,8 +1331,8 @@ like_predicate:
{
if (xxx_pGLOBAL_SQLPARSER->inPredicateCheck()) // like_predicate: rule 5
{
- OSQLParseNode* pColumnRef = newNode("", SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::column_ref));
- pColumnRef->append(newNode(xxx_pGLOBAL_SQLPARSER->getFieldName(),SQL_NODE_NAME));
+ OSQLParseNode* pColumnRef = newNode("", SQLNodeType::Rule,OSQLParser::RuleID(OSQLParseNode::column_ref));
+ pColumnRef->append(newNode(xxx_pGLOBAL_SQLPARSER->getFieldName(),SQLNodeType::Name));
$$ = SQL_NEW_RULE;
$$->append(pColumnRef);
@@ -1353,8 +1353,8 @@ like_predicate:
{
if (xxx_pGLOBAL_SQLPARSER->inPredicateCheck()) // like_predicate: rule 6
{
- OSQLParseNode* pColumnRef = newNode("", SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::column_ref));
- pColumnRef->append(newNode(xxx_pGLOBAL_SQLPARSER->getFieldName(),SQL_NODE_NAME));
+ OSQLParseNode* pColumnRef = newNode("", SQLNodeType::Rule,OSQLParser::RuleID(OSQLParseNode::column_ref));
+ pColumnRef->append(newNode(xxx_pGLOBAL_SQLPARSER->getFieldName(),SQLNodeType::Name));
$$ = SQL_NEW_RULE;
$$->append(pColumnRef);
@@ -1382,10 +1382,10 @@ opt_escape:
| '{' SQL_TOKEN_ESCAPE SQL_TOKEN_STRING '}'
{
$$ = SQL_NEW_RULE;
- $$->append(newNode("{", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("{", SQLNodeType::Punctuation));
$$->append($2);
$$->append($3);
- $$->append(newNode("}", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("}", SQLNodeType::Punctuation));
}
;
@@ -1416,8 +1416,8 @@ test_for_null:
{
if (xxx_pGLOBAL_SQLPARSER->inPredicateCheck())// test_for_null: rule 2
{
- OSQLParseNode* pColumnRef = newNode("", SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::column_ref));
- pColumnRef->append(newNode(xxx_pGLOBAL_SQLPARSER->getFieldName(),SQL_NODE_NAME));
+ OSQLParseNode* pColumnRef = newNode("", SQLNodeType::Rule,OSQLParser::RuleID(OSQLParseNode::column_ref));
+ pColumnRef->append(newNode(xxx_pGLOBAL_SQLPARSER->getFieldName(),SQLNodeType::Name));
$$ = SQL_NEW_RULE;
$$->append(pColumnRef);
@@ -1434,9 +1434,9 @@ in_predicate_value:
}
| '(' value_exp_commalist ')'
{$$ = SQL_NEW_RULE;
- $$->append(newNode("(", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("(", SQLNodeType::Punctuation));
$$->append($2);
- $$->append(newNode(")", SQL_NODE_PUNCTUATION));
+ $$->append(newNode(")", SQLNodeType::Punctuation));
}
;
in_predicate_part_2:
@@ -1459,8 +1459,8 @@ in_predicate:
{
if ( xxx_pGLOBAL_SQLPARSER->inPredicateCheck() )// in_predicate: rule 2
{
- OSQLParseNode* pColumnRef = newNode("", SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::column_ref));
- pColumnRef->append(newNode(xxx_pGLOBAL_SQLPARSER->getFieldName(),SQL_NODE_NAME));
+ OSQLParseNode* pColumnRef = newNode("", SQLNodeType::Rule,OSQLParser::RuleID(OSQLParseNode::column_ref));
+ pColumnRef->append(newNode(xxx_pGLOBAL_SQLPARSER->getFieldName(),SQLNodeType::Name));
$$ = SQL_NEW_RULE;
$$->append(pColumnRef);
@@ -1490,8 +1490,8 @@ all_or_any_predicate:
{
if(xxx_pGLOBAL_SQLPARSER->inPredicateCheck())
{
- OSQLParseNode* pColumnRef = newNode("", SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::column_ref));
- pColumnRef->append(newNode(xxx_pGLOBAL_SQLPARSER->getFieldName(),SQL_NODE_NAME));
+ OSQLParseNode* pColumnRef = newNode("", SQLNodeType::Rule,OSQLParser::RuleID(OSQLParseNode::column_ref));
+ pColumnRef->append(newNode(xxx_pGLOBAL_SQLPARSER->getFieldName(),SQLNodeType::Name));
$$ = SQL_NEW_RULE;
$$->append(pColumnRef);
@@ -1523,9 +1523,9 @@ unique_test:
subquery:
'(' query_exp ')'
{$$ = SQL_NEW_RULE;
- $$->append(newNode("(", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("(", SQLNodeType::Punctuation));
$$->append($2);
- $$->append(newNode(")", SQL_NODE_PUNCTUATION));}
+ $$->append(newNode(")", SQLNodeType::Punctuation));}
;
/* scalar expressions */
@@ -1546,8 +1546,8 @@ select_sublist:
{
$$ = SQL_NEW_RULE;
$$->append($1);
- $$->append(newNode(".", SQL_NODE_PUNCTUATION));
- $$->append(newNode("*", SQL_NODE_PUNCTUATION));
+ $$->append(newNode(".", SQLNodeType::Punctuation));
+ $$->append(newNode("*", SQLNodeType::Punctuation));
}
*/
derived_column
@@ -1562,24 +1562,24 @@ parameter_ref:
op_like:
'*'
{
- $$ = newNode("*", SQL_NODE_PUNCTUATION);
+ $$ = newNode("*", SQLNodeType::Punctuation);
}
| '?'
{
- $$ = newNode("?", SQL_NODE_PUNCTUATION);
+ $$ = newNode("?", SQLNodeType::Punctuation);
}
| op_like '*'
{
$$ = SQL_NEW_RULE;
$$->append($1);
- $$->append(newNode("*", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("*", SQLNodeType::Punctuation));
xxx_pGLOBAL_SQLPARSER->reduceLiteral($$, sal_False);
}
| op_like '?'
{
$$ = SQL_NEW_RULE;
$$->append($1);
- $$->append(newNode("?", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("?", SQLNodeType::Punctuation));
xxx_pGLOBAL_SQLPARSER->reduceLiteral($$, sal_False);
}
;
@@ -1659,19 +1659,19 @@ position_exp:
{
$$ = SQL_NEW_RULE;
$$->append($1);
- $$->append(newNode("(", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("(", SQLNodeType::Punctuation));
$$->append($3);
$$->append($4);
$$->append($5);
- $$->append(newNode(")", SQL_NODE_PUNCTUATION));
+ $$->append(newNode(")", SQLNodeType::Punctuation));
}
| SQL_TOKEN_POSITION '(' value_exp_commalist ')'
{
$$ = SQL_NEW_RULE;
$$->append($1);
- $$->append(newNode("(", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("(", SQLNodeType::Punctuation));
$$->append($3);
- $$->append(newNode(")", SQL_NODE_PUNCTUATION));
+ $$->append(newNode(")", SQLNodeType::Punctuation));
}
;
num_value_fct:
@@ -1684,17 +1684,17 @@ char_length_exp:
{
$$ = SQL_NEW_RULE;
$$->append($1);
- $$->append(newNode("(", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("(", SQLNodeType::Punctuation));
$$->append($3);
- $$->append(newNode(")", SQL_NODE_PUNCTUATION));
+ $$->append(newNode(")", SQLNodeType::Punctuation));
}
| SQL_TOKEN_SQL_TOKEN_INTNUM '(' value_exp ')'
{
$$ = SQL_NEW_RULE;
$$->append($1);
- $$->append(newNode("(", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("(", SQLNodeType::Punctuation));
$$->append($3);
- $$->append(newNode(")", SQL_NODE_PUNCTUATION));
+ $$->append(newNode(")", SQLNodeType::Punctuation));
}
;
@@ -1703,9 +1703,9 @@ octet_length_exp:
{
$$ = SQL_NEW_RULE;
$$->append($1);
- $$->append(newNode("(", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("(", SQLNodeType::Punctuation));
$$->append($3);
- $$->append(newNode(")", SQL_NODE_PUNCTUATION));
+ $$->append(newNode(")", SQLNodeType::Punctuation));
}
;
bit_length_exp:
@@ -1713,9 +1713,9 @@ bit_length_exp:
{
$$ = SQL_NEW_RULE;
$$->append($1);
- $$->append(newNode("(", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("(", SQLNodeType::Punctuation));
$$->append($3);
- $$->append(newNode(")", SQL_NODE_PUNCTUATION));
+ $$->append(newNode(")", SQLNodeType::Punctuation));
}
;
length_exp:
@@ -1769,11 +1769,11 @@ extract_exp:
{
$$ = SQL_NEW_RULE;
$$->append($1);
- $$->append(newNode("(", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("(", SQLNodeType::Punctuation));
$$->append($3);
$$->append($4);
$$->append($5);
- $$->append(newNode(")", SQL_NODE_PUNCTUATION));
+ $$->append(newNode(")", SQLNodeType::Punctuation));
}
;
unsigned_value_spec:
@@ -1801,63 +1801,63 @@ set_fct_spec:
| '{' odbc_fct_spec '}'
{
$$ = SQL_NEW_RULE;
- $$->append(newNode("{", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("{", SQLNodeType::Punctuation));
$$->append($2);
- $$->append(newNode("}", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("}", SQLNodeType::Punctuation));
}
| function_name '(' ')'
{
$$ = SQL_NEW_RULE;
$$->append($1);
- $$->append(newNode("(", SQL_NODE_PUNCTUATION));
- $$->append(newNode(")", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("(", SQLNodeType::Punctuation));
+ $$->append(newNode(")", SQLNodeType::Punctuation));
}
| function_name0 '(' ')'
{
$$ = SQL_NEW_RULE;
$$->append($1);
- $$->append(newNode("(", SQL_NODE_PUNCTUATION));
- $$->append(newNode(")", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("(", SQLNodeType::Punctuation));
+ $$->append(newNode(")", SQLNodeType::Punctuation));
}
| function_name1 '(' function_arg ')'
{
$$ = SQL_NEW_RULE;
$$->append($1);
- $$->append(newNode("(", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("(", SQLNodeType::Punctuation));
$$->append($3);
- $$->append(newNode(")", SQL_NODE_PUNCTUATION));
+ $$->append(newNode(")", SQLNodeType::Punctuation));
}
| function_name2 '(' function_arg_commalist2 ')'
{
$$ = SQL_NEW_RULE;
$$->append($1);
- $$->append(newNode("(", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("(", SQLNodeType::Punctuation));
$$->append($3);
- $$->append(newNode(")", SQL_NODE_PUNCTUATION));
+ $$->append(newNode(")", SQLNodeType::Punctuation));
}
| function_name3 '(' function_arg_commalist3 ')'
{
$$ = SQL_NEW_RULE;
$$->append($1);
- $$->append(newNode("(", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("(", SQLNodeType::Punctuation));
$$->append($3);
- $$->append(newNode(")", SQL_NODE_PUNCTUATION));
+ $$->append(newNode(")", SQLNodeType::Punctuation));
}
| string_function_4Argument '(' function_arg_commalist4 ')'
{
$$ = SQL_NEW_RULE;
$$->append($1);
- $$->append(newNode("(", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("(", SQLNodeType::Punctuation));
$$->append($3);
- $$->append(newNode(")", SQL_NODE_PUNCTUATION));
+ $$->append(newNode(")", SQLNodeType::Punctuation));
}
| function_name '(' function_args_commalist ')'
{
$$ = SQL_NEW_RULE;
$$->append($1);
- $$->append(newNode("(", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("(", SQLNodeType::Punctuation));
$$->append($3);
- $$->append(newNode(")", SQL_NODE_PUNCTUATION));
+ $$->append(newNode(")", SQLNodeType::Punctuation));
}
| function_name12 '(' function_args_commalist ')'
{
@@ -1865,9 +1865,9 @@ set_fct_spec:
{
$$ = SQL_NEW_RULE;
$$->append($1);
- $$->append(newNode("(", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("(", SQLNodeType::Punctuation));
$$->append($3);
- $$->append(newNode(")", SQL_NODE_PUNCTUATION));
+ $$->append(newNode(")", SQLNodeType::Punctuation));
}
else
YYERROR;
@@ -1878,9 +1878,9 @@ set_fct_spec:
{
$$ = SQL_NEW_RULE;
$$->append($1);
- $$->append(newNode("(", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("(", SQLNodeType::Punctuation));
$$->append($3);
- $$->append(newNode(")", SQL_NODE_PUNCTUATION));
+ $$->append(newNode(")", SQLNodeType::Punctuation));
}
else
YYERROR;
@@ -2020,15 +2020,15 @@ window_function_type :
{
$$ = SQL_NEW_RULE;
$$->append($1);
- $$->append(newNode("(", SQL_NODE_PUNCTUATION));
- $$->append(newNode(")", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("(", SQLNodeType::Punctuation));
+ $$->append(newNode(")", SQLNodeType::Punctuation));
}
| SQL_TOKEN_ROW_NUMBER '(' ')'
{
$$ = SQL_NEW_RULE;
$$->append($1);
- $$->append(newNode("(", SQL_NODE_PUNCTUATION));
- $$->append(newNode(")", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("(", SQLNodeType::Punctuation));
+ $$->append(newNode(")", SQLNodeType::Punctuation));
}
| general_set_fct
| ntile_function
@@ -2041,9 +2041,9 @@ ntile_function :
{
$$ = SQL_NEW_RULE;
$$->append($1);
- $$->append(newNode("(", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("(", SQLNodeType::Punctuation));
$$->append($3);
- $$->append(newNode(")", SQL_NODE_PUNCTUATION));
+ $$->append(newNode(")", SQLNodeType::Punctuation));
}
;
dynamic_parameter_specification:
@@ -2061,15 +2061,15 @@ opt_lead_or_lag_function:
| ',' offset
{
$$ = SQL_NEW_RULE;
- $$->append(newNode(",", SQL_NODE_PUNCTUATION));
+ $$->append(newNode(",", SQLNodeType::Punctuation));
$$->append($2);
}
| ',' offset ',' default_expression
{
$$ = SQL_NEW_RULE;
- $$->append(newNode(",", SQL_NODE_PUNCTUATION));
+ $$->append(newNode(",", SQLNodeType::Punctuation));
$$->append($2);
- $$->append(newNode(",", SQL_NODE_PUNCTUATION));
+ $$->append(newNode(",", SQLNodeType::Punctuation));
$$->append($4);
}
;
@@ -2083,10 +2083,10 @@ lead_or_lag_function:
{
$$ = SQL_NEW_RULE;
$$->append($1);
- $$->append(newNode("(", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("(", SQLNodeType::Punctuation));
$$->append($3);
$$->append($4);
- $$->append(newNode(")", SQL_NODE_PUNCTUATION));
+ $$->append(newNode(")", SQLNodeType::Punctuation));
$$->append($6);
}
;
@@ -2112,9 +2112,9 @@ first_or_last_value_function:
{
$$ = SQL_NEW_RULE;
$$->append($1);
- $$->append(newNode("(", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("(", SQLNodeType::Punctuation));
$$->append($3);
- $$->append(newNode(")", SQL_NODE_PUNCTUATION));
+ $$->append(newNode(")", SQLNodeType::Punctuation));
$$->append($5);
}
;
@@ -2131,11 +2131,11 @@ nth_value_function:
{
$$ = SQL_NEW_RULE;
$$->append($1);
- $$->append(newNode("(", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("(", SQLNodeType::Punctuation));
$$->append($3);
- $$->append(newNode(",", SQL_NODE_PUNCTUATION));
+ $$->append(newNode(",", SQLNodeType::Punctuation));
$$->append($5);
- $$->append(newNode(")", SQL_NODE_PUNCTUATION));
+ $$->append(newNode(")", SQLNodeType::Punctuation));
$$->append($7);
$$->append($8);
}
@@ -2204,9 +2204,9 @@ window_specification:
'(' window_specification_details ')'
{
$$ = SQL_NEW_RULE;
- $$->append(newNode("(", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("(", SQLNodeType::Punctuation));
$$->append($2);
- $$->append(newNode(")", SQL_NODE_PUNCTUATION));
+ $$->append(newNode(")", SQLNodeType::Punctuation));
}
;
opt_existing_window_name:
@@ -2366,7 +2366,7 @@ op_parameter:
| '?' SQL_EQUAL
{
$$ = SQL_NEW_RULE;
- $$->append(newNode("?", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("?", SQLNodeType::Punctuation));
$$->append($2);
}
;
@@ -2386,9 +2386,9 @@ op_odbc_call_parameter:
| '(' odbc_parameter_commalist ')'
{
$$ = SQL_NEW_RULE;
- $$->append(newNode("(", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("(", SQLNodeType::Punctuation));
$$->append($2);
- $$->append(newNode(")", SQL_NODE_PUNCTUATION));
+ $$->append(newNode(")", SQLNodeType::Punctuation));
}
;
@@ -2434,27 +2434,27 @@ general_set_fct:
{
$$ = SQL_NEW_RULE;
$$->append($1);
- $$->append(newNode("(", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("(", SQLNodeType::Punctuation));
$$->append($3);
$$->append($4);
- $$->append(newNode(")", SQL_NODE_PUNCTUATION));
+ $$->append(newNode(")", SQLNodeType::Punctuation));
}
| SQL_TOKEN_COUNT '(' '*' ')'
{
$$ = SQL_NEW_RULE;
$$->append($1);
- $$->append(newNode("(", SQL_NODE_PUNCTUATION));
- $$->append(newNode("*", SQL_NODE_PUNCTUATION));
- $$->append(newNode(")", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("(", SQLNodeType::Punctuation));
+ $$->append(newNode("*", SQLNodeType::Punctuation));
+ $$->append(newNode(")", SQLNodeType::Punctuation));
}
| SQL_TOKEN_COUNT '(' opt_all_distinct function_arg ')'
{
$$ = SQL_NEW_RULE;
$$->append($1);
- $$->append(newNode("(", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("(", SQLNodeType::Punctuation));
$$->append($3);
$$->append($4);
- $$->append(newNode(")", SQL_NODE_PUNCTUATION));
+ $$->append(newNode(")", SQLNodeType::Punctuation));
}
| ordered_set_function
| array_aggregate_function
@@ -2485,20 +2485,20 @@ hypothetical_set_function:
{
$$ = SQL_NEW_RULE;
$$->append($1);
- $$->append(newNode("(", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("(", SQLNodeType::Punctuation));
$$->append($3);
- $$->append(newNode(")", SQL_NODE_PUNCTUATION));
+ $$->append(newNode(")", SQLNodeType::Punctuation));
$$->append($5);
}
| rank_function_type '(' hypothetical_set_function_value_expression_list SQL_TOKEN_BY value_exp_commalist ')' within_group_specification
{
$$ = SQL_NEW_RULE;
$$->append($1);
- $$->append(newNode("(", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("(", SQLNodeType::Punctuation));
$$->append($3);
$$->append($4);
$$->append($5);
- $$->append(newNode(")", SQL_NODE_PUNCTUATION));
+ $$->append(newNode(")", SQLNodeType::Punctuation));
$$->append($7);
}
;
@@ -2512,9 +2512,9 @@ within_group_specification:
$$ = SQL_NEW_RULE;
$$->append($1);
$$->append($2);
- $$->append(newNode("(", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("(", SQLNodeType::Punctuation));
$$->append($4);
- $$->append(newNode(")", SQL_NODE_PUNCTUATION));
+ $$->append(newNode(")", SQLNodeType::Punctuation));
}
;
hypothetical_set_function_value_expression_list:
@@ -2526,9 +2526,9 @@ inverse_distribution_function:
{
$$ = SQL_NEW_RULE;
$$->append($1);
- $$->append(newNode("(", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("(", SQLNodeType::Punctuation));
$$->append($3);
- $$->append(newNode(")", SQL_NODE_PUNCTUATION));
+ $$->append(newNode(")", SQLNodeType::Punctuation));
}
;
inverse_distribution_function_argument:
@@ -2544,10 +2544,10 @@ array_aggregate_function:
{
$$ = SQL_NEW_RULE;
$$->append($1);
- $$->append(newNode("(", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("(", SQLNodeType::Punctuation));
$$->append($3);
$$->append($4);
- $$->append(newNode(")", SQL_NODE_PUNCTUATION));
+ $$->append(newNode(")", SQLNodeType::Punctuation));
}
;
@@ -2642,9 +2642,9 @@ named_columns_join:
{
$$ = SQL_NEW_RULE;
$$->append($1);
- $$->append(newNode("(", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("(", SQLNodeType::Punctuation));
$$->append($3);
- $$->append(newNode(")", SQL_NODE_PUNCTUATION));
+ $$->append(newNode(")", SQLNodeType::Punctuation));
}
;
simple_table:
@@ -2657,9 +2657,9 @@ non_join_query_primary:
| '(' non_join_query_exp ')'
{
$$ = SQL_NEW_RULE;
- $$->append(newNode("(", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("(", SQLNodeType::Punctuation));
$$->append($2);
- $$->append(newNode(")", SQL_NODE_PUNCTUATION));
+ $$->append(newNode(")", SQLNodeType::Punctuation));
}
;
non_join_query_term:
@@ -2717,11 +2717,11 @@ cast_spec:
{
$$ = SQL_NEW_RULE;
$$->append($1);
- $$->append(newNode("(", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("(", SQLNodeType::Punctuation));
$$->append($3);
$$->append($4);
$$->append($5);
- $$->append(newNode(")", SQL_NODE_PUNCTUATION));
+ $$->append(newNode(")", SQLNodeType::Punctuation));
}
;
value_exp_primary:
@@ -2734,9 +2734,9 @@ value_exp_primary:
| '(' value_exp ')'
{
$$ = SQL_NEW_RULE;
- $$->append(newNode("(", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("(", SQLNodeType::Punctuation));
$$->append($2);
- $$->append(newNode(")", SQL_NODE_PUNCTUATION));
+ $$->append(newNode(")", SQLNodeType::Punctuation));
}
| cast_spec
;
@@ -2750,13 +2750,13 @@ factor:
| '-' num_primary %prec SQL_TOKEN_UMINUS
{
$$ = SQL_NEW_RULE;
- $$->append(newNode("-", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("-", SQLNodeType::Punctuation));
$$->append($2);
}
| '+' num_primary %prec SQL_TOKEN_UMINUS
{
$$ = SQL_NEW_RULE;
- $$->append(newNode("+", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("+", SQLNodeType::Punctuation));
$$->append($2);
}
;
@@ -2767,14 +2767,14 @@ term:
{
$$ = SQL_NEW_RULE;
$$->append($1);
- $$->append(newNode("*", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("*", SQLNodeType::Punctuation));
$$->append($3);
}
| term '/' factor
{
$$ = SQL_NEW_RULE;
$$->append($1);
- $$->append(newNode("/", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("/", SQLNodeType::Punctuation));
$$->append($3);
}
;
@@ -2785,14 +2785,14 @@ num_value_exp:
{
$$ = SQL_NEW_RULE;
$$->append($1);
- $$->append(newNode("+", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("+", SQLNodeType::Punctuation));
$$->append($3);
}
| num_value_exp '-' term
{
$$ = SQL_NEW_RULE;
$$->append($1);
- $$->append(newNode("-", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("-", SQLNodeType::Punctuation));
$$->append($3);
}
;
@@ -2874,14 +2874,14 @@ interval_term:
{
$$ = SQL_NEW_RULE;
$$->append($1);
- $$->append(newNode("*", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("*", SQLNodeType::Punctuation));
$$->append($3);
}
| interval_term '/' factor
{
$$ = SQL_NEW_RULE;
$$->append($1);
- $$->append(newNode("/", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("/", SQLNodeType::Punctuation));
$$->append($3);
}
;
@@ -2896,21 +2896,21 @@ datetime_value_exp:
{
$$ = SQL_NEW_RULE;
$$->append($1);
- $$->append(newNode("+", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("+", SQLNodeType::Punctuation));
$$->append($3);
}
| datetime_value_exp '+' interval_term
{
$$ = SQL_NEW_RULE;
$$->append($1);
- $$->append(newNode("+", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("+", SQLNodeType::Punctuation));
$$->append($3);
}
| datetime_value_exp '-' interval_term
{
$$ = SQL_NEW_RULE;
$$->append($1);
- $$->append(newNode("-", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("-", SQLNodeType::Punctuation));
$$->append($3);
}
*/ ;
@@ -2925,24 +2925,24 @@ interval_value_exp:
{
$$ = SQL_NEW_RULE;
$$->append($1);
- $$->append(newNode("+", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("+", SQLNodeType::Punctuation));
$$->append($3);
}
| interval_value_exp '-' interval_term
{
$$ = SQL_NEW_RULE;
$$->append($1);
- $$->append(newNode("-", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("-", SQLNodeType::Punctuation));
$$->append($3);
}
| '(' datetime_value_exp '-' datetime_term ')' interval_qualifier
{
$$ = SQL_NEW_RULE;
- $$->append(newNode("(", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("(", SQLNodeType::Punctuation));
$$->append($2);
- $$->append(newNode("-", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("-", SQLNodeType::Punctuation));
$$->append($4);
- $$->append(newNode(")", SQL_NODE_PUNCTUATION));
+ $$->append(newNode(")", SQLNodeType::Punctuation));
$$->append($6);
}
;
@@ -3113,7 +3113,7 @@ concatenation:
{
$$ = SQL_NEW_RULE;
$$->append($1);
- $$->append(newNode("+", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("+", SQLNodeType::Punctuation));
$$->append($3);
}
| value_exp SQL_CONCAT value_exp
@@ -3162,12 +3162,12 @@ bit_substring_fct:
{
$$ = SQL_NEW_RULE;
$$->append($1);
- $$->append(newNode("(", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("(", SQLNodeType::Punctuation));
$$->append($3);
$$->append($4);
$$->append($5);
$$->append($6);
- $$->append(newNode(")", SQL_NODE_PUNCTUATION));
+ $$->append(newNode(")", SQLNodeType::Punctuation));
}
;
bit_value_exp:
@@ -3189,7 +3189,7 @@ bit_concatenation:
{
$$ = SQL_NEW_RULE;
$$->append($1);
- $$->append(newNode("+", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("+", SQLNodeType::Punctuation));
$$->append($3);
}
;
@@ -3247,20 +3247,20 @@ char_substring_fct:
{
$$ = SQL_NEW_RULE;
$$->append($1);
- $$->append(newNode("(", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("(", SQLNodeType::Punctuation));
$$->append($3);
$$->append($4);
$$->append($5);
$$->append($6);
- $$->append(newNode(")", SQL_NODE_PUNCTUATION));
+ $$->append(newNode(")", SQLNodeType::Punctuation));
}
| SQL_TOKEN_SUBSTRING '(' value_exp_commalist ')'
{
$$ = SQL_NEW_RULE;
$$->append($1);
- $$->append(newNode("(", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("(", SQLNodeType::Punctuation));
$$->append($3);
- $$->append(newNode(")", SQL_NODE_PUNCTUATION));
+ $$->append(newNode(")", SQLNodeType::Punctuation));
}
;
upper_lower:
@@ -3272,9 +3272,9 @@ fold:
{
$$ = SQL_NEW_RULE;
$$->append($1);
- $$->append(newNode("(", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("(", SQLNodeType::Punctuation));
$$->append($3);
- $$->append(newNode(")", SQL_NODE_PUNCTUATION));
+ $$->append(newNode(")", SQLNodeType::Punctuation));
}
;
form_conversion:
@@ -3282,21 +3282,21 @@ form_conversion:
{
$$ = SQL_NEW_RULE;
$$->append($1);
- $$->append(newNode("(", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("(", SQLNodeType::Punctuation));
$$->append($3);
$$->append($4);
$$->append($5);
- $$->append(newNode(")", SQL_NODE_PUNCTUATION));
+ $$->append(newNode(")", SQLNodeType::Punctuation));
}
| SQL_TOKEN_CONVERT '(' cast_operand ',' cast_target ')'
{
$$ = SQL_NEW_RULE;
$$->append($1);
- $$->append(newNode("(", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("(", SQLNodeType::Punctuation));
$$->append($3);
- $$->append(newNode(",", SQL_NODE_PUNCTUATION));
+ $$->append(newNode(",", SQLNodeType::Punctuation));
$$->append($5);
- $$->append(newNode(")", SQL_NODE_PUNCTUATION));
+ $$->append(newNode(")", SQLNodeType::Punctuation));
}
;
char_translation:
@@ -3304,11 +3304,11 @@ char_translation:
{
$$ = SQL_NEW_RULE;
$$->append($1);
- $$->append(newNode("(", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("(", SQLNodeType::Punctuation));
$$->append($3);
$$->append($4);
$$->append($5);
- $$->append(newNode(")", SQL_NODE_PUNCTUATION));
+ $$->append(newNode(")", SQLNodeType::Punctuation));
}
;
trim_fct:
@@ -3316,9 +3316,9 @@ trim_fct:
{
$$ = SQL_NEW_RULE;
$$->append($1);
- $$->append(newNode("(", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("(", SQLNodeType::Punctuation));
$$->append($3);
- $$->append(newNode(")", SQL_NODE_PUNCTUATION));
+ $$->append(newNode(")", SQLNodeType::Punctuation));
}
;
trim_operands:
@@ -3378,14 +3378,14 @@ catalog_name:
{
$$ = SQL_NEW_RULE;
$$->append($1);
- $$->append(newNode(".", SQL_NODE_PUNCTUATION));
+ $$->append(newNode(".", SQLNodeType::Punctuation));
$$->append($3);
}
| SQL_TOKEN_NAME ':' schema_name
{
$$ = SQL_NEW_RULE;
$$->append($1);
- $$->append(newNode(":", SQL_NODE_PUNCTUATION));
+ $$->append(newNode(":", SQLNodeType::Punctuation));
$$->append($3);
}
;
@@ -3394,7 +3394,7 @@ schema_name:
{
$$ = SQL_NEW_RULE;
$$->append($1);
- $$->append(newNode(".", SQL_NODE_PUNCTUATION));
+ $$->append(newNode(".", SQLNodeType::Punctuation));
$$->append($3);
}
;
@@ -3412,50 +3412,50 @@ column_ref:
/* | table_node '.' column_val %prec '.'
{$$ = SQL_NEW_RULE;
$$->append($1);
- $$->append(newNode(".", SQL_NODE_PUNCTUATION));
+ $$->append(newNode(".", SQLNodeType::Punctuation));
$$->append($3);}
*/
| SQL_TOKEN_NAME '.' column_val %prec '.'
{$$ = SQL_NEW_RULE;
$$->append($1);
- $$->append(newNode(".", SQL_NODE_PUNCTUATION));
+ $$->append(newNode(".", SQLNodeType::Punctuation));
$$->append($3);
}
| SQL_TOKEN_NAME '.' SQL_TOKEN_NAME '.' column_val %prec '.'
{$$ = SQL_NEW_RULE;
$$->append($1);
- $$->append(newNode(".", SQL_NODE_PUNCTUATION));
+ $$->append(newNode(".", SQLNodeType::Punctuation));
$$->append($3);
- $$->append(newNode(".", SQL_NODE_PUNCTUATION));
+ $$->append(newNode(".", SQLNodeType::Punctuation));
$$->append($5);}
| SQL_TOKEN_NAME '.' SQL_TOKEN_NAME '.' SQL_TOKEN_NAME '.' column_val %prec '.'
{$$ = SQL_NEW_RULE;
$$->append($1);
- $$->append(newNode(".", SQL_NODE_PUNCTUATION));
+ $$->append(newNode(".", SQLNodeType::Punctuation));
$$->append($3);
- $$->append(newNode(".", SQL_NODE_PUNCTUATION));
+ $$->append(newNode(".", SQLNodeType::Punctuation));
$$->append($5);
- $$->append(newNode(".", SQL_NODE_PUNCTUATION));
+ $$->append(newNode(".", SQLNodeType::Punctuation));
$$->append($7);
}
| SQL_TOKEN_NAME ':' SQL_TOKEN_NAME '.' SQL_TOKEN_NAME '.' column_val %prec '.'
{$$ = SQL_NEW_RULE;
$$->append($1);
- $$->append(newNode(":", SQL_NODE_PUNCTUATION));
+ $$->append(newNode(":", SQLNodeType::Punctuation));
$$->append($3);
- $$->append(newNode(".", SQL_NODE_PUNCTUATION));
+ $$->append(newNode(".", SQLNodeType::Punctuation));
$$->append($5);
- $$->append(newNode(".", SQL_NODE_PUNCTUATION));
+ $$->append(newNode(".", SQLNodeType::Punctuation));
$$->append($7);
}
/* | SQL_TOKEN_NAME ';' SQL_TOKEN_NAME '.' SQL_TOKEN_NAME '.' column_val
{$$ = SQL_NEW_RULE;
$$->append($1);
- $$->append(newNode(";", SQL_NODE_PUNCTUATION));
+ $$->append(newNode(";", SQLNodeType::Punctuation));
$$->append($3);
- $$->append(newNode(".", SQL_NODE_PUNCTUATION));
+ $$->append(newNode(".", SQLNodeType::Punctuation));
$$->append($5);
- $$->append(newNode(".", SQL_NODE_PUNCTUATION));
+ $$->append(newNode(".", SQLNodeType::Punctuation));
$$->append($7);
}
*/ ;
@@ -3468,7 +3468,7 @@ column_val:
| '*'
{
$$ = SQL_NEW_RULE;
- $$->append(newNode("*", SQL_NODE_PUNCTUATION));
+ $$->append(newNode("*", SQLNodeType::Punctuation));
}
;
data_type:
@@ -3551,9 +3551,9 @@ paren_char_length:
'(' SQL_TOKEN_INTNUM ')'
{
$$ = SQL_NEW_RULE;
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list