Drop postgres 9.6 specific setting from structure.sql

Closes #2404

diff --git a/.travis.yml b/.travis.yml
index 18f4ee2aa8499810179316bbe3ba1a74c91e70f5..eed4575e5dfa5399ce0184826a8144b752ee2dd1 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,7 +15,7 @@ env:
   global:
     - OSM_MEMCACHE_SERVERS="127.0.0.1"
 before_script:
   global:
     - OSM_MEMCACHE_SERVERS="127.0.0.1"
 before_script:

-  - sed -e "/idle_in_transaction_session_timeout/d" -e 's/ IMMUTABLE / /' -e "/^--/d" db/structure.sql > db/structure.expected
+  - sed -e 's/ IMMUTABLE / /' -e "/^--/d" db/structure.sql > db/structure.expected

   - psql -U postgres -c "CREATE DATABASE openstreetmap"
   - psql -U postgres -c "CREATE EXTENSION btree_gist" openstreetmap
   - psql -U postgres -f db/functions/functions.sql openstreetmap
   - psql -U postgres -c "CREATE DATABASE openstreetmap"
   - psql -U postgres -c "CREATE EXTENSION btree_gist" openstreetmap
   - psql -U postgres -f db/functions/functions.sql openstreetmap

diff --git a/db/structure.sql b/db/structure.sql
index dce83214d056aeb71514474fb93424eba8285ad6..03950502c52702b8ce005f0071c648dfaa5ee14c 100644 (file)
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -1,6 +1,5 @@
 SET statement_timeout = 0;
 SET lock_timeout = 0;
 SET statement_timeout = 0;
 SET lock_timeout = 0;

-SET idle_in_transaction_session_timeout = 0;

 SET client_encoding = 'UTF8';
 SET standard_conforming_strings = on;
 SELECT pg_catalog.set_config('search_path', '', false);
 SET client_encoding = 'UTF8';
 SET standard_conforming_strings = on;
 SELECT pg_catalog.set_config('search_path', '', false);