Changeset 23

Timestamp:

09/07/08 23:57:57 (3 years ago)

Author:

fumanchu

Message:

Lots of changes:

1. Changed global to return the TEMP tablename instead of a record. Use the new test.get function to obtain a record.
   
2. Added a 'name' arg to global to re-use the TEMP table.
   
3. New test.get(call, rownum).
   
4. Moved the few public functions into the test schema.
   
5. Moved the under-under attributes to new functions: constructor, len, iter.
   
6. Made run_test prepend the test schema to search_path.
   

Location:

trunk/epic

Files:

• epic.sql (modified) (7 diffs)
• test/test_globals.sql (modified) (2 diffs)

trunk/epic/epic.sql

@@ -227 +227 @@
 
 
-CREATE OR REPLACE FUNCTION _ensure_globals() RETURNS boolean AS $$
+CREATE OR REPLACE FUNCTION test._ensure_globals() RETURNS boolean AS $$
 BEGIN
   SET client_min_messages = warning;
   
   BEGIN
-    CREATE SEQUENCE _global_ids;
+    CREATE SEQUENCE test._global_ids;
   EXCEPTION WHEN duplicate_table THEN
     NULL;
@@ -240 +240 @@
 END;
 $$ LANGUAGE plpgsql;
-SELECT * FROM _ensure_globals();
-DROP FUNCTION _ensure_globals();
-
-
--- Note this is in the public schema!!
-CREATE OR REPLACE FUNCTION _global_record(tablename text, creator text) RETURNS record AS $$
-DECLARE
-  result         record;
-  record_stmt    text;
-BEGIN
-  EXECUTE 'SELECT NULL::text AS __name__, NULL::text AS __create__, '
-       || 'NULL::text AS __record__, NULL::text AS __iter__, '
-       || 'NULL::text AS __attributes__, 0::int AS __len__, '
-       || '* FROM ' || tablename || ' LIMIT 1' INTO result;
-  
-  -- We add these values outside the EXECUTE in case the TEMP table has no rows.
-  result.__name__ := tablename;
-  result.__create__ := creator;
-  result.__record__ := 'SELECT * FROM _global_record(''' || tablename || ''', ''' || creator || ''')';
-  result.__iter__ := 'SELECT * FROM ' || tablename;
-  result.__attributes__ := 'SELECT attname FROM test.attributes(''' || tablename || ''')';
-  EXECUTE 'SELECT COUNT(*) FROM ' || tablename INTO result.__len__;
-  
-  RETURN result;
-END;
-$$ LANGUAGE plpgsql;
-
-
--- Note this is in the public schema!!
-CREATE OR REPLACE FUNCTION global(call text) RETURNS record AS $$
--- Stores the given call's output in a TEMP table, and returns it as a record.
--- If the call produces several rows, only the first record is returned.
+SELECT * FROM test._ensure_globals();
+DROP FUNCTION test._ensure_globals();
+
+
+CREATE OR REPLACE FUNCTION test.global(call text, name text) RETURNS text AS $$
+-- Stores the given call's output in a TEMP table, and returns the TEMP table name.
 -- 
 -- 'call' can be any SELECT, table, view, or procedure that returns records.
+DECLARE
+  tablename      text;
+  creator        text;
+BEGIN
+  IF name IS NULL THEN
+    tablename := '_global_' || nextval('_global_ids');
+  ELSE
+    tablename := name;
+  END IF;
+  
+  BEGIN
+    EXECUTE 'DROP TABLE ' || tablename;
+  EXCEPTION WHEN undefined_table THEN
+    NULL;
+  END;
+  
+  creator := test.statement(call);
+  EXECUTE 'CREATE TEMP TABLE ' || tablename || ' WITHOUT OIDS AS ' || creator;
+  EXECUTE 'COMMENT ON TABLE ' || tablename || ' IS ' || quote_literal(creator);
+  RETURN tablename;
+END;
+$$ LANGUAGE plpgsql;
+
+CREATE OR REPLACE FUNCTION test.global(call text) RETURNS text AS $$
+  SELECT global FROM test.global($1, NULL);
+$$ LANGUAGE SQL;
+
+CREATE OR REPLACE FUNCTION test.get(p_tablename text, p_offset int) RETURNS record AS $$
+-- Returns a record (the first one, by default) from the given global table.
 -- 
 -- The returned record includes the following additional attributes:
@@ -280 +283 @@
 --       such as assert_column, assert_values, and assert_empty (since no
 --       procedural languages support passing records as args).
---   * __create__ (text): The SQL statement used to construct the table.
---   * __record__ (text): The SQL statement used to construct the returned record.
---       Use this to copy the returned record (perhaps in another function).
---       Example: EXECUTE g.__record__ INTO g2;
---   * __iter__ (text): An SQL string to SELECT * FROM the TEMP table.
---       Example: FOR record IN EXECUTE g.__iter__
---   * __attributes__ (text): The SQL string for TEMP table column names.
---       Example: FOR colname IN EXECUTE g.__attributes__
---   * __len__ (int): The number of rows in the TEMP table. This value
---       is NOT updated if you change the table after its creation.
-DECLARE
-  tablename      text;
-  creator        text;
+DECLARE
   result         record;
-BEGIN
-  tablename := '_global_' || nextval('_global_ids');
-  creator := test.statement(call);
-  EXECUTE 'CREATE TEMP TABLE ' || tablename || ' AS ' || creator;
-  result := _global_record(tablename, creator);
+  rownum         int;
+BEGIN
+  IF p_offset IS NULL OR p_offset < 0 THEN
+    rownum := 0;
+  ELSE
+    rownum := p_offset;
+  END IF;
+  
+  EXECUTE 'SELECT *, NULL::text AS __name__ FROM ' || p_tablename || ' LIMIT 1 OFFSET ' || rownum INTO result;
+  
+  -- We add these values outside the EXECUTE in case the SELECT returned no rows.
+  result.__name__ := p_tablename;
+  
   RETURN result;
 END;
 $$ LANGUAGE plpgsql;
 
+CREATE OR REPLACE FUNCTION test.get(p_tablename text) RETURNS record AS $$
+DECLARE
+  result         record;
+BEGIN
+  EXECUTE 'SELECT *, NULL::text AS __name__ FROM ' || p_tablename || ' LIMIT 1' INTO result;
+  
+  -- We add these values outside the EXECUTE in case the SELECT returned no rows.
+  result.__name__ := p_tablename;
+  
+  RETURN result;
+END;
+$$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION test.constructor(tablename text) RETURNS text AS $$
+-- Return the SQL statement used to construct the given global table.
+  SELECT obj_description(pgc.oid, 'pg_class') FROM pg_class pgc WHERE relname = $1;
+$$ LANGUAGE SQL;
+
+
+CREATE OR REPLACE FUNCTION test.len(tablename text) RETURNS int AS $$
+-- Return the number of rows in the given table.
+DECLARE
+  num    int;
+BEGIN
+  EXECUTE 'SELECT COUNT(*) FROM ' || tablename INTO num;
+  RETURN num;
+END
+$$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION test.iter(tablename text) RETURNS text AS $$
+-- Return SQL to retrieve all rows in the given table.
+  SELECT 'SELECT * FROM ' || $1
+$$ LANGUAGE sql;
+
 
 CREATE OR REPLACE FUNCTION test.attributes(tablename text) RETURNS SETOF pg_attribute AS $$
 DECLARE
   rec      record;
+  seen     int := 0;
 BEGIN
   FOR rec IN
@@ -314 +350 @@
     AND attnum >= 1
   LOOP
+    seen := seen + 1;
     RETURN NEXT rec;
   END LOOP;
-END;
-$$ LANGUAGE plpgsql;
-
-
-CREATE OR REPLACE FUNCTION typename(elem anyelement) RETURNS text AS $$
+  
+  IF seen = 0 THEN
+    RAISE EXCEPTION '% has no attributes.', quote_literal(tablename);
+  END IF;
+END;
+$$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION test.typename(elem anyelement) RETURNS text AS $$
 -- Return the typename of the given element.
 DECLARE
@@ -345 +386 @@
   output_record   test.results%ROWTYPE;
   splitpoint      int;
+  old_search_path text;
 BEGIN
   SELECT module INTO modulename FROM test.testnames WHERE name = testname;
@@ -350 +392 @@
   
   BEGIN
+    -- 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 || '();';
   EXCEPTION WHEN OTHERS THEN
@@ -629 +673 @@
       RETURN;
   END;
-  RAISE EXCEPTION 'Call: ''%'' did not raise an error.', call;
+  RAISE EXCEPTION 'Call: % did not raise an error.', quote_literal(call);
 END;
 $$ LANGUAGE plpgsql;

trunk/epic/test/test_globals.sql

@@ -4 +4 @@
 CREATE OR REPLACE FUNCTION test._test_global() RETURNS VOID AS $$
 DECLARE
+  g      text;
+  g2     text;
   rec    record;
   trec   record;
 BEGIN
-  rec := global('pg_namespace WHERE nspname = ''test'';');
+  g := global('pg_namespace WHERE nspname = ''test'';');
   
-  -- The result of global() should be a normal record.
+  -- The returned string MUST be the name of the TEMP table.
+  PERFORM test.assert(g LIKE E'\_global\_%', g || ' not like _global');
+  
+  rec := get(g);
+  
+  -- The result of get() should be a normal record.
   PERFORM test.assert_equal(rec.nspname, 'test');
   
@@ -15 +22 @@
   PERFORM test.assert(rec.__name__ LIKE E'\_global\_%', rec.__name__ || ' not like _global');
   
-  -- The .__name__ MUST reference a temporary table with the same fields.
-  EXECUTE 'SELECT * FROM ' || rec.__name__ INTO trec;
+  -- The global MUST reference a temporary table with the same fields.
+  EXECUTE 'SELECT * FROM ' || g INTO trec;
   PERFORM test.assert_equal(trec.nspname, 'test');
   PERFORM test.assert_equal(trec.nspowner, rec.nspowner);
   PERFORM test.assert_equal(trec.nspacl, rec.nspacl);
   
-  -- The returned record MUST possess a .__create__ attribute.
-  PERFORM test.assert_equal(rec.__create__, 'SELECT * FROM pg_namespace WHERE nspname = ''test''');
+  -- The TEMP table MUST possess its own constructor SQL string in a COMMENT
+  PERFORM test.assert_equal(constructor(g), 'SELECT * FROM pg_namespace WHERE nspname = ''test''');
   
