Remove Oracle.py Customisations

Author: jwallace94

pygeoapi/provider/oracle.py

@@ -707,8 +707,6 @@ def query(
                             f"Missing mandatory filter property: {mand_col}"
                         )
 
-        # GA customisation - unindented until Line 755 (pagination)
-        # if resulttype == "hits":
         with DatabaseConnection(
             self.conn_dic,
             self.table,
@@ -729,9 +727,36 @@ def query(
             # because of getFields ...
             sql_query = f"SELECT COUNT(1) AS hits \
                             FROM {self.table} \
-                            {where_dict['clause']}"
+                            {where_dict['clause']} #WHERE#"
+
+            # Assign where_dict["properties"] to bind_variables
+            bind_variables = {**where_dict["properties"]}
+
+            # Default values for the process_query function (sql_manipulator)
+            query_args = {
+                "offset": offset,
+                "limit": limit,
+                "resulttype": resulttype,
+                "bbox": bbox,
+                "datetime_": datetime_,
+                "properties": properties,
+                "sortby": sortby,
+                "skip_geometry": skip_geometry,
+                "select_properties": select_properties,
+                "crs_transform_spec": crs_transform_spec,
+                "q": q,
+                "language": language,
+                "filterq": filterq,
+            }
+
+            # Apply the SQL manipulation plugin
+            extra_params["geom"] = self.geom
+            sql_query, bind_variables = self._process_query_with_sql_manipulator_sup(   # noqa: E501
+                db, sql_query, bind_variables, extra_params, **query_args
+            )
+
             try:
-                cursor.execute(sql_query, where_dict["properties"])
+                cursor.execute(sql_query, bind_variables)
             except oracledb.Error as err:
                 LOGGER.error(
                     f"Error executing sql_query: {sql_query}: {err}"
@@ -741,9 +766,6 @@ def query(
             hits = cursor.fetchone()[0]
             LOGGER.debug(f"hits: {str(hits)}")
 
-            # GA customisation - desable the return below (pagination)
-            # return self._response_feature_hits(hits)
-
         with DatabaseConnection(
             self.conn_dic, self.table, properties=self.properties
         ) as db:
@@ -855,7 +877,6 @@ def query(
 
             # Generate feature JSON
             features = [self._response_feature(rd) for rd in row_data]
-            # GA customisation - "numberMatched": hits, (pagination)
             feature_collection = {
                 "numberMatched": hits,
                 "type": "FeatureCollection",
@@ -1359,4 +1380,4 @@ def _class_factory(
         ), f"class {class_name} should inherit from {super_cls.__name__}"
     LOGGER.debug(f"initialising {class_name} with params {kwargs}")
     obj = cls(**kwargs)
-    return obj
+    return obj