diff --git a/Makefile b/Makefile index 63c0a6f..e24ba70 100644 --- a/Makefile +++ b/Makefile @@ -18,13 +18,9 @@ MODULE_big = odbc_fdw OBJS = odbc_fdw.o EXTENSION = odbc_fdw -DATA = odbc_fdw--0.0.1.sql \ - odbc_fdw--0.1.0.sql \ - odbc_fdw--0.2.0.sql \ - odbc_fdw--0.0.1--0.1.0.sql \ - odbc_fdw--0.1.0--0.0.1.sql \ - odbc_fdw--0.1.0--0.2.0.sql \ - odbc_fdw--0.2.0--0.1.0.sql +DATA = odbc_fdw--0.3.0.sql \ + odbc_fdw--0.2.0--0.3.0.sql \ + odbc_fdw--0.3.0--0.2.0.sql TEST_DIR = test/ REGRESS = $(notdir $(basename $(sort $(wildcard $(TEST_DIR)/sql/*test.sql)))) diff --git a/NEWS.md b/NEWS.md index 0aa99b6..ad1bc34 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,7 +1,7 @@ # Changelog ## 0.3.0 -Released yyyy-mm-dd +Released 2018-02-20 Bug fixes: - Fixed issues with travis builds diff --git a/odbc_fdw--0.0.1.sql b/odbc_fdw--0.0.1.sql deleted file mode 100644 index 903c5b7..0000000 --- a/odbc_fdw--0.0.1.sql +++ /dev/null @@ -1,30 +0,0 @@ -/*------------------------------------------------------------------------- - * - * foreign-data wrapper for ODBC - * - * Copyright (c) 2011, PostgreSQL Global Development Group - * Copyright (c) 2016, CARTO - * - * This software is released under the PostgreSQL Licence - * - * Original author: Zheng Yang - * - * IDENTIFICATION - * odbc_fdw/odbc_fdw--0.0.1.sql - * - *------------------------------------------------------------------------- - */ - -CREATE FUNCTION odbc_fdw_handler() -RETURNS fdw_handler -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT; - -CREATE FUNCTION odbc_fdw_validator(text[], oid) -RETURNS void -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT; - -CREATE FOREIGN DATA WRAPPER odbc_fdw - HANDLER odbc_fdw_handler - VALIDATOR odbc_fdw_validator; diff --git a/odbc_fdw--0.1.0--0.2.0.sql b/odbc_fdw--0.1.0--0.2.0.sql deleted file mode 100644 index eba7bb4..0000000 --- a/odbc_fdw--0.1.0--0.2.0.sql +++ /dev/null @@ -1,44 +0,0 @@ -/*------------------------------------------------------------------------- - * - * foreign-data wrapper for ODBC - * - * Copyright (c) 2011, PostgreSQL Global Development Group - * Copyright (c) 2016, CARTO - * - * This software is released under the PostgreSQL Licence - * - * Original author: Zheng Yang - * - * IDENTIFICATION - * odbc_fdw/odbc_fdw--0.2.0.sql - * - *------------------------------------------------------------------------- - */ - -CREATE OR REPLACE FUNCTION odbc_fdw_handler() -RETURNS fdw_handler -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT; - -CREATE OR REPLACE FUNCTION odbc_fdw_validator(text[], oid) -RETURNS void -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT; - -ALTER FOREIGN DATA WRAPPER odbc_fdw - HANDLER odbc_fdw_handler - VALIDATOR odbc_fdw_validator; - -CREATE TYPE __tabledata AS (schema text, name text); - -CREATE OR REPLACE FUNCTION ODBCTablesList(text, integer DEFAULT 0) RETURNS SETOF __tabledata -AS 'MODULE_PATHNAME', 'odbc_tables_list' -LANGUAGE C STRICT; - -CREATE OR REPLACE FUNCTION ODBCTableSize(text, text) RETURNS INTEGER -AS 'MODULE_PATHNAME', 'odbc_table_size' -LANGUAGE C STRICT; - -CREATE OR REPLACE FUNCTION ODBCQuerySize(text, text) RETURNS INTEGER -AS 'MODULE_PATHNAME', 'odbc_query_size' -LANGUAGE C STRICT; diff --git a/odbc_fdw--0.1.0.sql b/odbc_fdw--0.1.0.sql deleted file mode 100644 index f88cce9..0000000 --- a/odbc_fdw--0.1.0.sql +++ /dev/null @@ -1,30 +0,0 @@ -/*------------------------------------------------------------------------- - * - * foreign-data wrapper for ODBC - * - * Copyright (c) 2011, PostgreSQL Global Development Group - * Copyright (c) 2016, CARTO - * - * This software is released under the PostgreSQL Licence - * - * Original author: Zheng Yang - * - * IDENTIFICATION - * odbc_fdw/odbc_fdw--0.1.0.sql - * - *------------------------------------------------------------------------- - */ - -CREATE FUNCTION odbc_fdw_handler() -RETURNS fdw_handler -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT; - -CREATE FUNCTION odbc_fdw_validator(text[], oid) -RETURNS void -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT; - -CREATE FOREIGN DATA WRAPPER odbc_fdw - HANDLER odbc_fdw_handler - VALIDATOR odbc_fdw_validator; diff --git a/odbc_fdw--0.2.0--0.1.0.sql b/odbc_fdw--0.2.0--0.1.0.sql deleted file mode 100644 index 00a9032..0000000 --- a/odbc_fdw--0.2.0--0.1.0.sql +++ /dev/null @@ -1,36 +0,0 @@ -/*------------------------------------------------------------------------- - * - * foreign-data wrapper for ODBC - * - * Copyright (c) 2011, PostgreSQL Global Development Group - * Copyright (c) 2016, CARTO - * - * This software is released under the PostgreSQL Licence - * - * Original author: Zheng Yang - * - * IDENTIFICATION - * odbc_fdw/odbc_fdw--0.2.0.sql - * - *------------------------------------------------------------------------- - */ - -CREATE OR REPLACE FUNCTION odbc_fdw_handler() -RETURNS fdw_handler -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT; - -CREATE OR REPLACE FUNCTION odbc_fdw_validator(text[], oid) -RETURNS void -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT; - -ALTER FOREIGN DATA WRAPPER odbc_fdw - HANDLER odbc_fdw_handler - VALIDATOR odbc_fdw_validator; - -DROP FUNCTION IF EXISTS ODBCTablesList(text, integer); -DROP FUNCTION IF EXISTS ODBCTableSize(text, text); -DROP FUNCTION IF EXISTS ODBCQuerySize(text, text); - -DROP TYPE __tabledata; diff --git a/odbc_fdw--0.0.1--0.1.0.sql b/odbc_fdw--0.2.0--0.3.0.sql similarity index 53% rename from odbc_fdw--0.0.1--0.1.0.sql rename to odbc_fdw--0.2.0--0.3.0.sql index 5b6c8d9..7a4810e 100644 --- a/odbc_fdw--0.0.1--0.1.0.sql +++ b/odbc_fdw--0.2.0--0.3.0.sql @@ -3,7 +3,7 @@ * foreign-data wrapper for ODBC * * Copyright (c) 2011, PostgreSQL Global Development Group - * Copyright (c) 2016, CARTO + * Copyright (c) 2016, 2017, 2018, CARTO * * This software is released under the PostgreSQL Licence * @@ -12,16 +12,4 @@ *------------------------------------------------------------------------- */ -CREATE OR REPLACE FUNCTION odbc_fdw_handler() -RETURNS fdw_handler -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT; - -CREATE OR REPLACE FUNCTION odbc_fdw_validator(text[], oid) -RETURNS void -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT; - -ALTER FOREIGN DATA WRAPPER odbc_fdw - HANDLER odbc_fdw_handler - VALIDATOR odbc_fdw_validator; +-- Empty file as there are no changes in API between 0.2.0 and 0.3.0 diff --git a/odbc_fdw--0.1.0--0.0.1.sql b/odbc_fdw--0.3.0--0.2.0.sql similarity index 53% rename from odbc_fdw--0.1.0--0.0.1.sql rename to odbc_fdw--0.3.0--0.2.0.sql index 5b6c8d9..7a4810e 100644 --- a/odbc_fdw--0.1.0--0.0.1.sql +++ b/odbc_fdw--0.3.0--0.2.0.sql @@ -3,7 +3,7 @@ * foreign-data wrapper for ODBC * * Copyright (c) 2011, PostgreSQL Global Development Group - * Copyright (c) 2016, CARTO + * Copyright (c) 2016, 2017, 2018, CARTO * * This software is released under the PostgreSQL Licence * @@ -12,16 +12,4 @@ *------------------------------------------------------------------------- */ -CREATE OR REPLACE FUNCTION odbc_fdw_handler() -RETURNS fdw_handler -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT; - -CREATE OR REPLACE FUNCTION odbc_fdw_validator(text[], oid) -RETURNS void -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT; - -ALTER FOREIGN DATA WRAPPER odbc_fdw - HANDLER odbc_fdw_handler - VALIDATOR odbc_fdw_validator; +-- Empty file as there are no changes in API between 0.2.0 and 0.3.0 diff --git a/odbc_fdw--0.2.0.sql b/odbc_fdw--0.3.0.sql similarity index 96% rename from odbc_fdw--0.2.0.sql rename to odbc_fdw--0.3.0.sql index 94559ce..a4ac75b 100644 --- a/odbc_fdw--0.2.0.sql +++ b/odbc_fdw--0.3.0.sql @@ -3,7 +3,7 @@ * foreign-data wrapper for ODBC * * Copyright (c) 2011, PostgreSQL Global Development Group - * Copyright (c) 2016, CARTO + * Copyright (c) 2016, 2017, 2018, CARTO * * This software is released under the PostgreSQL Licence * diff --git a/odbc_fdw.control b/odbc_fdw.control index f257aba..f3a5f61 100644 --- a/odbc_fdw.control +++ b/odbc_fdw.control @@ -3,10 +3,11 @@ # foreign-data wrapper for ODBC # # Copyright (c) 2011, PostgreSQL Global Development Group +# Copyright (c) 2016, 2017, 2018, CARTO # # This software is released under the PostgreSQL Licence # -# Author: Zheng Yang +# Original author: Zheng Yang # # IDENTIFICATION # odbc_fdw/odbc_fdw.control @@ -14,6 +15,6 @@ ########################################################################## comment = 'Foreign data wrapper for accessing remote databases using ODBC' -default_version = '0.2.0' +default_version = '0.3.0' module_pathname = '$libdir/odbc_fdw' relocatable = true