entrouvert/wcs
entrouvert
/
wcs
14
1
Fork 0
Code Issues Pull Requests 44 Releases Activity

sql: fix postgresql version number comparisons

This commit is contained in:
Frédéric Péters 2016-03-04 17:25:34 +01:00
parent 2e130848b7
commit 0be2bc1a9f
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/test_sql.py
View File

@ -1334,7 +1334,7 @@ def test_views_submission_info():
@postgresql
def test_materialized_view():
conn, cur = sql.get_connection_and_cursor()
if pub.pg_version < 94000:
if pub.pg_version < 90400:
pytest.skip('this requires PostgreSQL >= 9.4')
return

10
wcs/sql.py
View File

@ -232,7 +232,7 @@ def get_connection(new=False):
else:
cur = get_publisher().pgconn.cursor()
cur.execute('SHOW server_version_num')
get_publisher().pg_version = cur.fetchone()[0]
get_publisher().pg_version = int(cur.fetchone()[0])
cur.close()
return get_publisher().pgconn
@ -651,7 +651,7 @@ def drop_global_views(conn, cur):
for view_name in view_names:
cur.execute('''DROP VIEW IF EXISTS %s''' % view_name)
if get_publisher().pg_version >= 94000:
if get_publisher().pg_version >= 90400:
cur.execute('''DROP MATERIALIZED VIEW IF EXISTS wcs_materialized_all_forms''')
cur.execute('''DROP VIEW IF EXISTS wcs_all_forms''')
@ -1627,7 +1627,7 @@ class AnyFormData(SqlMixin):
@guard_postgres
def create_materialized_view_if_not_exists(conn, cur):
if get_publisher().pg_version < 94000:
if get_publisher().pg_version < 90400:
return
try:
cur.execute('''CREATE MATERIALIZED VIEW wcs_materialized_all_forms
@ -1639,7 +1639,7 @@ def create_materialized_view_if_not_exists(conn, cur):
@guard_postgres
def refresh_materialized_views():
conn, cur = get_connection_and_cursor()
if get_publisher().pg_version < 94000:
if get_publisher().pg_version < 90400:
return
try:
cur.execute('REFRESH MATERIALIZED VIEW wcs_materialized_all_forms')
@ -1651,7 +1651,7 @@ def refresh_materialized_views():
def get_period_query(period_start=None, period_end=None, criterias=None, parameters=None):
clause = [NotNull('receipt_time')]
if get_publisher().pg_version >= 94000:
if get_publisher().pg_version >= 90400:
table_name = 'wcs_materialized_all_forms'
else:
table_name = 'wcs_all_forms'