Skip to content

Commit 7a52205

Browse files
gordthompsongordthompson
committed
Remove custom test_get_multi_columns()
1 parent 6ed5320 commit 7a52205

4 files changed

Lines changed: 25 additions & 227 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,15 @@ jobs:
4040
fail-fast: false
4141
matrix:
4242
crdb-version: [
43-
# "cockroach:latest-v25.2",
44-
# "cockroach:latest-v25.4",
45-
# "cockroach:latest-v26.1",
43+
"cockroach:latest-v25.2",
44+
"cockroach:latest-v25.4",
45+
"cockroach:latest-v26.1",
4646
"cockroach:latest-v26.2",
4747
"cockroach-unstable:v26.3.0-alpha.1"
4848
]
4949
db-alias: [
50-
# "psycopg2",
51-
# "asyncpg",
50+
"psycopg2",
51+
"asyncpg",
5252
"psycopg"
5353
]
5454
env:

‎dev-requirements.txt‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
backports-tarfile==1.2.0
22
# via jaraco-context
3-
cachetools==7.1.1
3+
cachetools==7.1.4
44
# via tox
5-
certifi==2026.4.22
5+
certifi==2026.6.17
66
# via requests
77
cffi==2.0.0
88
# via cryptography
@@ -12,28 +12,28 @@ charset-normalizer==3.4.7
1212
# via requests
1313
colorama==0.4.6
1414
# via tox
15-
cryptography==48.0.0
15+
cryptography==49.0.0
1616
# via secretstorage
17-
distlib==0.4.0
17+
distlib==0.4.3
1818
# via virtualenv
19-
docutils==0.22.4
19+
docutils==0.23
2020
# via readme-renderer
21-
filelock==3.29.0
21+
filelock==3.29.4
2222
# via
2323
# python-discovery
2424
# tox
2525
# virtualenv
2626
id==1.6.1
2727
# via twine
28-
idna==3.15
28+
idna==3.18
2929
# via requests
3030
importlib-metadata==9.0.0
3131
# via keyring
3232
jaraco-classes==3.4.0
3333
# via keyring
3434
jaraco-context==6.1.2
3535
# via keyring
36-
jaraco-functools==4.4.0
36+
jaraco-functools==4.5.0
3737
# via keyring
3838
jeepney==0.9.0
3939
# via
@@ -45,7 +45,7 @@ markdown-it-py==4.2.0
4545
# via rich
4646
mdurl==0.1.2
4747
# via markdown-it-py
48-
more-itertools==11.0.2
48+
more-itertools==11.1.0
4949
# via
5050
# jaraco-classes
5151
# jaraco-functools
@@ -56,7 +56,7 @@ packaging==26.2
5656
# pyproject-api
5757
# tox
5858
# twine
59-
platformdirs==4.9.6
59+
platformdirs==4.10.0
6060
# via
6161
# python-discovery
6262
# tox
@@ -69,13 +69,13 @@ pygments==2.20.0
6969
# via
7070
# readme-renderer
7171
# rich
72-
pyproject-api==1.10.0
72+
pyproject-api==1.10.1
7373
# via tox
74-
python-discovery==1.3.1
74+
python-discovery==1.4.2
7575
# via virtualenv
76-
readme-renderer==44.0
76+
readme-renderer==45.0
7777
# via twine
78-
requests==2.34.1
78+
requests==2.34.2
7979
# via
8080
# requests-toolbelt
8181
# twine
@@ -105,7 +105,7 @@ urllib3==2.7.0
105105
# id
106106
# requests
107107
# twine
108-
virtualenv==21.3.3
108+
virtualenv==21.5.1
109109
# via tox
110-
zipp==3.23.1
110+
zipp==4.1.0
111111
# via importlib-metadata

‎test-requirements.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ exceptiongroup==1.3.1
88
# via pytest
99
futures==3.0.5
1010
# via -r test-requirements.in
11-
greenlet==3.5.0
11+
greenlet==3.5.2
1212
# via sqlalchemy
1313
iniconfig==2.3.0
1414
# via pytest
@@ -18,7 +18,7 @@ markupsafe==3.0.3
1818
# via mako
1919
mock==5.2.0
2020
# via -r test-requirements.in
21-
more-itertools==11.0.2
21+
more-itertools==11.1.0
2222
# via -r test-requirements.in
2323
packaging==26.2
2424
# via pytest
@@ -30,9 +30,9 @@ psycopg2==2.9.12
3030
# via -r test-requirements.in
3131
pygments==2.20.0
3232
# via pytest
33-
pytest==9.0.3
33+
pytest==9.1.1
3434
# via -r test-requirements.in
35-
sqlalchemy==2.0.49
35+
sqlalchemy==2.0.51
3636
# via
3737
# -r test-requirements.in
3838
# alembic

‎test/test_suite_sqlalchemy.py‎

