Changeset 34 for trunk/epic

Timestamp:

06/08/09 21:47:59 (3 years ago)

Author:

fumanchu

Message:

Fixed to work on PG 8.1.

Location:

trunk/epic

Files:

• epic.sql (modified) (35 diffs)
• test/test_asserts.sql (modified) (2 diffs)
• test/test_timing.sql (modified) (2 diffs)

trunk/epic/epic.sql

@@ -177 +177 @@
 */
 
-CREATE OR REPLACE FUNCTION assert_test_schema() RETURNS boolean AS $$
+CREATE OR REPLACE FUNCTION _epic_init() RETURNS boolean AS $$
+DECLARE
+  t        text;
 BEGIN
   SET client_min_messages = warning;
+  
+  BEGIN
+    RAISE EXCEPTION 'ignore me';
+  EXCEPTION WHEN OTHERS THEN
+    BEGIN
+      t := SQLSTATE;
+      t := SQLERRM;
+    EXCEPTION WHEN undefined_column THEN
+      -- PG 8.0 did not have SQLSTATE, SQLERRM available. Epic relies
+      -- on the ability to distinguish one error from another.
+      RAISE EXCEPTION 'Epic requires at least PostgreSQL version 8.1';
+    END;
+  END;
   
   BEGIN
@@ -189 +204 @@
   BEGIN
     CREATE TABLE test.results (name text PRIMARY KEY, module text,
-                               result text, errcode text, errmsg text);
+                               result text, errcode text, errmsg text,
+                               runtime timestamp with time zone default now());
   EXCEPTION WHEN duplicate_table THEN
     NULL;
@@ -198 +214 @@
 $$ LANGUAGE plpgsql;
 
-SELECT * FROM assert_test_schema();
-DROP FUNCTION assert_test_schema();
+SELECT * FROM _epic_init();
+DROP FUNCTION _epic_init();
 
 
@@ -208 +224 @@
   ON pg_proc.pronamespace::oid = pg_namespace.oid::oid
   WHERE pg_namespace.nspname = 'test'
-    AND pg_proc.proname LIKE E'test\_%';
+    AND pg_proc.proname LIKE 'test_%';
 
 
@@ -219 +235 @@
   IF result ~* '^[[:space:]]*(SELECT|EXECUTE)[[:space:]]' THEN
     return result;
-  ELSIF result ~* E'^[[:space:]]*(VALUES)[[:space:]]*\\(' THEN
+  ELSIF result ~* '^[[:space:]]*(VALUES)[[:space:]]*\\(' THEN
     return result;
   ELSE
@@ -348 +364 @@
   rec      record;
   seen     int := 0;
+  msg      text;
 BEGIN
   FOR rec IN
@@ -360 +377 @@
   
   IF seen = 0 THEN
-    RAISE EXCEPTION '% has no attributes.', quote_literal(tablename);
+    msg := quote_literal(tablename);
+    RAISE EXCEPTION '% has no attributes.', msg;
   END IF;
 END;
@@ -391 +409 @@
   output_record   test.results%ROWTYPE;
   splitpoint      int;
-  old_search_path text;
 BEGIN
   SELECT module INTO modulename FROM test.testnames WHERE name = testname;
@@ -399 +416 @@
     -- Allow test.* functions to be referenced without a schema name during this transaction.
     PERFORM set_config('search_path', 'test, ' || current_setting('search_path'), true);
-    EXECUTE 'SELECT * FROM test.' || testname || '();';
+    EXECUTE 'SELECT * FROM test.' || testname || '();' INTO output_record;
+    RETURN output_record;
   EXCEPTION WHEN OTHERS THEN
     IF SQLSTATE = 'P0001' AND SQLERRM LIKE '[%]%' THEN
@@ -406 +424 @@
         VALUES (testname, modulename, substr(SQLERRM, 1, splitpoint),
                 CASE WHEN SQLERRM LIKE '[FAIL]%' THEN SQLSTATE ELSE '' END,
-                btrim(substr(SQLERRM, splitpoint + 1)))
-        RETURNING * INTO output_record;
+                btrim(substr(SQLERRM, splitpoint + 1)));
+      SELECT INTO output_record * FROM test.results WHERE name = testname;
       RETURN output_record;
     ELSE
       INSERT INTO test.results (name, module, result, errcode, errmsg)
