Update of /cvsroot/monetdb/sql/src/server
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv28724/src/server
Modified Files:
sql_datetime.mx
Log Message:
propagated changes of Sunday Nov 22 2009 - Saturday Nov 28 2009
from the Nov2009 branch to the development trunk
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/11/22 - nielsnes: src/server/sql_datetime.mx,1.27.6.1
add checks for overflow on interval types
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/11/23 - nielsnes: src/server/sql_datetime.mx,1.27.6.2
fixed compilation
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: sql_datetime.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/server/sql_datetime.mx,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- sql_datetime.mx 9 Mar 2009 20:38:06 -0000 1.27
+++ sql_datetime.mx 28 Nov 2009 19:57:09 -0000 1.28
@@ -41,6 +41,9 @@
* in both cases sk/ek contain the start and end qualifiers
* <0 for errors */
+lng qualifier2multiplier( int sk );
+/* returns the multiplier for the given interval qualifier */
+
int parse_interval(mvc *sql, lng sign, char *str, int sk, int ek, lng *i);
/* returns 0 for month intervals and value in val,
* 1 for sec intervals and value in val,
@@ -98,6 +101,31 @@
return 1;
}
+lng
+qualifier2multiplier( int sk )
+{
+ lng mul = 1;
+
+ switch (sk) {
+ case iyear:
+ mul *= 12;
+ case imonth:
+ break;
+
+ case iday:
+ mul *= 24;
+ case ihour:
+ mul *= 60;
+ case imin:
+ mul *= 60;
+ case isec:
+ break;
+ default:
+ return -1;
+ }
+ return mul;
+}
+
int
parse_interval_(mvc *sql, lng sign, char *str, int sk, int ek, lng *i)
{
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
