diff options
Diffstat (limited to 'connectivity/source/parse/sqlbison.y')
| -rw-r--r-- | connectivity/source/parse/sqlbison.y | 184 |
1 files changed, 92 insertions, 92 deletions
diff --git a/connectivity/source/parse/sqlbison.y b/connectivity/source/parse/sqlbison.y index 9e718fd2062c..28d78890bfa6 100644 --- a/connectivity/source/parse/sqlbison.y +++ b/connectivity/source/parse/sqlbison.y @@ -1,7 +1,7 @@ %{ //-------------------------------------------------------------------------- // -// $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/connectivity/source/parse/sqlbison.y,v 1.9 2001-01-09 13:07:48 oj Exp $ +// $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/connectivity/source/parse/sqlbison.y,v 1.10 2001-01-10 12:56:33 vg Exp $ // // Copyright 2000 Sun Microsystems, Inc. All Rights Reserved. // @@ -9,7 +9,7 @@ // OJ // // Last change: -// $Author: oj $ $Date: 2001-01-09 13:07:48 $ $Revision: 1.9 $ +// $Author: vg $ $Date: 2001-01-10 12:56:33 $ $Revision: 1.10 $ // // Description: // @@ -228,7 +228,7 @@ using namespace connectivity; %type <pParseNode> all query_primary as not for_length upper_lower comparison column_val cross_union /*opt_schema_element_list*/ %type <pParseNode> /*op_authorization op_schema*/ nil_fkt schema_element base_table_def base_table_element base_table_element_commalist %type <pParseNode> column_def odbc_fct_spec odbc_call_spec odbc_fct_type op_parameter union_statement -%type <pParseNode> op_odbc_call_parameter odbc_parameter_commalist odbc_parameter
+%type <pParseNode> op_odbc_call_parameter odbc_parameter_commalist odbc_parameter %type <pParseNode> catalog_name schema_name table_node %% @@ -1513,8 +1513,8 @@ select_sublist: $$->append($1); $$->append($2 = newNode(".", SQL_NODE_PUNCTUATION)); $$->append($3 = newNode("*", SQL_NODE_PUNCTUATION)); - }
-*/
+ } +*/ derived_column ; @@ -2664,37 +2664,37 @@ derived_column: $$->append($2); } ; -/* Tabellenname */
-table_node:
- catalog_name
- | schema_name
- | table_name
-;
-catalog_name:
- SQL_TOKEN_NAME '.' schema_name
- {
- $$ = SQL_NEW_RULE;
- $$->append($1);
- $$->append($2 = newNode(".", SQL_NODE_PUNCTUATION));
- $$->append($3);
- }
- | SQL_TOKEN_NAME ':' schema_name
- {
- $$ = SQL_NEW_RULE;
- $$->append($1);
- $$->append($2 = newNode(":", SQL_NODE_PUNCTUATION));
- $$->append($3);
- }
-;
-schema_name:
- SQL_TOKEN_NAME '.' table_name
- {
- $$ = SQL_NEW_RULE;
- $$->append($1);
- $$->append($2 = newNode(".", SQL_NODE_PUNCTUATION));
- $$->append($3);
- }
-;
+/* Tabellenname */ +table_node: + catalog_name + | schema_name + | table_name +; +catalog_name: + SQL_TOKEN_NAME '.' schema_name + { + $$ = SQL_NEW_RULE; + $$->append($1); + $$->append($2 = newNode(".", SQL_NODE_PUNCTUATION)); + $$->append($3); + } + | SQL_TOKEN_NAME ':' schema_name + { + $$ = SQL_NEW_RULE; + $$->append($1); + $$->append($2 = newNode(":", SQL_NODE_PUNCTUATION)); + $$->append($3); + } +; +schema_name: + SQL_TOKEN_NAME '.' table_name + { + $$ = SQL_NEW_RULE; + $$->append($1); + $$->append($2 = newNode(".", SQL_NODE_PUNCTUATION)); + $$->append($3); + } +; table_name: SQL_TOKEN_NAME @@ -2726,7 +2726,7 @@ table_name: $$->append($3); $$->append($4 = newNode(".", SQL_NODE_PUNCTUATION)); $$->append($5);} -*/ ;
+*/ ; /* Columns */ column_ref: column @@ -2923,9 +2923,9 @@ using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::i18n; -using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::lang; using namespace ::com::sun::star::util; -using namespace ::osl;
+using namespace ::osl; using namespace ::dbtools; // using namespace connectivity; @@ -2940,7 +2940,7 @@ struct _ConstAsciiString_ operator rtl::OUString () const { return rtl::OUString(str, length, RTL_TEXTENCODING_ASCII_US); } // operator ::rtl::OUString () const { return ::rtl::OUString(str, length, RTL_TEXTENCODING_ASCII_US); } - operator const sal_Char * () const { return str; }
+ operator const sal_Char * () const { return str; } operator ::rtl::OString() const { return str; } }; @@ -3065,16 +3065,16 @@ const Locale& OParseContext::getDefaultLocale() static Locale aIntl(::rtl::OUString::createFromAscii("en_US"),::rtl::OUString::createFromAscii("en_US"),::rtl::OUString()); static sal_Bool bInitialized = sal_False; if (!bInitialized) - {
+ { // ensure that the two members we're interested in are really set // (if the system doesn't know the locale en_US aIntl would be initialized with the // system language which may be anything - which we don't want ...) - // 74342 - 21.03.00 - FS
-
- // TODO check the decimal sep and thousand sep
-// if(!m_xLocaleData.is())
-// m_xLocaleData = Reference<XLocaleData>(m_xServiceFactory->createInstance(::rtl::OUString::createFromAscii("com.sun.star.i18n.LocaleData")),UNO_QUERY);
-//
+ // 74342 - 21.03.00 - FS + + // TODO check the decimal sep and thousand sep +// if(!m_xLocaleData.is()) +// m_xLocaleData = Reference<XLocaleData>(m_xServiceFactory->createInstance(::rtl::OUString::createFromAscii("com.sun.star.i18n.LocaleData")),UNO_QUERY); +// // m_xLocaleData->getLocaleItem(*m_pLocale). // aIntl.SetNumThousandSep(','); // aIntl.SetNumDecimalSep('.'); @@ -3165,7 +3165,7 @@ OSQLParser::OSQLParser(const ::com::sun::star::uno::Reference< ::com::sun::star: :m_pContext(_pContext) ,m_pParseTree(NULL) ,m_pLocale(NULL) - ,m_nFormatKey(0)
+ ,m_nFormatKey(0) ,m_xServiceFactory(_xServiceFactory) { @@ -3184,9 +3184,9 @@ OSQLParser::OSQLParser(const ::com::sun::star::uno::Reference< ::com::sun::star: { s_pScanner = new OSQLScanner(); s_pScanner->setScanner(); - s_pGarbageCollector = new OSQLParseNodes();
-
- if(!m_xLocaleData.is())
+ s_pGarbageCollector = new OSQLParseNodes(); + + if(!m_xLocaleData.is()) m_xLocaleData = Reference<XLocaleData>(m_xServiceFactory->createInstance(::rtl::OUString::createFromAscii("com.sun.star.i18n.LocaleData")),UNO_QUERY); // auf 0 zuruecksetzen @@ -3213,15 +3213,15 @@ OSQLParser::~OSQLParser() delete s_pGarbageCollector; s_pGarbageCollector = NULL; - }
+ } m_xLocaleData = NULL; } } // ------------------------------------------------------------------------- void OSQLParser::setParseTree(OSQLParseNode * pNewParseTree) { - ::osl::MutexGuard aGuard(s_aMutex);
- m_pParseTree = pNewParseTree;
+ ::osl::MutexGuard aGuard(s_aMutex); + m_pParseTree = pNewParseTree; } //----------------------------------------------------------------------------- OSQLParseNode* OSQLParser::parseTree(::rtl::OUString& rErrorMessage, @@ -3231,8 +3231,8 @@ OSQLParseNode* OSQLParser::parseTree(::rtl::OUString& rErrorMessage, // Guard the parsing - ::osl::MutexGuard aGuard(s_aMutex);
- // must be reset
+ ::osl::MutexGuard aGuard(s_aMutex); + // must be reset xxx_pGLOBAL_SQLPARSER = this; // defines how to scan @@ -3297,7 +3297,7 @@ OSQLParseNode* OSQLParser::predicateTree(::rtl::OUString& rErrorMessage, const : // Guard the parsing ::osl::MutexGuard aGuard(s_aMutex); - // reset the parser
+ // reset the parser if (!m_pLocale) m_pLocale = new Locale(m_pContext->getDefaultLocale()); @@ -3338,7 +3338,7 @@ OSQLParseNode* OSQLParser::predicateTree(::rtl::OUString& rErrorMessage, const : OSL_ENSHURE(aValue.getValueType() == ::getCppuType((const ::com::sun::star::lang::Locale*)0), "OSQLParser::PredicateTree : invalid language property !"); if (aValue.getValueType() == ::getCppuType((const ::com::sun::star::lang::Locale*)0)) - aValue >>= *m_pLocale;
+ aValue >>= *m_pLocale; } else *m_pLocale = m_pContext->getDefaultLocale(); @@ -3355,7 +3355,7 @@ OSQLParseNode* OSQLParser::predicateTree(::rtl::OUString& rErrorMessage, const : case DataType::LONGVARCHAR: s_pScanner->SetRule(s_pScanner->GetSTRINGRule()); break; - default:
+ default: if (m_pLocale && m_xLocaleData->getLocaleItem(*m_pLocale).decimalSeparator.toChar() == ',') s_pScanner->SetRule(s_pScanner->GetGERRule()); else @@ -3495,10 +3495,10 @@ sal_uInt32 OSQLParser::RuleID(OSQLParseNode::Rule eRule) case OSQLParseNode::table_exp: s_nRuleIDs[eRule] = StrToRuleID("table_exp"); break; case OSQLParseNode::table_ref: - s_nRuleIDs[eRule] = StrToRuleID("table_ref"); break;
- case OSQLParseNode::catalog_name:
- s_nRuleIDs[eRule] = StrToRuleID("catalog_name"); break;
- case OSQLParseNode::schema_name:
+ s_nRuleIDs[eRule] = StrToRuleID("table_ref"); break; + case OSQLParseNode::catalog_name: + s_nRuleIDs[eRule] = StrToRuleID("catalog_name"); break; + case OSQLParseNode::schema_name: s_nRuleIDs[eRule] = StrToRuleID("schema_name"); break; case OSQLParseNode::table_name: s_nRuleIDs[eRule] = StrToRuleID("table_name"); break; @@ -3645,33 +3645,33 @@ sal_uInt32 OSQLParser::RuleID(OSQLParseNode::Rule eRule) } } return s_nRuleIDs[(sal_uInt16)eRule]; -}
-// -------------------------------------------------------------------------
-::rtl::OUString OSQLParser::stringToDouble(const ::rtl::OUString& _rValue,sal_Int16 _nScale)
-{
- ::rtl::OUString aValue;
- if(!m_xCharClass.is())
- m_xCharClass = Reference<XCharacterClassification>(m_xServiceFactory->createInstance(::rtl::OUString::createFromAscii("com.sun.star.i18n.CharacterClassification")),UNO_QUERY);
- if(m_xCharClass.is() && m_xLocaleData.is())
- {
- try
- {
- ParseResult aResult = m_xCharClass->parsePredefinedToken(KParseType::ANY_NUMBER,_rValue,0,*m_pLocale,0,::rtl::OUString(),KParseType::ANY_NUMBER,::rtl::OUString());
- if((aResult.TokenType & KParseType::IDENTNAME) && aResult.EndPos == _rValue.getLength())
- {
- aValue = ::rtl::OUString::valueOf(aResult.Value);
- sal_Int32 nPos = aValue.lastIndexOf(::rtl::OUString::createFromAscii("."));
- if((nPos+_nScale) < aValue.getLength())
- aValue = aValue.replaceAt(nPos+_nScale,aValue.getLength()-nPos-_nScale,::rtl::OUString());
- aValue.replaceAt(aValue.lastIndexOf(nPos),1,m_xLocaleData->getLocaleItem(*m_pLocale).decimalSeparator);
- return aValue;
- }
- }
- catch(Exception&)
- {
- }
- }
- return aValue;
+} +// ------------------------------------------------------------------------- +::rtl::OUString OSQLParser::stringToDouble(const ::rtl::OUString& _rValue,sal_Int16 _nScale) +{ + ::rtl::OUString aValue; + if(!m_xCharClass.is()) + m_xCharClass = Reference<XCharacterClassification>(m_xServiceFactory->createInstance(::rtl::OUString::createFromAscii("com.sun.star.i18n.CharacterClassification")),UNO_QUERY); + if(m_xCharClass.is() && m_xLocaleData.is()) + { + try + { + ParseResult aResult = m_xCharClass->parsePredefinedToken(KParseType::ANY_NUMBER,_rValue,0,*m_pLocale,0,::rtl::OUString(),KParseType::ANY_NUMBER,::rtl::OUString()); + if((aResult.TokenType & KParseType::IDENTNAME) && aResult.EndPos == _rValue.getLength()) + { + aValue = ::rtl::OUString::valueOf(aResult.Value); + sal_Int32 nPos = aValue.lastIndexOf(::rtl::OUString::createFromAscii(".")); + if((nPos+_nScale) < aValue.getLength()) + aValue = aValue.replaceAt(nPos+_nScale,aValue.getLength()-nPos-_nScale,::rtl::OUString()); + aValue.replaceAt(aValue.lastIndexOf(nPos),1,m_xLocaleData->getLocaleItem(*m_pLocale).decimalSeparator); + return aValue; + } + } + catch(Exception&) + { + } + } + return aValue; } //----------------------------------------------------------------------------- sal_Int16 OSQLParser::buildNode(OSQLParseNode*& pAppend,OSQLParseNode* pLiteral,OSQLParseNode*& pCompare) @@ -3697,7 +3697,7 @@ sal_Int16 OSQLParser::buildNode_STR_NUM(OSQLParseNode*& pAppend,OSQLParseNode*& if (m_nFormatKey) { - sal_Int16 nScale = 0;
+ sal_Int16 nScale = 0; ::rtl::OUString aDec; try { @@ -3765,7 +3765,7 @@ sal_Int16 OSQLParser::buildNode_Date(const double& fValue, sal_Int16 nType, OSQL pDateNode->append(new OSQLInternalNode(aString, SQL_NODE_STRING)); } else - {
+ { Date aDate(aDateTime.Day,aDateTime.Month,aDateTime.Year); pDateNode->append(new OSQLInternalNode(aEmptyString, SQL_NODE_KEYWORD, SQL_TOKEN_D)); pDateNode->append(new OSQLInternalNode(DBTypeConversion::toDateString(aDate), SQL_NODE_STRING)); |