Skip to content

Drop the spaces after field names in Tuple names #8774

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
msullivan wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Drop the spaces after field names in Tuple names #8774

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion edb/buildmeta.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
# The merge conflict there is a nice reminder that you probably need
# to write a patch in edb/pgsql/patches.py, and then you should preserve
# the old value.
EDGEDB_CATALOG_VERSION = 2025_06_04_00_00
EDGEDB_CATALOG_VERSION = 2025_06_05_00_00
EDGEDB_MAJOR_VERSION = 7


Expand Down
2 changes: 1 addition & 1 deletion edb/schema/types.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1649,7 +1649,7 @@ def generate_name(
) -> s_name.UnqualName:
if named:
st_names = ', '.join(
f'{n}:{st}' for n, st in element_names.items()
f'{n}: {st}' for n, st in element_names.items()
)
else:
st_names = ', '.join(str(st) for st in element_names.values())
Expand Down
32 changes: 16 additions & 16 deletions tests/test_edgeql_ddl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7869,7 +7869,7 @@ async def test_edgeql_ddl_global_type_changes_04(self):
# Create computed global
# Delete computed global

# tuple<f:int64>
# tuple<f: int64>
await self._check_ddl_global_type_changes([
(
'create global foo := (f := 1)',
Expand All @@ -7880,7 +7880,7 @@ async def test_edgeql_ddl_global_type_changes_04(self):
'type_name': 'schema::TupleExprAlias',
},
{
'name': 'tuple<f:std::int64>',
'name': 'tuple<f: std::int64>',
'from_alias': False,
'type_name': 'schema::Tuple',
},
Expand Down Expand Up @@ -7922,13 +7922,13 @@ async def test_edgeql_ddl_global_type_changes_06(self):
# Create computed global
# Delete computed global

# array<tuple<f:array<int64>>>
# array<tuple<f: array<int64>>>
await self._check_ddl_global_type_changes([
(
'create global foo := [(f := [1])]',
[
{
'name': 'array<tuple<f:array<std::int64>>>',
'name': 'array<tuple<f: array<std::int64>>>',
'from_alias': False,
'type_name': 'schema::Array',
},
Expand All @@ -7938,7 +7938,7 @@ async def test_edgeql_ddl_global_type_changes_06(self):
'type_name': 'schema::ArrayExprAlias',
},
{
'name': 'tuple<f:array<std::int64>>',
'name': 'tuple<f: array<std::int64>>',
'from_alias': False,
'type_name': 'schema::Tuple',
},
Expand Down Expand Up @@ -8020,13 +8020,13 @@ async def test_edgeql_ddl_global_type_changes_11(self):
# Create non-computed global
# Delete non-computed global

# tuple<f:int64>
# tuple<f: int64>
await self._check_ddl_global_type_changes([
(
'create global foo: tuple<f:int64>',
'create global foo: tuple<f: int64>',
[
{
'name': 'tuple<f:std::int64>',
'name': 'tuple<f: std::int64>',
'from_alias': False,
'type_name': 'schema::Tuple',
},
Expand Down Expand Up @@ -8063,18 +8063,18 @@ async def test_edgeql_ddl_global_type_changes_13(self):
# Create non-computed global
# Delete non-computed global

# array<tuple<f:array<int64>>>
# array<tuple<f: array<int64>>>
await self._check_ddl_global_type_changes([
(
'create global foo: array<tuple<f:array<int64>>>',
'create global foo: array<tuple<f: array<int64>>>',
[
{
'name': 'array<tuple<f:array<std::int64>>>',
'name': 'array<tuple<f: array<std::int64>>>',
'from_alias': False,
'type_name': 'schema::Array',
},
{
'name': 'tuple<f:array<std::int64>>',
'name': 'tuple<f: array<std::int64>>',
'from_alias': False,
'type_name': 'schema::Tuple',
},
Expand Down Expand Up @@ -12370,7 +12370,7 @@ async def test_edgeql_ddl_alias_type_changes_04(self):
'type_name': 'schema::TupleExprAlias',
},
{
'name': 'tuple<f:std::int64>',
'name': 'tuple<f: std::int64>',
'from_alias': False,
'type_name': 'schema::Tuple',
},
Expand Down Expand Up @@ -12412,13 +12412,13 @@ async def test_edgeql_ddl_alias_type_changes_06(self):
# Create alias
# Delete alias

# array<tuple<f:array<int64>>>
# array<tuple<f: array<int64>>>
await self._check_ddl_alias_type_changes([
(
'create alias foo := [(f := [1])]',
[
{
'name': 'array<tuple<f:array<std::int64>>>',
'name': 'array<tuple<f: array<std::int64>>>',
'from_alias': False,
'type_name': 'schema::Array',
},
Expand All @@ -12428,7 +12428,7 @@ async def test_edgeql_ddl_alias_type_changes_06(self):
'type_name': 'schema::ArrayExprAlias',
},
{
'name': 'tuple<f:array<std::int64>>',
'name': 'tuple<f: array<std::int64>>',
'from_alias': False,
'type_name': 'schema::Tuple',
},
Expand Down