[dba-cvs] CVS update [cws_src680_dba24b]: /dba/connectivity/source/parse/sqlnode.cxx

[oj]

Tag: cws_src680_dba24b
User: oj      
Date: 2007-09-28 11:24:45+0000
Modified:
   dba/connectivity/source/parse/sqlnode.cxx

Log:
 RESYNC: (1.47-1.48); FILE MERGED

File Changes:

Directory: /dba/connectivity/source/parse/
==========================================

File [changed]: sqlnode.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/connectivity/source/parse/sqlnode.cxx?r1=1.47.26.5&r2=1.47.26.6
Delta lines:  +6 -3
-------------------
--- sqlnode.cxx 2007-08-24 10:16:10+0000        1.47.26.5
+++ sqlnode.cxx 2007-09-28 11:24:43+0000        1.47.26.6
@@ -2528,6 +2528,7 @@
     else 
if(sFunctionName.equalsIgnoreAsciiCase(TokenIDToStr(SQL_TOKEN_CURRENT_TIME,pContext)))
         nType = DataType::TIME;
     else 
if(sFunctionName.equalsIgnoreAsciiCase(TokenIDToStr(SQL_TOKEN_CURRENT_TIMESTAMP,pContext)))
    nType = DataType::TIMESTAMP;
     else 
if(sFunctionName.equalsIgnoreAsciiCase(TokenIDToStr(SQL_TOKEN_CURDATE,pContext)))
              nType = DataType::DATE;
+    else 
if(sFunctionName.equalsIgnoreAsciiCase(TokenIDToStr(SQL_TOKEN_DATEDIFF,pContext)))
             nType = DataType::INTEGER;
     else 
if(sFunctionName.equalsIgnoreAsciiCase(TokenIDToStr(SQL_TOKEN_DATEVALUE,pContext)))
            nType = DataType::DATE;
     else 
if(sFunctionName.equalsIgnoreAsciiCase(TokenIDToStr(SQL_TOKEN_CURTIME,pContext)))
              nType = DataType::TIME;
     else 
if(sFunctionName.equalsIgnoreAsciiCase(TokenIDToStr(SQL_TOKEN_DAYNAME,pContext)))
              nType = DataType::VARCHAR;
@@ -2559,6 +2560,7 @@
     else 
if(sFunctionName.equalsIgnoreAsciiCase(TokenIDToStr(SQL_TOKEN_EXP,pContext)))   
               nType = DataType::DOUBLE;
     else 
if(sFunctionName.equalsIgnoreAsciiCase(TokenIDToStr(SQL_TOKEN_FLOOR,pContext))) 
               nType = DataType::DOUBLE;
     else 
if(sFunctionName.equalsIgnoreAsciiCase(TokenIDToStr(SQL_TOKEN_LOGF,pContext)))  
               nType = DataType::DOUBLE;
+    else 
if(sFunctionName.equalsIgnoreAsciiCase(TokenIDToStr(SQL_TOKEN_LOG,pContext)))   
               nType = DataType::DOUBLE;
     else 
if(sFunctionName.equalsIgnoreAsciiCase(TokenIDToStr(SQL_TOKEN_LOG10,pContext))) 
               nType = DataType::DOUBLE;
     else 
if(sFunctionName.equalsIgnoreAsciiCase(TokenIDToStr(SQL_TOKEN_LN,pContext)))    
               nType = DataType::DOUBLE;
     else 
if(sFunctionName.equalsIgnoreAsciiCase(TokenIDToStr(SQL_TOKEN_MOD,pContext)))   
               nType = DataType::DOUBLE;
@@ -2567,6 +2569,7 @@
     else 
if(sFunctionName.equalsIgnoreAsciiCase(TokenIDToStr(SQL_TOKEN_RADIANS,pContext)))
              nType = DataType::DOUBLE;
     else 
if(sFunctionName.equalsIgnoreAsciiCase(TokenIDToStr(SQL_TOKEN_RAND,pContext)))  
               nType = DataType::DOUBLE;
     else 
if(sFunctionName.equalsIgnoreAsciiCase(TokenIDToStr(SQL_TOKEN_ROUND,pContext))) 
               nType = DataType::DOUBLE;
+    else 
if(sFunctionName.equalsIgnoreAsciiCase(TokenIDToStr(SQL_TOKEN_ROUNDMAGIC,pContext)))
           nType = DataType::DOUBLE;
     else 
if(sFunctionName.equalsIgnoreAsciiCase(TokenIDToStr(SQL_TOKEN_SIGN,pContext)))  
               nType = DataType::DOUBLE;
     else 
if(sFunctionName.equalsIgnoreAsciiCase(TokenIDToStr(SQL_TOKEN_SIN,pContext)))   
               nType = DataType::DOUBLE;
     else 
if(sFunctionName.equalsIgnoreAsciiCase(TokenIDToStr(SQL_TOKEN_SQRT,pContext)))  
               nType = DataType::DOUBLE;




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]