-  -- The returned record MUST possess a .__record__ attribute.
-  PERFORM test.assert_equal(rec.__record__,
-    'SELECT * FROM _global_record(''' || rec.__name__ || ''', ''' || rec.__create__ || ''')');
+  -- Test the iter() function.
+  g2 := global('iter(''' || g || ''')');
+  PERFORM test.assert_not_empty(g2);
   
-  -- The returned record MUST possess an .__iter__ attribute.
-  PERFORM test.assert_equal(rec.__iter__, 'SELECT * FROM ' || rec.__name__);
-  PERFORM test.assert_not_empty(rec.__iter__);
+  -- Test the attributes() function.
+  PERFORM test.assert_column('SELECT attname FROM attributes(''' || g || ''')',
+                             ARRAY['nspname', 'nspowner', 'nspacl']);
   
-  -- The returned record MUST possess an .__attributes__ attribute.
-  PERFORM test.assert_equal(rec.__attributes__, 'SELECT attname FROM test.attributes(''' || rec.__name__ || ''')');
-  PERFORM test.assert_column(rec.__attributes__, ARRAY['nspname', 'nspowner', 'nspacl']);
-  
-  -- The returned record MUST possess a .__len__ attribute.
-  PERFORM test.assert_equal(rec.__len__, 1);
+  -- Test the len() function.
+  PERFORM test.assert_equal(len(g), 1);
   
   -- Raise an exception to test deletion of the TEMP table ON COMMIT
-  RAISE EXCEPTION '%', rec.__name__;
+  RAISE EXCEPTION '%', g;
 END;
 $$ LANGUAGE plpgsql;