Changeset: a65cda0153f3 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a65cda0153f3
Removed Files:
sql/test/function.sql
Modified Files:
sql/test/BugTracker-2010/Tests/store_function_argument_correctly.Bug-2750.sql
sql/test/BugTracker-2010/Tests/store_function_argument_correctly.Bug-2750.test
Branch: mtest
Log Message:
Merged the test in function.sql into
BugTracker-2010/Tests/store_function_argument_correctly.Bug-2750, but use
static tables instead.
diffs (130 lines):
diff --git
a/sql/test/BugTracker-2010/Tests/store_function_argument_correctly.Bug-2750.sql
b/sql/test/BugTracker-2010/Tests/store_function_argument_correctly.Bug-2750.sql
---
a/sql/test/BugTracker-2010/Tests/store_function_argument_correctly.Bug-2750.sql
+++
b/sql/test/BugTracker-2010/Tests/store_function_argument_correctly.Bug-2750.sql
@@ -1,3 +1,42 @@
+START TRANSACTION;
+
create function f ( x varchar(20) ) returns varchar(10) begin return x; end;
+
select f.name, a.name, a."type", a.type_digits from functions f, args a where
a.func_id = f.id and f.name = 'f';
-drop function f;
+
+CREATE TABLE branches (
+ bid int NOT NULL default '0',
+ cid tinyint NOT NULL default '0',
+ bdesc varchar(255) NOT NULL default '',
+ bloc char(3) NOT NULL default '');
+
+INSERT INTO branches (bid, cid, bdesc, bloc) VALUES
+ (1011, 101, 'Corporate HQ', 'CA'),
+ (1012, 101, 'Accounting Department', 'NY'),
+ (1013, 101, 'Customer Grievances Department', 'KA'),
+ (1041, 104, 'Branch Office (East)', 'MA'),
+ (1042, 104, 'Branch Office (West)', 'CA'),
+ (1101, 110, 'Head Office', 'CA'),
+ (1031, 103, 'N Region HO', 'ME'),
+ (1032, 103, 'NE Region HO', 'CT'),
+ (1033, 103, 'NW Region HO', 'NY');
+
+CREATE TABLE clients (
+ cid tinyint NOT NULL default '0',
+ cname varchar(255) NOT NULL default '',
+ PRIMARY KEY (cid));
+
+INSERT INTO clients (cid, cname) VALUES
+ (101, 'JV Real Estate'),
+ (102, 'ABC Talent Agency'),
+ (103, 'DMW Trading'),
+ (104, 'Rabbit Foods Inc'),
+ (110, 'Sharp Eyes Detective Agency');
+
+CREATE function client_id(cn VARCHAR (100)) RETURNS INT BEGIN RETURN SELECT
cid FROM clients c WHERE cname = cn; END;
+
+SELECT client_id('Rabbit Foods Inc');
+SELECT * from branches b where b.cid = client_id('Rabbit Foods Inc');
+
+ROLLBACK;
+
diff --git
a/sql/test/BugTracker-2010/Tests/store_function_argument_correctly.Bug-2750.test
b/sql/test/BugTracker-2010/Tests/store_function_argument_correctly.Bug-2750.test
---
a/sql/test/BugTracker-2010/Tests/store_function_argument_correctly.Bug-2750.test
+++
b/sql/test/BugTracker-2010/Tests/store_function_argument_correctly.Bug-2750.test
@@ -1,3 +1,6 @@
+statement ok
+START TRANSACTION
+
statement ok
create function f ( x varchar(20) ) returns varchar(10) begin return x; end
@@ -14,6 +17,59 @@ varchar
20
statement ok
-drop function f
+CREATE TABLE branches (
+ bid int NOT NULL default '0',
+ cid tinyint NOT NULL default '0',
+ bdesc varchar(255) NOT NULL default '',
+ bloc char(3) NOT NULL default '')
+
+statement ok
+INSERT INTO branches (bid, cid, bdesc, bloc) VALUES
+ (1011, 101, 'Corporate HQ', 'CA'),
+ (1012, 101, 'Accounting Department', 'NY'),
+ (1013, 101, 'Customer Grievances Department', 'KA'),
+ (1041, 104, 'Branch Office (East)', 'MA'),
+ (1042, 104, 'Branch Office (West)', 'CA'),
+ (1101, 110, 'Head Office', 'CA'),
+ (1031, 103, 'N Region HO', 'ME'),
+ (1032, 103, 'NE Region HO', 'CT'),
+ (1033, 103, 'NW Region HO', 'NY')
+
+statement ok
+CREATE TABLE clients (
+ cid tinyint NOT NULL default '0',
+ cname varchar(255) NOT NULL default '',
+ PRIMARY KEY (cid))
+
+statement ok
+INSERT INTO clients (cid, cname) VALUES
+ (101, 'JV Real Estate'),
+ (102, 'ABC Talent Agency'),
+ (103, 'DMW Trading'),
+ (104, 'Rabbit Foods Inc'),
+ (110, 'Sharp Eyes Detective Agency')
+
+statement ok
+CREATE function client_id(cn VARCHAR (100)) RETURNS INT BEGIN RETURN SELECT
cid FROM clients c WHERE cname = cn; END
+
+query I rowsort
+SELECT client_id('Rabbit Foods Inc')
+----
+104
+
+query IITT rowsort
+SELECT * from branches b where b.cid = client_id('Rabbit Foods Inc')
+----
+1041
+104
+Branch Office (East)
+MA
+1042
+104
+Branch Office (West)
+CA
+
+statement ok
+ROLLBACK
diff --git a/sql/test/function.sql b/sql/test/function.sql
deleted file mode 100644
--- a/sql/test/function.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-CREATE function table_id( tname char ) RETURNS INT AS
- SELECT id from tables where name = tname;
-
-SELECT table_id('tables');
-SELECT * from columns where table_id = table_id('tables');
-
-commit;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
