Merge remote-tracking branch 'upstream/master'

[nominatim.git] / nominatim / db / connection.py

diff --git a/nominatim/db/connection.py b/nominatim/db/connection.py
index 4d30151d7f20acb8d4e8e8a18e2d1d5e8856d5fb..c7e22c98e500c7d53936fad88fa77a8bdd3fad7f 100644 (file)
--- a/nominatim/db/connection.py
+++ b/nominatim/db/connection.py
@@ -50,6 +50,15 @@ class _Connection(psycopg2.extensions.connection):
                                 WHERE tablename = %s""", (table, ))
             return num == 1
 
+    def server_version_tuple(self):
+        """ Return the server version as a tuple of (major, minor).
+            Converts correctly for pre-10 and post-10 PostgreSQL versions.
+        """
+        version = self.server_version
+        if version < 100000:
+            return (version / 10000, (version % 10000) / 100)
+
+        return (version / 10000, version % 10000)
 
 def connect(dsn):
     """ Open a connection to the database using the specialised connection