-        VALUES (testname, modulename, '[FAIL]', SQLSTATE, SQLERRM)
-        RETURNING * INTO output_record;
+        VALUES (testname, modulename, '[FAIL]', SQLSTATE, SQLERRM);
+      SELECT INTO output_record * FROM test.results WHERE name = testname;
       RETURN output_record;
     END IF;
@@ -425 +443 @@
 -- Runs all tests in the given module, stores in test.results, and returns results.
 DECLARE
-  testname        pg_proc.proname%TYPE;
+  testname        record;
   output_record   test.results%ROWTYPE;
 BEGIN
@@ -440 +458 @@
 -- Runs all known test functions, stores in test.results, and returns results.
 DECLARE
-  testname pg_proc.proname%TYPE;
-  modulename text;
+  testname record;
+  modulename record;
   output_record test.results%ROWTYPE;
 BEGIN
   FOR modulename in SELECT DISTINCT module FROM test.testnames ORDER BY module ASC
   LOOP
-    FOR testname IN SELECT name FROM test.testnames WHERE module = modulename ORDER BY name ASC
+    FOR testname IN SELECT name FROM test.testnames WHERE module = modulename.module ORDER BY name ASC
     LOOP
-      SELECT INTO output_record * FROM test.run_test(testname);
+      SELECT INTO output_record * FROM test.run_test(testname.name);
       RETURN NEXT output_record;
     END LOOP;
   END LOOP;
+  RETURN;
 END;
 $$ LANGUAGE plpgsql;
@@ -541 +560 @@
     RAISE EXCEPTION 'Call: ''%'' did not return void. Got ''%'' instead.', call, retval;
   END IF;
+  RETURN;
 END;
 $$ LANGUAGE plpgsql;
@@ -557 +577 @@
     RAISE EXCEPTION '%', msg;
   END IF;
+  RETURN;
 END;
 $$ LANGUAGE plpgsql IMMUTABLE;
@@ -572 +593 @@
     RAISE EXCEPTION '% != %', elem_1, elem_2;
   END IF;
+  RETURN;
 END;
 $$ LANGUAGE plpgsql IMMUTABLE;
@@ -585 +607 @@
     RAISE EXCEPTION '% = %', elem_1, elem_2;
   END IF;
+  RETURN;
 END;
 $$ LANGUAGE plpgsql IMMUTABLE;
@@ -601 +624 @@
     RAISE EXCEPTION '% not < %', elem_1, elem_2;
   END IF;
+  RETURN;
 END;
 $$ LANGUAGE plpgsql IMMUTABLE;
@@ -617 +641 @@
     RAISE EXCEPTION '% not <= %', elem_1, elem_2;
   END IF;
+  RETURN;
 END;
 $$ LANGUAGE plpgsql IMMUTABLE;
@@ -633 +658 @@
     RAISE EXCEPTION '% not > %', elem_1, elem_2;
   END IF;
+  RETURN;
 END;
 $$ LANGUAGE plpgsql IMMUTABLE;
@@ -649 +675 @@
     RAISE EXCEPTION '% not >= %', elem_1, elem_2;
   END IF;
+  RETURN;
 END;
 $$ LANGUAGE plpgsql IMMUTABLE;
@@ -667 +694 @@
 -- errm = '' and state = ''. The resultant error will tell you the
 -- SQLSTATE and SQLERRM that were raised.
+DECLARE
+  msg       text;
 BEGIN
   BEGIN
@@ -674 +703 @@
       IF ((state IS NOT NULL AND SQLSTATE != state) OR
           (errm IS NOT NULL AND SQLERRM != errm)) THEN
-        RAISE EXCEPTION 'Call: ''%'' raised ''(%) %'' instead of ''(%) %''.', call, SQLSTATE, SQLERRM, state, errm;
+        msg = 'Call: ''' || call || ''' raised ''(' || SQLSTATE || ') ' || SQLERRM || ''' instead of ''(' || state || ') ' || errm || '''.';
+        RAISE EXCEPTION '%', msg;
       END IF;
       RETURN;
   END;
-  RAISE EXCEPTION 'Call: % did not raise an error.', quote_literal(call);
+  msg := 'Call: ' || quote_literal(call) || ' did not raise an error.';
+  RAISE EXCEPTION '%', msg;
 END;
 $$ LANGUAGE plpgsql;
@@ -713 +744 @@
   s       text;
   e       text;
+  msg     text;
 BEGIN
   s := test.statement(call_1);
@@ -726 +758 @@
     RAISE EXCEPTION 'Record: % from: % not found in: %', rec, call_2, call_1;
   END LOOP;
