Merge pull request #2185 from lonvia/fix-deadlock-handling-for-psycopg27

Improve deadlock detection for various versions of psycopg2

diff --git a/lib-php/website/details.php b/lib-php/website/details.php
index 130dcaf81e92945f126969497f405ed216035142..bd7df12c23a7cc936423d930335458e27c187860 100644 (file)
--- a/lib-php/website/details.php
+++ b/lib-php/website/details.php
@@ -81,10 +81,15 @@ if ($sOsmType && $iOsmId > 0) {
             exit;
         }
     }
-}
-
 
-if ($sPlaceId === false) userError('Please select a place id');
+    if ($sPlaceId === false) {
+        throw new Exception('No place with that OSM ID found.', 404);
+    }
+} else {
+    if ($sPlaceId === false) {
+        userError('Required parameters missing. Need either osmtype/osmid or place_id.');
+    }
+}
 
 $iPlaceID = (int)$sPlaceId;
 
@@ -140,7 +145,7 @@ $sSQL .= " WHERE place_id = $iPlaceID";
 $aPointDetails = $oDB->getRow($sSQL, null, 'Could not get details of place object.');
 
 if (!$aPointDetails) {
-    userError('Unknown place id.');
+    throw new Exception('No place with that place ID found.', 404);
 }
 
 $aPointDetails['localname'] = $aPointDetails['localname']?$aPointDetails['localname']:$aPointDetails['housenumber'];

diff --git a/test/bdd/api/details/simple.feature b/test/bdd/api/details/simple.feature
index a9b6d6a70553d933e5c3acd0ee01e1a2145e3b10..c38018bcea4506874da8852ded6ae4566a2283f1 100644 (file)
--- a/test/bdd/api/details/simple.feature
+++ b/test/bdd/api/details/simple.feature
@@ -44,7 +44,7 @@ Feature: Object details
 
     Scenario Outline: Details via unknown OSM id
         When sending details query for <object>
-        Then a HTTP 400 is returned
+        Then a HTTP 404 is returned
 
     Examples:
       | object |