chore(ibis): return v3 error instead of v2 error

ibis-server/app/routers/v3/connector.py

@@ -199,18 +199,22 @@ async def query(
                 "Failed to execute v3 query, try to fallback to v2: {}\n", str(e)
             )
             headers = append_fallback_context(headers, span)
-            return await v2.connector.query(
-                data_source=data_source,
-                dto=dto,
-                dry_run=dry_run,
-                cache_enable=cache_enable,
-                override_cache=override_cache,
-                limit=limit,
-                java_engine_connector=java_engine_connector,
-                query_cache_manager=query_cache_manager,
-                headers=headers,
-                is_fallback=True,
-            )
+            try:
+                return await v2.connector.query(
+                    data_source=data_source,
+                    dto=dto,
+                    dry_run=dry_run,
+                    limit=limit,
+                    java_engine_connector=java_engine_connector,
+                    headers=headers,
+                    is_fallback=True,
+                    cache_enable=cache_enable,
+                    override_cache=override_cache,
+                    query_cache_manager=query_cache_manager,
+                )
+            except Exception:
+                # ignore v2 error messages in fallback, return v3 error instead.
+                raise e
 
 
 @router.post("/dry-plan", description="get the planned WrenSQL")
@@ -245,12 +249,16 @@ async def dry_plan(
                 "Failed to execute v3 dry-plan, try to fallback to v2: {}", str(e)
             )
             headers = append_fallback_context(headers, span)
-            return await v2.connector.dry_plan(
-                dto=dto,
-                java_engine_connector=java_engine_connector,
-                headers=headers,
-                is_fallback=True,
-            )
+            try:
+                return await v2.connector.dry_plan(
+                    dto=dto,
+                    java_engine_connector=java_engine_connector,
+                    headers=headers,
+                    is_fallback=True,
+                )
+            except Exception:
+                # ignore v2 error messages in fallback, return v3 error instead.
+                raise e
 
 
 @router.post(
@@ -294,13 +302,17 @@ async def dry_plan_for_data_source(
                 str(e),
             )
             headers = append_fallback_context(headers, span)
-            return await v2.connector.dry_plan_for_data_source(
-                data_source=data_source,
-                dto=dto,
-                java_engine_connector=java_engine_connector,
-                headers=headers,
-                is_fallback=True,
-            )
+            try:
+                return await v2.connector.dry_plan_for_data_source(
+                    data_source=data_source,
+                    dto=dto,
+                    java_engine_connector=java_engine_connector,
+                    headers=headers,
+                    is_fallback=True,
+                )
+            except Exception:
+                # ignore v2 error messages in fallback, return v3 error instead.
+                raise e
 
 
 @router.post(
@@ -455,10 +467,14 @@ async def model_substitute(
                 str(e),
             )
             headers = append_fallback_context(headers, span)
-            return await v2.connector.model_substitute(
-                data_source=data_source,
-                dto=dto,
-                headers=headers,
-                java_engine_connector=java_engine_connector,
-                is_fallback=True,
-            )
+            try:
+                return await v2.connector.model_substitute(
+                    data_source=data_source,
+                    dto=dto,
+                    headers=headers,
+                    java_engine_connector=java_engine_connector,
+                    is_fallback=True,
+                )
+            except Exception:
+                # ignore v2 error messages in fallback, return v3 error instead.
+                raise e