Add test function

diff --git a/src/test/regress/ddl-deparse/ddl-schedule b/src/test/regress/ddl-deparse/ddl-schedule
index d8cfcaf5bc89fcaaf44cf1a17f50f97d6ce24d9a..f7f5ebe9032133c335010f1dc7bf341b136a5519 100644 (file)
--- a/src/test/regress/ddl-deparse/ddl-schedule
+++ b/src/test/regress/ddl-deparse/ddl-schedule
@@ -10,7 +10,7 @@ test: deparse_init
 
 # DDL tests
 test: create_table
-#test: create_function
+test: create_function
 
 # Final DDL deparse test
 test: deparse_test

diff --git a/src/test/regress/ddl-deparse/input/create_function.source b/src/test/regress/ddl-deparse/input/create_function.source
index 9982a73f8c8642c7af4e10f525353dc2f28ea697..b77619a25350a1a4ef3b17234fd3cb2ddfe83dff 100644 (file)
--- a/src/test/regress/ddl-deparse/input/create_function.source
+++ b/src/test/regress/ddl-deparse/input/create_function.source
@@ -1,4 +1,4 @@
-CREATE FUNCTION check_foreign_key ()
-   RETURNS trigger
-   AS '@libdir@/refint@DLSUFFIX@'
+CREATE FUNCTION c_function_test ()
+   RETURNS INT
+   AS '@libdir@/regress@DLSUFFIX@', 'c_function_test'
    LANGUAGE C;
\ No newline at end of file

diff --git a/src/test/regress/ddl-deparse/output/create_function.source b/src/test/regress/ddl-deparse/output/create_function.source
index 58dba522ebf62d1c6b3d8a6f2bf2995facbd98b1..c0b7864fd5beb78b276b72d2a57e2a1b3a0ea744 100644 (file)
--- a/src/test/regress/ddl-deparse/output/create_function.source
+++ b/src/test/regress/ddl-deparse/output/create_function.source
@@ -1,4 +1,4 @@
-CREATE FUNCTION check_foreign_key ()
-   RETURNS trigger
-   AS '@libdir@/refint@DLSUFFIX@'
+CREATE FUNCTION c_function_test ()
+   RETURNS INT
+   AS '@libdir@/regress@DLSUFFIX@', 'c_function_test'
    LANGUAGE C;

diff --git a/src/test/regress/ddl-deparse/output/deparse_test.source b/src/test/regress/ddl-deparse/output/deparse_test.source
index cf41e95c7898f8b69c44188abb45824756a8b9e8..185f006137c8084a90cb1596512e8bc5eb30fbfb 100644 (file)
--- a/src/test/regress/ddl-deparse/output/deparse_test.source
+++ b/src/test/regress/ddl-deparse/output/deparse_test.source
@@ -33,6 +33,15 @@ COMMENT ON EXTENSION plpgsql IS 'PL/pgSQL procedural language';
 
 SET search_path = public, pg_catalog;
 
+--
+-- Name: c_function_test(); Type: FUNCTION; Schema: public; Owner: -
+--
+
+CREATE FUNCTION c_function_test() RETURNS integer
+    LANGUAGE c
+    AS '@libdir@/regress@DLSUFFIX@', 'c_function_test';
+
+
 --
 -- Name: datatype_table_id_seq; Type: SEQUENCE; Schema: public; Owner: -
 --

diff --git a/src/test/regress/ddl-deparse/regress.c b/src/test/regress/ddl-deparse/regress.c
index 9d399acb9f18cfa7c1e15770ad6396908b76a1bc..74270b5bbaa773179739a87fc17fb4beedebf9a5 100644 (file)
--- a/src/test/regress/ddl-deparse/regress.c
+++ b/src/test/regress/ddl-deparse/regress.c
@@ -10,6 +10,23 @@
 PG_MODULE_MAGIC;
 #endif
 
+
+/*
+ * c_function_test()
+ *
+ * Simple C-language function
+ */
+
+PG_FUNCTION_INFO_V1(c_function_test);
+Datum
+c_function_test(PG_FUNCTION_ARGS)
+{
+   int32   arg = PG_GETARG_INT32(0);
+
+   PG_RETURN_INT32(arg + 1);
+}
+
+
 /*
  * deparse_test_ddl_command_end()
  *
@@ -24,7 +41,7 @@ PG_FUNCTION_INFO_V1(deparse_test_ddl_command_end);
 Datum
 deparse_test_ddl_command_end(PG_FUNCTION_ARGS)
 {
-   int               ret, row;
+   int               ret, row;
    TupleDesc         spi_tupdesc;
    const char       *get_creation_commands;
    const char       *save_command_text;
@@ -64,7 +81,7 @@ deparse_test_ddl_command_end(PG_FUNCTION_ARGS)
        Datum      json;
        Datum      command;
        bool       isnull;
-       Oid        argtypes[1];
+       Oid        argtypes[1];
        Datum      values[1];
 
        spi_tuple = SPI_tuptable->vals[row];

diff --git a/src/test/regress/ddl-deparse/results/create_function.out b/src/test/regress/ddl-deparse/results/create_function.out
deleted file mode 100644 (file)
index 9a9ba9d..0000000
--- a/src/test/regress/ddl-deparse/results/create_function.out
+++ /dev/null
@@ -1,5 +0,0 @@
-CREATE FUNCTION check_foreign_key ()
-   RETURNS trigger
-   AS '/space/sda1/ibarwick/2ndquadrant_bdr/src/test/regress/ddl-deparse/refint.so'
-   LANGUAGE C;
-ERROR:  could not access file "/space/sda1/ibarwick/2ndquadrant_bdr/src/test/regress/ddl-deparse/refint.so": No such file or directory

diff --git a/src/test/regress/ddl-deparse/sql/.gitignore b/src/test/regress/ddl-deparse/sql/.gitignore
index 491562b1b10cf881a950af39dc7233961b9e51d3..a7184c9b8b010eca72a22f60777381717cc6ef4d 100644 (file)
--- a/src/test/regress/ddl-deparse/sql/.gitignore
+++ b/src/test/regress/ddl-deparse/sql/.gitignore
@@ -1,5 +1,5 @@
 # Following files are auto-generated by pg_regress
-/create_function_ddl_demo.sql
+/create_function.sql
 /deparse_init.sql
 /deparse_test.sql
 /deparse_dump.sql

diff --git a/src/test/regress/ddl-deparse/sql/create_function.sql b/src/test/regress/ddl-deparse/sql/create_function.sql
deleted file mode 100644 (file)
index 97e9bd3..0000000
--- a/src/test/regress/ddl-deparse/sql/create_function.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-CREATE FUNCTION check_foreign_key ()
-   RETURNS trigger
-   AS '/Users/barwick/devel/postgres/src/2ndquadrant_bdr/src/test/regress/ddl-deparse/refint.so'
-   LANGUAGE C;
\ No newline at end of file