diff --git a/tests/codegen/test-project2/generated_async_edgeql.py.assert4 b/tests/codegen/test-project2/generated_async_edgeql.py.assert4 deleted file mode 100644 index 75d52ea7..00000000 --- a/tests/codegen/test-project2/generated_async_edgeql.py.assert4 +++ /dev/null @@ -1,443 +0,0 @@ -# AUTOGENERATED FROM: -# 'scalar/custom_vector_input.edgeql' -# 'object/link_prop.edgeql' -# 'parpkg/subpkg/my_query.edgeql' -# 'argnames/query_one.edgeql' -# 'parpkg/select_args.edgeql' -# 'object/select_object.edgeql' -# 'object/select_objects.edgeql' -# 'scalar/select_scalar.edgeql' -# 'scalar/select_scalars.edgeql' -# WITH: -# $ edgedb-py --target async --file --no-skip-pydantic-validation - - -from __future__ import annotations -import array -import dataclasses -import datetime -import edgedb -import enum -import typing -import uuid - - -MyScalar = int -V3 = typing.Sequence[float] - - -@dataclasses.dataclass -class LinkPropResult: - id: uuid.UUID - name: str - friends: list[LinkPropResultFriendsItem] - - -@dataclasses.dataclass -class LinkPropResultFriendsItem: - id: uuid.UUID - name: str - created_at: datetime.datetime | None - - @typing.overload - def __getitem__(self, key: typing.Literal["@created_at"]) -> datetime.datetime | None: - ... - - @typing.overload - def __getitem__(self, key: typing.Literal["@strength"]) -> float | None: - ... - - def __getitem__(self, key: str) -> typing.Any: - raise NotImplementedError - - -class MyEnum(enum.Enum): - THIS = "This" - THAT = "That" - E_1 = "1" - F_B = "f. b" - F_B_1 = "f-b" - - -@dataclasses.dataclass -class MyQueryResult: - id: uuid.UUID - a: uuid.UUID - b: uuid.UUID | None - c: str - d: str | None - e: bytes - f: bytes | None - g: int - h: int | None - i: int - j: int | None - k: int - l: int | None - m: float - n: float | None - o: float - p: float | None - q: bool - r: bool | None - s: datetime.datetime - t: datetime.datetime | None - u: datetime.datetime - v: datetime.datetime | None - w: datetime.date - x: datetime.date | None - y: datetime.time - z: datetime.time | None - aa: datetime.timedelta - ab: datetime.timedelta | None - ac: int - ad: int | None - ae: edgedb.RelativeDuration - af: edgedb.RelativeDuration | None - ag: edgedb.DateDuration - ah: edgedb.DateDuration | None - ai: edgedb.ConfigMemory - aj: edgedb.ConfigMemory | None - ak: edgedb.Range[int] - al: edgedb.Range[int] | None - am: edgedb.Range[int] - an: edgedb.Range[int] | None - ao: edgedb.Range[float] - ap: edgedb.Range[float] | None - aq: edgedb.Range[float] - ar: edgedb.Range[float] | None - as_: edgedb.Range[datetime.datetime] - at: edgedb.Range[datetime.datetime] | None - au: edgedb.Range[datetime.datetime] - av: edgedb.Range[datetime.datetime] | None - aw: edgedb.Range[datetime.date] - ax: edgedb.Range[datetime.date] | None - ay: MyScalar - az: MyScalar | None - ba: MyEnum - bb: MyEnum | None - bc: array.array - bd: array.array | None - - -@dataclasses.dataclass -class SelectArgsResult: - id: uuid.UUID - Str: str - DateTime: datetime.datetime - - -@dataclasses.dataclass -class SelectObjectResult: - id: uuid.UUID - Name: str - Language: str - Params: list[SelectObjectResultParamsItem] - - -@dataclasses.dataclass -class SelectObjectResultParamsItem: - id: uuid.UUID - Name: str - Default: str | None - - -async def custom_vector_input( - executor: edgedb.AsyncIOExecutor, - *, - input: V3 | None = None, -) -> int | None: - return await executor.query_single( - """\ - select 42 filter exists $input;\ - """, - input=input, - ) - - -async def link_prop( - executor: edgedb.AsyncIOExecutor, -) -> list[LinkPropResult]: - return await executor.query( - """\ - create type Person { - create required property name -> str; - create property created_at -> datetime; - create multi link friends -> Person { - create property strength -> float64; - create property created_at -> datetime; - } - }; - - select Person { - name, - friends: { - name, - @created_at, - created_at, - @strength, - } - };\ - """, - ) - - -async def my_query( - executor: edgedb.AsyncIOExecutor, - *, - a: uuid.UUID, - b: uuid.UUID | None = None, - c: str, - d: str | None = None, - e: bytes, - f: bytes | None = None, - g: int, - h: int | None = None, - i: int, - j: int | None = None, - k: int, - l: int | None = None, - m: float, - n: float | None = None, - o: float, - p: float | None = None, - q: bool, - r: bool | None = None, - s: datetime.datetime, - t: datetime.datetime | None = None, - u: datetime.datetime, - v: datetime.datetime | None = None, - w: datetime.date, - x: datetime.date | None = None, - y: datetime.time, - z: datetime.time | None = None, - aa: datetime.timedelta, - ab: datetime.timedelta | None = None, - ac: int, - ad: int | None = None, - ae: edgedb.RelativeDuration, - af: edgedb.RelativeDuration | None = None, - ag: edgedb.DateDuration, - ah: edgedb.DateDuration | None = None, - ai: edgedb.ConfigMemory, - aj: edgedb.ConfigMemory | None = None, - ak: edgedb.Range[int], - al: edgedb.Range[int] | None = None, - am: edgedb.Range[int], - an: edgedb.Range[int] | None = None, - ao: edgedb.Range[float], - ap: edgedb.Range[float] | None = None, - aq: edgedb.Range[float], - ar: edgedb.Range[float] | None = None, - as_: edgedb.Range[datetime.datetime], - at: edgedb.Range[datetime.datetime] | None = None, - au: edgedb.Range[datetime.datetime], - av: edgedb.Range[datetime.datetime] | None = None, - aw: edgedb.Range[datetime.date], - ax: edgedb.Range[datetime.date] | None = None, - bc: typing.Sequence[float], - bd: typing.Sequence[float] | None = None, -) -> MyQueryResult: - return await executor.query_single( - """\ - create scalar type MyScalar extending int64; - create scalar type MyEnum extending enum<'This', 'That', '1', 'f. b', 'f-b'>; - - select { - a := $a, - b := $b, - c := $c, - d := $d, - e := $e, - f := $f, - g := $g, - h := $h, - i := $i, - j := $j, - k := $k, - l := $l, - m := $m, - n := $n, - o := $o, - p := $p, - q := $q, - r := $r, - s := $s, - t := $t, - u := $u, - v := $v, - w := $w, - x := $x, - y := $y, - z := $z, - aa := $aa, - ab := $ab, - ac := $ac, - ad := $ad, - ae := $ae, - af := $af, - ag := $ag, - ah := $ah, - ai := $ai, - aj := $aj, - ak := >$ak, - al := >$al, - am := >$am, - an := >$an, - ao := >$ao, - ap := >$ap, - aq := >$aq, - ar := >$ar, - as_ := >$as_, - at := >$at, - au := >$au, - av := >$av, - aw := >$aw, - ax := >$ax, - ay := 1, - az := {}, - ba := MyEnum.This, - bb := {}, - bc := $bc, - bd := $bd, - }\ - """, - a=a, - b=b, - c=c, - d=d, - e=e, - f=f, - g=g, - h=h, - i=i, - j=j, - k=k, - l=l, - m=m, - n=n, - o=o, - p=p, - q=q, - r=r, - s=s, - t=t, - u=u, - v=v, - w=w, - x=x, - y=y, - z=z, - aa=aa, - ab=ab, - ac=ac, - ad=ad, - ae=ae, - af=af, - ag=ag, - ah=ah, - ai=ai, - aj=aj, - ak=ak, - al=al, - am=am, - an=an, - ao=ao, - ap=ap, - aq=aq, - ar=ar, - as_=as_, - at=at, - au=au, - av=av, - aw=aw, - ax=ax, - bc=bc, - bd=bd, - ) - - -async def query_one( - executor: edgedb.AsyncIOExecutor, - *, - arg_name_with_underscores: int, -) -> int: - return await executor.query_single( - """\ - select $arg_name_with_underscores\ - """, - arg_name_with_underscores=arg_name_with_underscores, - ) - - -async def select_args( - executor: edgedb.AsyncIOExecutor, - *, - arg_str: str, - arg_datetime: datetime.datetime, -) -> SelectArgsResult: - return await executor.query_single( - """\ - select { - Str := $arg_str, - DateTime := $arg_datetime, - }\ - """, - arg_str=arg_str, - arg_datetime=arg_datetime, - ) - - -async def select_object( - executor: edgedb.AsyncIOExecutor, -) -> SelectObjectResult | None: - return await executor.query_single( - """\ - select schema::Function { - Name := .name, - Language := .language, - Params := .params { - Name := .name, - Default := .default, - } - } - limit 1;\ - """, - ) - - -async def select_objects( - executor: edgedb.AsyncIOExecutor, -) -> list[SelectObjectResult]: - return await executor.query( - """\ - select schema::Function { - Name := .name, - Language := .language, - Params := .params { - Name := .name, - Default := .default, - } - }\ - """, - ) - - -async def select_scalar( - executor: edgedb.AsyncIOExecutor, -) -> int: - return await executor.query_single( - """\ - select 1;\ - """, - ) - - -async def select_scalars( - executor: edgedb.AsyncIOExecutor, -) -> list[edgedb.ConfigMemory]: - return await executor.query( - """\ - select {1, 2, 3};\ - """, - ) diff --git a/tests/codegen/test-project2/scalar/custom_vector_input_async_edgeql.py.assert b/tests/codegen/test-project2/scalar/custom_vector_input_async_edgeql.py.assert index a16beb5e..39272b4f 100644 --- a/tests/codegen/test-project2/scalar/custom_vector_input_async_edgeql.py.assert +++ b/tests/codegen/test-project2/scalar/custom_vector_input_async_edgeql.py.assert @@ -7,13 +7,13 @@ import edgedb import typing -Input = typing.Sequence[float] +V3 = typing.Sequence[float] async def custom_vector_input( executor: edgedb.AsyncIOExecutor, *, - input: typing.Optional[Input] = None, + input: typing.Optional[V3] = None, ) -> typing.Optional[int]: return await executor.query_single( """\ diff --git a/tests/codegen/test-project2/scalar/custom_vector_input_async_edgeql.py.assert4 b/tests/codegen/test-project2/scalar/custom_vector_input_async_edgeql.py.assert4 deleted file mode 100644 index 39272b4f..00000000 --- a/tests/codegen/test-project2/scalar/custom_vector_input_async_edgeql.py.assert4 +++ /dev/null @@ -1,23 +0,0 @@ -# AUTOGENERATED FROM 'scalar/custom_vector_input.edgeql' WITH: -# $ edgedb-py - - -from __future__ import annotations -import edgedb -import typing - - -V3 = typing.Sequence[float] - - -async def custom_vector_input( - executor: edgedb.AsyncIOExecutor, - *, - input: typing.Optional[V3] = None, -) -> typing.Optional[int]: - return await executor.query_single( - """\ - select 42 filter exists $input;\ - """, - input=input, - ) diff --git a/tests/codegen/test-project2/scalar/custom_vector_input_edgeql.py.assert b/tests/codegen/test-project2/scalar/custom_vector_input_edgeql.py.assert index 4cf4659a..ed2947c0 100644 --- a/tests/codegen/test-project2/scalar/custom_vector_input_edgeql.py.assert +++ b/tests/codegen/test-project2/scalar/custom_vector_input_edgeql.py.assert @@ -7,13 +7,13 @@ import edgedb import typing -Input = typing.Sequence[float] +V3 = typing.Sequence[float] def custom_vector_input( executor: edgedb.Executor, *, - input: typing.Optional[Input] = None, + input: typing.Optional[V3] = None, ) -> typing.Optional[int]: return executor.query_single( """\ diff --git a/tests/codegen/test-project2/scalar/custom_vector_input_edgeql.py.assert4 b/tests/codegen/test-project2/scalar/custom_vector_input_edgeql.py.assert4 deleted file mode 100644 index ed2947c0..00000000 --- a/tests/codegen/test-project2/scalar/custom_vector_input_edgeql.py.assert4 +++ /dev/null @@ -1,23 +0,0 @@ -# AUTOGENERATED FROM 'scalar/custom_vector_input.edgeql' WITH: -# $ edgedb-py --target blocking --no-skip-pydantic-validation - - -from __future__ import annotations -import edgedb -import typing - - -V3 = typing.Sequence[float] - - -def custom_vector_input( - executor: edgedb.Executor, - *, - input: typing.Optional[V3] = None, -) -> typing.Optional[int]: - return executor.query_single( - """\ - select 42 filter exists $input;\ - """, - input=input, - ) diff --git a/tests/test_codegen.py b/tests/test_codegen.py index 831a3530..9ac5fb96 100644 --- a/tests/test_codegen.py +++ b/tests/test_codegen.py @@ -28,10 +28,6 @@ import unittest -# Use ".assert" for EdgeDB 3.x and lower -ASSERT_SUFFIX = os.environ.get("EDGEDB_TEST_CODEGEN_ASSERT_SUFFIX", ".assert4") - - class TestCodegen(tb.AsyncQueryTestCase): SETUP = ''' create extension pgvector; @@ -119,9 +115,7 @@ async def run(*args, extra_env=None): ) for f in cwd.rglob("*.py"): - a = f.with_suffix(f".py{ASSERT_SUFFIX}") - if not a.exists(): - a = f.with_suffix(".py.assert") + a = f.with_suffix(".py.assert") self.assertEqual(f.read_text(), a.read_text(), msg=f.name) for a in cwd.rglob("*.py.assert"): f = a.with_suffix("")