Update of /cvsroot/monetdb/sql/src/test/Skyserver
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv13860
Modified Files:
Tag: SQL_2-24
Skyserver_functions.sql Skyserver_functions_v6.sql
Log Message:
Well, it seems there is more str functions used in the Skyserver test..
U Skyserver_functions.sql
Index: Skyserver_functions.sql
===================================================================
RCS file: /cvsroot/monetdb/sql/src/test/Skyserver/Skyserver_functions.sql,v
retrieving revision 1.20.2.1
retrieving revision 1.20.2.2
diff -u -d -r1.20.2.1 -r1.20.2.2
--- Skyserver_functions.sql 23 Jun 2008 06:59:04 -0000 1.20.2.1
+++ Skyserver_functions.sql 23 Jun 2008 08:05:44 -0000 1.20.2.2
@@ -774,10 +774,14 @@
SET t = MS_STUFF(t,6-LENGTH(q),LENGTH(q), q);
-- seconds
SET d = MS_ROUND( 60.0 * (d-nd),precision,truncat );
- SET q = LTRIM(STR(d,precision));
+ IF (precision < 1)
+ THEN SET q = LTRIM(cast( round(d, precision) as varchar(7)));
+ END IF;
+ IF (precision > 10)
+ THEN SET q = LTRIM(cast( round(d, precision) as varchar(16)));
+ END IF;
SET t = MS_STUFF(t,10+precision-LENGTH(q),LENGTH(q), q);
-- SET d = 60.0 * (d-nd);
--- SET q = LTRIM(STR(d,3));
-- SET t = MS_STUFF(t,13-LENGTH(q),LENGTH(q), q);
--
RETURN(t);
U Skyserver_functions_v6.sql
Index: Skyserver_functions_v6.sql
===================================================================
RCS file: /cvsroot/monetdb/sql/src/test/Skyserver/Skyserver_functions_v6.sql,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -d -r1.1.2.12 -r1.1.2.13
--- Skyserver_functions_v6.sql 22 Jun 2008 21:42:04 -0000 1.1.2.12
+++ Skyserver_functions_v6.sql 23 Jun 2008 08:05:45 -0000 1.1.2.13
@@ -774,10 +774,14 @@
SET t = MS_STUFF(t,6-LENGTH(q),LENGTH(q), q);
-- seconds
SET d = MS_ROUND( 60.0 * (d-nd),precision,truncat );
- SET q = LTRIM(STR(d,precision));
+ IF (precision < 1)
+ THEN SET q = LTRIM(cast( round(d, precision) as varchar(7)));
+ END IF;
+ IF (precision > 10)
+ THEN SET q = LTRIM(cast( round(d, precision) as varchar(16)));
+ END IF;
SET t = MS_STUFF(t,10+precision-LENGTH(q),LENGTH(q), q);
-- SET d = 60.0 * (d-nd);
--- SET q = LTRIM(STR(d,3));
-- SET t = MS_STUFF(t,13-LENGTH(q),LENGTH(q), q);
--
RETURN(t);
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