+  RETURN;
 END;
 $$ LANGUAGE plpgsql;
@@ -753 +786 @@
   found_1       boolean;
   lower_bound   int;
-  base_type      text;
+  base_type     text;
+  msg           text;
 BEGIN
   -- Dump the call output into a temp table
@@ -826 +860 @@
     DROP TABLE _test_assert_column_base;
     EXECUTE 'DROP TABLE _test_assert_column_expected';
-    RAISE EXCEPTION '%', SQLERRM;
-  END TRY;
+    msg := SQLERRM;
+    RAISE EXCEPTION '%', msg;
+  END;
   
   CLOSE curs_base;
@@ -833 +868 @@
   DROP TABLE _test_assert_column_base;
   EXECUTE 'DROP TABLE _test_assert_column_expected';
+  RETURN;
 END;
 $$ LANGUAGE plpgsql;
@@ -856 +892 @@
     'SELECT ' || columns || ' FROM ' || call_2
     );
+  RETURN;
 END;
 $$ LANGUAGE plpgsql;
@@ -864 +901 @@
 DECLARE
   result      bool;
-  failed      text[];
+  failed      text[] DEFAULT '{}'::text[];
   failed_len  int;
 BEGIN
@@ -885 +922 @@
     END IF;
   END IF;
+  RETURN;
 END;
 $$ LANGUAGE plpgsql;
@@ -897 +935 @@
     PERFORM test.fail('The call "' || call || '" is not empty.');
   END IF;
+  RETURN;
 END;
 $$ LANGUAGE plpgsql;
@@ -929 +968 @@
     END IF;
   END IF;
+  RETURN;
 END;
 $$ LANGUAGE plpgsql;
@@ -941 +981 @@
     PERFORM test.fail('The call "' || call || '" is empty.');
   END IF;
+  RETURN;
 END;
 $$ LANGUAGE plpgsql;
@@ -957 +998 @@
   IF number IS NULL THEN v_number := 1000000; END IF;
   -- Mustn't use now() here since that value is fixed for the entire transaction.
-  start := clock_timestamp();
+  -- Also, clock_timestamp isn't available until 8.2 so we use timeofday instead.
+  start := timeofday()::timestamp;
   FOR i IN 1..v_number
   LOOP
@@ -965 +1007 @@
   -- overhead outweighs assignment overhead if we accumulated the time inside the loop;
   -- therefore I chose "outside" since it makes the whole run faster. ;)
-  RETURN (clock_timestamp() - start);
+  RETURN (timeofday()::timestamp - start);
 END;
 $$ LANGUAGE plpgsql;

trunk/epic/test/test_asserts.sql

@@ -90 +90 @@
 
 
+CREATE OR REPLACE FUNCTION test._return_void() RETURNS VOID AS $$
+BEGIN
+  RETURN;
+END;
+$$ LANGUAGE plpgsql;
+
 CREATE OR REPLACE FUNCTION test.test_assert_void() RETURNS VOID AS $$
 -- Assert the correct operation of test.assert_void
@@ -97 +103 @@
 BEGIN
   -- assert_void() MUST return VOID if the given call returns VOID.
-  SELECT INTO retval * FROM test.assert_void('pg_sleep(0.1)');
+  SELECT INTO retval * FROM test.assert_void('test._return_void()');
   IF retval != '' THEN
     RAISE EXCEPTION 'assert_void did not itself return void. Got ''%'' instead.', retval;

trunk/epic/test/test_timing.sql

@@ -1 +1 @@
 -- Tests for the timing functions which Epic provides.
 -- To run, execute epic.sql, then this script, then test.run_module('test_timing').
+
+CREATE OR REPLACE FUNCTION test._sleep(s double precision) RETURNS VOID AS $$
+-- sleep function for Postgres 8.1
+DECLARE
+  start    timestamp with time zone;
+BEGIN
+  start := timeofday()::timestamp;
+  LOOP
+    EXIT WHEN (timeofday()::timestamp - start) > (s || ' second')::interval;
+  END LOOP;
+END;
+$$ LANGUAGE plpgsql;
 
 CREATE OR REPLACE FUNCTION test.test_timing() RETURNS VOID AS $$
@@ -8 +20 @@
 BEGIN
   -- Shame we have to use 0.01 but some platforms don't have finer resolution.
-  t := test.timing('SELECT pg_sleep(0.01)', 100);
+  t := test.timing('SELECT test._sleep(0.01)', 100);
   
   -- Let's assume that sleep(0.01) * 100 should never run *under* 1s