Lines changed: 0 additions & 202 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
from sqlalchemy import INTEGER, VARCHAR, CHAR, DOUBLE_PRECISION
21
from sqlalchemy.testing import skip
32
from sqlalchemy.testing.suite import * # noqa
43
from sqlalchemy.testing.suite import (
@@ -29,207 +28,6 @@ def test_get_noncol_index(self):
2928
# test not designed to handle ('desc', 'nulls_last')
3029
pass
3130

32-
def test_get_multi_columns(self):
33-
insp = inspect(config.db)
34-
actual = insp.get_multi_columns()
35-
expected = {
36-
(None, "comment_test"): [
37-
{
38-
"autoincrement": True,
39-
"comment": "id comment",
40-
"default": "unique_rowid()",
41-
"is_hidden": False,
42-
"name": "id",
43-
"nullable": False,
44-
"type": INTEGER(),
45-
},
46-
{
47-
"autoincrement": False,
48-
"comment": "data % comment",
49-
"default": None,
50-
"is_hidden": False,
51-
"name": "data",
52-
"nullable": True,
53-
"type": VARCHAR(length=20),
54-
},
55-
{
56-
"autoincrement": False,
57-
"comment": "Comment types type speedily ' \" \ '' Fun!", # noqa
58-
"default": None,
59-
"is_hidden": False,
60-
"name": "d2",
61-
"nullable": True,
62-
"type": VARCHAR(length=20),
63-
},
64-
{
65-
"autoincrement": False,
66-
"comment": "Comment\nwith\nescapes",
67-
"default": None,
68-
"is_hidden": False,
69-
"name": "d3",
70-
"nullable": True,
71-
"type": VARCHAR(length=42),
72-
},
73-
],
74-
(None, "dingalings"): [
75-
{
76-
"autoincrement": True,
77-
"comment": None,
78-
"default": "unique_rowid()",
79-
"is_hidden": False,
80-
"name": "dingaling_id",
81-
"nullable": False,
82-
"type": INTEGER(),
83-
},
84-
{
85-
"autoincrement": False,
86-
"comment": None,
87-
"default": None,
88-
"is_hidden": False,
89-
"name": "address_id",
90-
"nullable": True,
91-
"type": INTEGER(),
92-
},
93-
{
94-
"autoincrement": False,
95-
"comment": None,
96-
"default": None,
97-
"is_hidden": False,
98-
"name": "id_user",
99-
"nullable": True,
100-
"type": INTEGER(),
101-
},
102-
{
103-
"autoincrement": False,
104-
"comment": None,
105-
"default": None,
106-
"is_hidden": False,
107-
"name": "data",
108-
"nullable": True,
109-
"type": VARCHAR(length=30),
110-
},
111-
],
112-
(None, "email_addresses"): [
113-
{
114-
"autoincrement": True,
115-
"comment": None,
116-
"default": "unique_rowid()",
117-
"is_hidden": False,
118-
"name": "address_id",
119-
"nullable": False,
120-
"type": INTEGER(),
121-
},
122-
{
123-
"autoincrement": False,
124-
"comment": None,
125-
"default": None,
126-
"is_hidden": False,
127-
"name": "remote_user_id",
128-
"nullable": True,
129-
"type": INTEGER(),
130-
},
131-
{
132-
"autoincrement": False,
133-
"comment": None,
134-
"default": None,
135-
"is_hidden": False,
136-
"name": "email_address",
137-
"nullable": True,
138-
"type": VARCHAR(length=20),
139-
},
140-
],
141-
(None, "no_constraints"): [
142-
{
143-
"autoincrement": False,
144-
"comment": None,
145-
"default": None,
146-
"is_hidden": False,
147-
"name": "data",
148-
"nullable": True,
149-
"type": VARCHAR(length=20),
150-
}
151-
],
152-
(None, "noncol_idx_test_nopk"): [
153-
{
154-
"autoincrement": False,
155-
"comment": None,
156-
"default": None,
157-
"is_hidden": False,
158-
"name": "q",
159-
"nullable": True,
160-
"type": VARCHAR(length=5),
161-
}
162-
],
163-
(None, "noncol_idx_test_pk"): [
164-
{
165-
"autoincrement": True,
166-
"comment": None,
167-
"default": "unique_rowid()",
168-
"is_hidden": False,
169-
"name": "id",
170-
"nullable": False,
171-
"type": INTEGER(),
172-
},
173-
{
174-
"autoincrement": False,
175-
"comment": None,
176-
"default": None,
177-
"is_hidden": False,
178-
"name": "q",
179-
"nullable": True,
180-
"type": VARCHAR(length=5),
181-
},
182-
],
183-
(None, "users"): [
184-
{
185-
"autoincrement": True,
186-
"comment": None,
187-
"default": "unique_rowid()",
188-
"is_hidden": False,
189-
"name": "user_id",
190-
"nullable": False,
191-
"type": INTEGER(),
192-
},
193-
{
194-
"autoincrement": False,
195-
"comment": None,
196-
"default": None,
197-
"is_hidden": False,
198-
"name": "test1",
199-
"nullable": False,
200-
"type": CHAR(length=5),
201-
},
202-
{
203-
"autoincrement": False,
204-
"comment": None,
205-
"default": None,
206-
"is_hidden": False,
207-
"name": "test2",
208-
"nullable": False,
209-
"type": DOUBLE_PRECISION(precision=53),
210-
},
211-
{
212-
"autoincrement": False,
213-
"comment": None,
214-
"default": None,
215-
"is_hidden": False,
216-
"name": "parent_user_id",
217-
"nullable": True,
218-
"type": INTEGER(),
219-
},
220-
],
221-
}
222-
eq_(len(actual), len(expected))
223-
eq_(actual.keys(), expected.keys())
224-
eq_(
225-
len(actual[(None, "comment_test")]),
226-
len(expected[(None, "comment_test")]),
227-
)
228-
if config.db.dialect.supports_comments:
229-
act = [x for x in actual[(None, "comment_test")] if x["name"] == "data"][0]
230-
exp = [x for x in expected[(None, "comment_test")] if x["name"] == "data"][0]
231-
eq_(act["comment"], exp["comment"])
232-
23331
def test_get_multi_indexes(self):
23432
insp = inspect(config.db)
23533
result = insp.get_multi_indexes()

0 commit comments

Comments
 (0)