Changeset 15 for trunk/epic

Timestamp:

08/26/08 00:52:14 (4 years ago)

Author:

fumanchu

Message:

New 'statement' function. The funcs 'global', 'assert_void', and 'assert_raises' now allow full SELECT statements.

Files:

• trunk/epic/epic.sql (modified) (9 diffs)

trunk/epic/epic.sql

@@ -111 +111 @@
     
     * test.assert_raises(call text, errm text, state text): 
-        Raises an exception if 'SELECT * FROM [call];' does not raise errm
+        Raises an exception if call does not raise errm
         (if provided) or state (if provided).
 
@@ -211 +211 @@
 
 
+CREATE OR REPLACE FUNCTION test.statement(call text) RETURNS text AS $$
+DECLARE
+  result    text;
+BEGIN
+  result := rtrim(call, ';');
+  IF NOT result ILIKE 'SELECT%' THEN
+    result := 'SELECT * FROM ' || result;
+  END IF;
+  RETURN result;
+END;
+$$ LANGUAGE plpgsql;
+
+
 -------------------------------- global records --------------------------------
 
@@ -234 +247 @@
 -- Stores the given call's output in a TEMP table, and returns it as a record.
 -- 
--- 'call' can be any table, view, or procedure that returns records.
+-- 'call' can be any SELECT, table, view, or procedure that returns records.
 -- 
 -- The returned record includes the following additional attributes:
@@ -246 +259 @@
 BEGIN
   tablename := '_global_' || nextval('_global_ids');
-  EXECUTE 'CREATE TEMP TABLE ' || tablename || ' AS SELECT * FROM ' || call;
+  EXECUTE 'CREATE TEMP TABLE ' || tablename || ' AS ' || statement(call);
   EXECUTE 'SELECT ''' || tablename || '''::text AS tablename, * FROM ' || tablename INTO result;
   RETURN result;
@@ -421 +434 @@
   retval    text;
 BEGIN
-  EXECUTE ('SELECT * FROM ' || call || ';') INTO retval;
+  EXECUTE statement(call) INTO retval;
   IF retval != '' THEN
     RAISE EXCEPTION 'Call: ''%'' did not return void. Got ''%'' instead.', call, retval;
@@ -538 +551 @@
 
 CREATE OR REPLACE FUNCTION test.assert_raises(call text, errm text, state text) RETURNS VOID AS $$
--- Raises an exception if 'SELECT * FROM [call];' does not raise errm and/or state.
+-- Raises an exception if call does not raise errm and/or state.
 -- 
 -- Example:
@@ -553 +566 @@
 BEGIN
   BEGIN
-    EXECUTE 'SELECT * FROM '||call||';';
+    EXECUTE statement(call);
   EXCEPTION
     WHEN OTHERS THEN
@@ -598 +611 @@
   e       text;
 BEGIN
-  s := rtrim(source, ';');
-  IF NOT s ILIKE 'SELECT%' THEN
-    s := 'SELECT * FROM ' || s;
-  END IF;
-  
-  e := rtrim(expected, ';');
-  IF NOT e ILIKE 'SELECT%' THEN
-    e := 'SELECT * FROM ' || e;
-  END IF;
+  s := statement(source);
+  e := statement(expected);
   
   FOR rec in EXECUTE s || ' EXCEPT ' || e
@@ -643 +649 @@
   -- Dump the call output into a temp table
   IF colname IS NULL THEN
-    EXECUTE 'CREATE TEMPORARY TABLE _test_assert_values_base AS ' ||
-      'SELECT * FROM ' || call || ';';
+    EXECUTE 'CREATE TEMPORARY TABLE _test_assert_values_base AS ' || statement(call);
     SELECT INTO firstname a.attname
       FROM pg_class c LEFT JOIN pg_attribute a ON c.oid = a.attrelid