Changeset: 00ae2e328067 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=00ae2e328067
Added Files:
sql/backends/monet5/Tests/rapi16.sql
sql/backends/monet5/Tests/rapi16.stable.err
sql/backends/monet5/Tests/rapi16.stable.out
Removed Files:
sql/backends/monet5/Tests/rapi13.sql
sql/backends/monet5/Tests/rapi13.stable.err
sql/backends/monet5/Tests/rapi13.stable.out
Modified Files:
sql/backends/monet5/Tests/All
Branch: Jul2015
Log Message:
Move rapi13 to rapi16 because name clash with default
diffs (111 lines):
diff --git a/sql/backends/monet5/Tests/All b/sql/backends/monet5/Tests/All
--- a/sql/backends/monet5/Tests/All
+++ b/sql/backends/monet5/Tests/All
@@ -12,7 +12,7 @@ HAVE_LIBR?rapi07
HAVE_LIBR?rapi09
HAVE_LIBR?rapi10
HAVE_LIBR?rapi12
-HAVE_LIBR?rapi13
+HAVE_LIBR?rapi16
# should this work?
#inlineUDF
diff --git a/sql/backends/monet5/Tests/rapi13.sql
b/sql/backends/monet5/Tests/rapi16.sql
rename from sql/backends/monet5/Tests/rapi13.sql
rename to sql/backends/monet5/Tests/rapi16.sql
--- a/sql/backends/monet5/Tests/rapi13.sql
+++ b/sql/backends/monet5/Tests/rapi16.sql
@@ -1,19 +1,19 @@
START TRANSACTION;
-CREATE TABLE rapi13(a INTEGER, b DOUBLE);
-INSERT INTO rapi13 VALUES (1,1.2), (1,2.2), (2,2.5), (2,0.9);
+CREATE TABLE rapi16(a INTEGER, b DOUBLE);
+INSERT INTO rapi16 VALUES (1,1.2), (1,2.2), (2,2.5), (2,0.9);
-CREATE FUNCTION rapi13(a INTEGER, b DOUBLE) RETURNS TABLE (c INTEGER, d
DOUBLE) LANGUAGE R {
+CREATE FUNCTION rapi16(a INTEGER, b DOUBLE) RETURNS TABLE (c INTEGER, d
DOUBLE) LANGUAGE R {
data.frame(c=a,d=b)};
-SELECT * FROM rapi13((SELECT A, B FROM rapi13 AS X));
+SELECT * FROM rapi16((SELECT A, B FROM rapi16 AS X));
-CREATE VIEW rapi13v AS SELECT * FROM rapi13((SELECT A, B FROM rapi13 AS X));
-SELECT * FROM rapi13v;
+CREATE VIEW rapi16v AS SELECT * FROM rapi16((SELECT A, B FROM rapi16 AS X));
+SELECT * FROM rapi16v;
-DROP VIEW rapi13v;
-DROP FUNCTION rapi13;
-DROP TABLE rapi13;
+DROP VIEW rapi16v;
+DROP FUNCTION rapi16;
+DROP TABLE rapi16;
ROLLBACK;
diff --git a/sql/backends/monet5/Tests/rapi13.stable.err
b/sql/backends/monet5/Tests/rapi16.stable.err
rename from sql/backends/monet5/Tests/rapi13.stable.err
rename to sql/backends/monet5/Tests/rapi16.stable.err
--- a/sql/backends/monet5/Tests/rapi13.stable.err
+++ b/sql/backends/monet5/Tests/rapi16.stable.err
@@ -1,4 +1,4 @@
-stderr of test 'rapi13` in directory 'sql/backends/monet5` itself:
+stderr of test 'rapi16` in directory 'sql/backends/monet5` itself:
# 15:09:46 >
diff --git a/sql/backends/monet5/Tests/rapi13.stable.out
b/sql/backends/monet5/Tests/rapi16.stable.out
rename from sql/backends/monet5/Tests/rapi13.stable.out
rename to sql/backends/monet5/Tests/rapi16.stable.out
--- a/sql/backends/monet5/Tests/rapi13.stable.out
+++ b/sql/backends/monet5/Tests/rapi16.stable.out
@@ -1,4 +1,4 @@
-stdout of test 'rapi13` in directory 'sql/backends/monet5` itself:
+stdout of test 'rapi16` in directory 'sql/backends/monet5` itself:
# 15:09:46 >
@@ -30,12 +30,12 @@ Ready.
# 15:09:46 >
#START TRANSACTION;
-#CREATE TABLE rapi13(a INTEGER, b DOUBLE);
-#INSERT INTO rapi13 VALUES (1,1.2), (1,2.2), (2,2.5), (2,0.9);
+#CREATE TABLE rapi16(a INTEGER, b DOUBLE);
+#INSERT INTO rapi16 VALUES (1,1.2), (1,2.2), (2,2.5), (2,0.9);
[ 4 ]
-#CREATE FUNCTION rapi13(a INTEGER, b DOUBLE) RETURNS TABLE (c INTEGER, d
DOUBLE) LANGUAGE R {
+#CREATE FUNCTION rapi16(a INTEGER, b DOUBLE) RETURNS TABLE (c INTEGER, d
DOUBLE) LANGUAGE R {
#data.frame(c=a,d=b)};
-#SELECT * FROM rapi13((SELECT A, B FROM rapi13 AS X));
+#SELECT * FROM rapi16((SELECT A, B FROM rapi16 AS X));
% ., . # table_name
% c, d # name
% int, double # type
@@ -44,9 +44,9 @@ Ready.
[ 1, 2.2 ]
[ 2, 2.5 ]
[ 2, 0.9 ]
-#CREATE VIEW rapi13v AS SELECT * FROM rapi13((SELECT A, B FROM rapi13 AS X));
-#SELECT * FROM rapi13v;
-% .rapi13v, .rapi13v # table_name
+#CREATE VIEW rapi16v AS SELECT * FROM rapi16((SELECT A, B FROM rapi16 AS X));
+#SELECT * FROM rapi16v;
+% .rapi16v, .rapi16v # table_name
% c, d # name
% int, double # type
% 1, 24 # length
@@ -54,9 +54,9 @@ Ready.
[ 1, 2.2 ]
[ 2, 2.5 ]
[ 2, 0.9 ]
-#DROP VIEW rapi13v;
-#DROP FUNCTION rapi13;
-#DROP TABLE rapi13;
+#DROP VIEW rapi16v;
+#DROP FUNCTION rapi16;
+#DROP TABLE rapi16;
#ROLLBACK;
# 15:09:46 >
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
