[source-postgres]Non CDC CAT test for postgres

.gitignore

@@ -27,6 +27,9 @@ updated_configurations
 # Connector debug configs
 airbyte-integrations/connectors/**/src/test/resources/debug_resources
 
+# Connector CAT test related files
+airbyte-integrations/connectors/**/integration_tests/temp
+
 # Python
 *.egg-info
 __pycache__

airbyte-integrations/bases/connector-acceptance-test/connector_acceptance_test/tests/test_incremental.py

@@ -407,7 +407,8 @@ def _get_cursor_values_from_states_by_cursor(states: Union[list, dict], cursor_f
 
             if isinstance(current_node, dict):
                 for key, value in current_node.items():
-                    if key == cursor_field:
+                    # DB sources use a hardcoded field `cursor` to denote cursor value.
+                    if key == "cursor" or key == cursor_field:
                         values.append(value)
                     nodes_to_visit.append(value)
             elif isinstance(current_node, list):

airbyte-integrations/connectors/source-postgres/acceptance-test-config.yml

@@ -15,17 +15,58 @@ acceptance_tests:
         deployment_mode: cloud
         backward_compatibility_tests_config:
           disable_for_version: "1.0.52"
-      - spec_path: "src/test-integration/resources/expected_spec.json"
-        config_path: "secrets/config_cdc.json"
-        backward_compatibility_tests_config:
-          disable_for_version: "1.0.52"
   connection:
     tests:
       - config_path: "secrets/config.json"
         status: "succeed"
-      - config_path: "secrets/config_cdc.json"
-        status: "succeed"
+  discovery:
+    tests:
+      - config_path: "secrets/config.json"
+        backward_compatibility_tests_config:
+          disable_for_version: "2.1.1"
+  basic_read:
+    tests:
+      - config_path: "secrets/config.json"
+        configured_catalog_path: "integration_tests/temp/configured_catalog_copy.json"
+        expect_records:
+          path: "integration_tests/expected_records.txt"
+        client_container_config:
+          client_container_dockerfile_path: "integration_tests/Dockerfile"
+          setup_command:
+            - "python"
+            - "./hook.py"
+            - "setup"
+          teardown_command:
+            - "python"
+            - "./hook.py"
+            - "teardown"
   full_refresh:
     tests:
       - config_path: "secrets/config.json"
-      - config_path: "secrets/config_cdc.json"
+        configured_catalog_path: "integration_tests/temp/configured_catalog_copy.json"
+        client_container_config:
+          client_container_dockerfile_path: "integration_tests/Dockerfile"
+          setup_command:
+            - "python"
+            - "./hook.py"
+            - "setup"
+          teardown_command:
+            - "python"
+            - "./hook.py"
+            - "teardown"
+  incremental:
+    tests:
+      - config_path: "secrets/config.json"
+        configured_catalog_path: "integration_tests/temp/incremental_configured_catalog_copy.json"
+        client_container_config:
+          client_container_dockerfile_path: "integration_tests/Dockerfile"
+          setup_command:
+            - "python"
+            - "./hook.py"
+            - "setup"
+          teardown_command:
+            - "python"
+            - "./hook.py"
+            - "teardown"
+        future_state:
+          future_state_path: "integration_tests/temp/abnormal_state_copy.json"

airbyte-integrations/connectors/source-postgres/integration_tests/Dockerfile

@@ -0,0 +1,19 @@
+# Use a base image with PostgreSQL client
+FROM python:3.9
+
+RUN apt-get update && apt-get install -y \
+    libpq-dev \
+    gcc \
+    && rm -rf /var/lib/apt/lists/* \
+
+WORKDIR /usr/src/app
+
+# Copy the script to the container
+COPY seed/hook.py .
+COPY seed/requirement.txt .
+
+RUN pip install --no-cache-dir -r ./requirement.txt
+
+# Give execution rights to the script and pre-generate all scripts.
+RUN chmod +x ./hook.py
+RUN python ./hook.py prepare

airbyte-integrations/connectors/source-postgres/integration_tests/abnormal_state_template.json

@@ -0,0 +1,20 @@
+[
+  {
+    "type": "STREAM",
+    "stream": {
+      "stream_state": {
+        "version": 2,
+        "state_type": "cursor_based",
+        "stream_name": "id_and_name_hook",
+        "cursor_field": ["id"],
+        "cursor": "4",
+        "cursor_record_count": 1,
+        "stream_namespace": "%s"
+      },
+      "stream_descriptor": {
+        "name": "id_and_name_hook",
+        "namespace": "%s"
+      }
+    }
+  }
+]

airbyte-integrations/connectors/source-postgres/integration_tests/configured_catalog_template.json

@@ -0,0 +1,28 @@
+{
+  "streams": [
+    {
+      "stream": {
+        "name": "id_and_name_hook",
+        "json_schema": {
+          "type": "object",
+          "properties": {
+            "name": {
+              "type": "string"
+            },
+            "id": {
+              "type": "string"
+            }
+          }
+        },
+        "supported_sync_modes": ["full_refresh", "incremental"],
+        "default_cursor_field": [],
+        "source_defined_primary_key": [],
+        "namespace": "%s"
+      },
+      "sync_mode": "full_refresh",
+      "destination_sync_mode": "append",
+      "cursor_field": ["id"],
+      "user_defined_primary_key": ["id"]
+    }
+  ]
+}

airbyte-integrations/connectors/source-postgres/integration_tests/expected_records.txt

@@ -1,3 +1,3 @@
-{"stream": "id_and_name", "data": {"id": 1, "name": "picard"}, "emitted_at": 999999}
-{"stream": "id_and_name", "data": {"id": 2, "name": "crusher"}, "emitted_at": 999999}
-{"stream": "id_and_name", "data": {"id": 3, "name": "vash"}, "emitted_at": 999999}
+{"stream": "id_and_name_hook", "data": {"id": "1", "name": "one"}, "emitted_at": 999999}
+{"stream": "id_and_name_hook", "data": {"id": "2", "name": "two"}, "emitted_at": 999999}
+{"stream": "id_and_name_hook", "data": {"id": "3", "name": "three"}, "emitted_at": 999999}

airbyte-integrations/connectors/source-postgres/integration_tests/incremental_configured_catalog.json → airbyte-integrations/connectors/source-postgres/integration_tests/incremental_configured_catalog_template.json

@@ -2,23 +2,22 @@
   "streams": [
     {
       "stream": {
-        "name": "id_and_name",
+        "name": "id_and_name_hook",
         "json_schema": {
           "type": "object",
           "properties": {
             "name": {
               "type": "string"
             },
             "id": {
-              "type": "number",
-              "airbyte_type": "integer"
+              "type": "string"
             }
           }
         },
         "supported_sync_modes": ["full_refresh", "incremental"],
         "default_cursor_field": [],
         "source_defined_primary_key": [],
-        "namespace": "public"
+        "namespace": "%s"
       },
       "sync_mode": "incremental",
       "destination_sync_mode": "append",