Changeset 30

Timestamp:

06/01/09 19:37:06 (3 years ago)

Author:

fumanchu

Message:

Fix for #4 (Allow VALUES Query in assert_rows()).

Location:

trunk/epic

Files:

• epic.sql (modified) (1 diff)
• test/test_core.sql (modified) (1 diff)

trunk/epic/epic.sql

@@ -217 +217 @@
 BEGIN
   result := rtrim(call, ';');
-  IF NOT result ~* '^[[:space:]]*(SELECT|EXECUTE)[[:space:]]' THEN
-    result := 'SELECT * FROM ' || result;
-  END IF;
-  RETURN result;
+  IF result ~* '^[[:space:]]*(SELECT|EXECUTE)[[:space:]]' THEN
+    return result;
+  ELSIF result ~* E'^[[:space:]]*(VALUES)[[:space:]]*\\(' THEN
+    return result;
+  ELSE
+    return 'SELECT * FROM ' || result;
+  END IF;
 END;
 $$ LANGUAGE plpgsql;

trunk/epic/test/test_core.sql

@@ -27 +27 @@
   PERFORM test.assert_equal(t, 'EXECUTE myfoo');
   
+  -- Test VALUES
+  SELECT INTO t * FROM test.statement('VALUES (99, ''foo'')');
+  PERFORM test.assert_equal(t, 'VALUES (99, ''foo'')');
+  SELECT INTO t * FROM test.statement('VALUES(99, ''foo'')');
+  PERFORM test.assert_equal(t, 'VALUES(99, ''foo'')');
+  
   PERFORM test.pass();
 END;