Use name hint when server is not providing custom scalar type name (#461

)

Co-authored-by: Arun Aruljothi <arun@arunaruljothi.com>

.github/workflows/tests.yml

@@ -86,7 +86,11 @@ jobs:
       if: steps.release.outputs.version == 0
       env:
         LOOP_IMPL: ${{ matrix.loop }}
+        SERVER_VERSION: ${{ matrix.edgedb-version }}
       run: |
+        if [ "${SERVER_VERSION}" = "nightly" ]; then
+          export EDGEDB_TEST_CODEGEN_ASSERT_SUFFIX=.assert4
+        fi
         if [ "${LOOP_IMPL}" = "uvloop" ]; then
             env USE_UVLOOP=1 python -m unittest -v tests.suite
         else

edgedb/codegen/generator.py

@@ -452,7 +452,7 @@ def _generate_code(
                 rv = f"typing.Tuple[{elements}]"
 
         elif isinstance(type_, describe.ScalarType):
-            rv = self._find_name(type_.name)
+            rv = self._find_name(type_.name or name_hint)
             base_type_name = type_.base_type.name
             if import_str := imports.get(base_type_name):
                 self._imports.add(import_str)

tests/codegen/test-project2/generated_async_edgeql.py.assert

@@ -1,4 +1,5 @@
 # AUTOGENERATED FROM:
+#     'scalar/custom_vector_input.edgeql'
 #     'object/link_prop.edgeql'
 #     'parpkg/subpkg/my_query.edgeql'
 #     'argnames/query_one.edgeql'
@@ -21,6 +22,7 @@ import typing
 import uuid
 
 
+Input = typing.Sequence[float]
 MyScalar = int
 
 
@@ -140,6 +142,19 @@ class SelectObjectResultParamsItem:
     Default: str | None
 
 
+async def custom_vector_input(
+    executor: edgedb.AsyncIOExecutor,
+    *,
+    input: Input | None,
+) -> int | None:
+    return await executor.query_single(
+        """\
+        select 42 filter exists <optional v3>$input;\
+        """,
+        input=input,
+    )
+
+
 async def link_prop(
     executor: edgedb.AsyncIOExecutor,
 ) -> list[LinkPropResult]: