From 0b436d49e6329ed93146a0baa7419fcd7988f0d2 Mon Sep 17 00:00:00 2001 From: Joe Nelson Date: Tue, 25 Apr 2017 22:46:34 -0500 Subject: [PATCH 1/3] Bump version --- CHANGELOG.md | 6 ++++++ app.json | 2 +- docker/Dockerfile | 2 +- postgrest.cabal | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c06563b6e..cff8a7d02 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,12 @@ This project adheres to [Semantic Versioning](http://semver.org/). ## Unreleased +### Added + +### Fixed + +## [0.4.1.0] - 2017-04-25 + ### Added - Allow requesting binary output on GET - @steve-chavez - Accept clients requesting `Content-Type: application/json` from / - @feynmanliang diff --git a/app.json b/app.json index aa799320b..6b4faf366 100644 --- a/app.json +++ b/app.json @@ -10,7 +10,7 @@ }, "POSTGREST_VER": { "description": "Version of PostgREST to deploy", - "value": "0.4.0.0" + "value": "0.4.1.0" }, "DB_URI": { "description": "Database connection string", diff --git a/docker/Dockerfile b/docker/Dockerfile index a71b6d7c8..8e526c890 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,6 +1,6 @@ FROM debian:jessie -ENV POSTGREST_VERSION 0.4.0.0 +ENV POSTGREST_VERSION 0.4.1.0 RUN apt-get update && \ apt-get install -y tar xz-utils wget libpq-dev && \ diff --git a/postgrest.cabal b/postgrest.cabal index 9233df817..0848b93ca 100644 --- a/postgrest.cabal +++ b/postgrest.cabal @@ -2,7 +2,7 @@ name: postgrest description: Reads the schema of a PostgreSQL database and creates RESTful routes for the tables and views, supporting all HTTP verbs that security permits. -version: 0.4.0.0 +version: 0.4.1.0 synopsis: REST API for any Postgres database license: MIT license-file: LICENSE From d99462be013053e6dfe17a0c5eadf843b8d8bceb Mon Sep 17 00:00:00 2001 From: Joe Nelson Date: Tue, 25 Apr 2017 22:44:24 -0500 Subject: [PATCH 2/3] Revert "Fix swagger-ui when "server-proxy-uri" is not set (#857)" This was a bug in swagger-ui, not postgrest --- CHANGELOG.md | 1 - src/PostgREST/App.hs | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cff8a7d02..f480e6938 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,7 +25,6 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Resource embedding in views referencing tables in public schema - @fab1an - #777, Empty body is allowed when calling a non-parameterized RPC - @koulakis - #831, Fix proc resource embedding issue with search_path - @steve-chavez -- #857, Fix swagger-ui when "server-proxy-uri" is not set - @feynmanliang - #547, Use read-only transaction for stable/immutable RPC - @begriffs ## [0.4.0.0] - 2017-01-19 diff --git a/src/PostgREST/App.hs b/src/PostgREST/App.hs index be1774c37..938a4590b 100644 --- a/src/PostgREST/App.hs +++ b/src/PostgREST/App.hs @@ -245,7 +245,7 @@ app dbStructure conf apiRequest = let host = configHost conf port = toInteger $ configPort conf proxy = pickProxy $ toS <$> configProxyUri conf - uri Nothing = ("http", host, port, "") + uri Nothing = ("http", host, port, "/") uri (Just Proxy { proxyScheme = s, proxyHost = h, proxyPort = p, proxyPath = b }) = (s, h, p, b) uri' = uri proxy encodeApi ti = encodeOpenAPI (M.elems $ dbProcs dbStructure) ti uri' From 7ba880e9023099d6aa025357b36e94506f500849 Mon Sep 17 00:00:00 2001 From: Joe Nelson Date: Sat, 29 Apr 2017 21:07:42 -0500 Subject: [PATCH 3/3] Re-enable openapi tests on CI --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 89da414f9..a97ce0893 100644 --- a/circle.yml +++ b/circle.yml @@ -15,7 +15,7 @@ dependencies: test: override: - - POSTGREST_TEST_CONNECTION=$(test/create_test_db "postgres://ubuntu@localhost" postgrest_test) stack test --test-arguments "--skip \"returns a valid openapi\"" + - POSTGREST_TEST_CONNECTION=$(test/create_test_db "postgres://ubuntu@localhost" postgrest_test) stack test - git ls-files | grep '\.l\?hs$' | xargs stack exec -- hlint -X QuasiQuotes -X NoPatternSynonyms "$@" - stack exec -- cabal update - stack exec --no-ghc-package-path -- cabal install --only-d --dry-run