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

[hr]

User: hr      
Date: 2007-09-26 14:32:08+0000
Modified:
   dba/connectivity/source/parse/sqlnode.cxx

Log:
 INTEGRATION: CWS dba24a (1.47.20); FILE MERGED
 2007/09/20 06:01:27 oj 1.47.20.3: #i81582# data type of log
 2007/08/28 05:28:46 oj 1.47.20.2: #i81031# impl roundmagic
 2007/08/06 07:26:51 oj 1.47.20.1: #i70081# impl datediff

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&r2=1.48
Delta lines:  +3 -0
-------------------
--- sqlnode.cxx 2007-07-06 06:48:59+0000        1.47
+++ sqlnode.cxx 2007-09-26 14:32:06+0000        1.48
@@ -2525,6 +2525,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;
@@ -2556,6 +2557,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;
@@ -2564,6 +2566,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]