Changeset 22

Timestamp:

09/03/08 08:55:33 (3 years ago)

Author:

fumanchu

Message:

Added __create__, __record__, __iter__, __attributes__, and __len__ to global records. Moved the 'attributes' function into the test schema.

Location:

trunk/epic

Files:

• epic.sql (modified) (3 diffs)
• test/test_globals.sql (modified) (1 diff)

trunk/epic/epic.sql

@@ -244 +244 @@
 
 
+-- 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.
@@ -251 +276 @@
 -- 
 -- The returned record includes the following additional attributes:
---   * tablename (text): The complete name of the TEMP table. This allows you
---       to pass my_record_var.tablename to functions that take a 'call text'
---       argument, such as assert_column, assert_values, and assert_empty
---       (since no procedural languages support passing records as args).
+--   * __name__ (text): The complete name of the TEMP table. This allows you
+--       to pass g.__name__ to functions that take a 'call text' argument,
+--       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;
   result         record;
 BEGIN
   tablename := '_global_' || nextval('_global_ids');
-  EXECUTE 'CREATE TEMP TABLE ' || tablename || ' AS ' || test.statement(call);
-  EXECUTE 'SELECT ''' || tablename || '''::text AS tablename, * FROM ' || tablename || ' LIMIT 1' INTO result;
-  IF result.tablename IS NULL THEN
-    -- Our temp table has no rows, so our tablename wasn't selected either.
-    result.tablename := tablename;
-  END IF;
+  creator := test.statement(call);
+  EXECUTE 'CREATE TEMP TABLE ' || tablename || ' AS ' || creator;
+  result := _global_record(tablename, creator);
   RETURN result;
 END;
@@ -271 +304 @@
 
 
-CREATE OR REPLACE FUNCTION attributes(tablename text) RETURNS SETOF pg_attribute AS $$
+CREATE OR REPLACE FUNCTION test.attributes(tablename text) RETURNS SETOF pg_attribute AS $$
 DECLARE
   rec      record;

trunk/epic/test/test_globals.sql

@@ -12 +12 @@
   PERFORM test.assert_equal(rec.nspname, 'test');
   
-  -- The returned record MUST possess a .tablename attribute.
-  PERFORM test.assert(rec.tablename LIKE E'\_global\_%', rec.tablename || ' not like _global');
+  -- The returned record MUST possess a .__name__ attribute.
+  PERFORM test.assert(rec.__name__ LIKE E'\_global\_%', rec.__name__ || ' not like _global');
   
-  -- The tablename MUST reference a temporary table with the same fields.
-  EXECUTE 'SELECT * FROM ' || rec.tablename INTO trec;
+  -- The .__name__ MUST reference a temporary table with the same fields.
+  EXECUTE 'SELECT * FROM ' || rec.__name__ 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);
   
-  RAISE EXCEPTION '%', rec.tablename;
+  -- The returned record MUST possess a .__create__ attribute.
+  PERFORM test.assert_equal(rec.__create__, '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__ || ''')');
+  
+  -- 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__);
+  
+  -- 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);
+  
+  -- Raise an exception to test deletion of the TEMP table ON COMMIT
+  RAISE EXCEPTION '%', rec.__name__;
 END;
 $$ LANGUAGE plpgsql;