velocity-python 0.9.2__py3-none-any.whl → 0.9.4__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- velocity/__init__.py +1 -1
- velocity/aws/capabilities/security.py +74 -15
- velocity/db/core/table.py +1 -2
- velocity/db/servers/postgres/sql.py +22 -38
- velocity/db/tests/test_sql_builder.py +15 -20
- {velocity_python-0.9.2.dist-info → velocity_python-0.9.4.dist-info}/METADATA +1 -2
- {velocity_python-0.9.2.dist-info → velocity_python-0.9.4.dist-info}/RECORD +11 -11
- {velocity_python-0.9.2.dist-info → velocity_python-0.9.4.dist-info}/WHEEL +0 -0
- {velocity_python-0.9.2.dist-info → velocity_python-0.9.4.dist-info}/entry_points.txt +0 -0
- {velocity_python-0.9.2.dist-info → velocity_python-0.9.4.dist-info}/licenses/LICENSE +0 -0
- {velocity_python-0.9.2.dist-info → velocity_python-0.9.4.dist-info}/top_level.txt +0 -0
velocity/__init__.py
CHANGED
|
@@ -40,7 +40,8 @@ import logging
|
|
|
40
40
|
|
|
41
41
|
from velocity.aws import feature_flags
|
|
42
42
|
from velocity.cache import memo, read_cache
|
|
43
|
-
from velocity.db import _pgddl, audit
|
|
43
|
+
from velocity.db import Expr, _pgddl, audit
|
|
44
|
+
from velocity.db.exceptions import DbLockTimeoutError
|
|
44
45
|
|
|
45
46
|
from .base import (
|
|
46
47
|
CIDR_LIST,
|
|
@@ -77,6 +78,17 @@ EVENT_COLUMNS = {
|
|
|
77
78
|
# or enforce) itself, so the rule holds whether or not this module is imported.
|
|
78
79
|
# core infrastructure (velocity.aws.schema "core"): every site has the table
|
|
79
80
|
SCHEMA = {
|
|
81
|
+
# check_rate's upsert conflicts on bucket, so the unique index is what
|
|
82
|
+
# makes the count atomic; sys_created serves the hourly prune.
|
|
83
|
+
RATE_TABLE: {
|
|
84
|
+
"columns": {"bucket": "TEXT", "window_start": "TIMESTAMPTZ", "hits": "BIGINT"},
|
|
85
|
+
"indexes": [
|
|
86
|
+
{"columns": ["sys_created"], "name": "idx__sys_rate_limit__sys_created"}
|
|
87
|
+
],
|
|
88
|
+
"unique_indexes": [
|
|
89
|
+
{"columns": ["bucket"], "name": "uidx__sys_rate_limit__bucket"}
|
|
90
|
+
],
|
|
91
|
+
},
|
|
80
92
|
EVENTS_TABLE: {
|
|
81
93
|
"columns": dict(EVENT_COLUMNS),
|
|
82
94
|
"indexes": [
|
|
@@ -212,17 +224,65 @@ def check_payload(body_size, *, max_bytes, enabled):
|
|
|
212
224
|
|
|
213
225
|
|
|
214
226
|
def check_rate(tx, bucket, *, limit, now, table=RATE_TABLE):
|
|
215
|
-
"""
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
227
|
+
"""One bucket's :func:`check_rates`."""
|
|
228
|
+
return check_rates(tx, [bucket], limit=limit, now=now, table=table)
|
|
229
|
+
|
|
230
|
+
|
|
231
|
+
def check_rates(tx, buckets, *, limit, now, table=RATE_TABLE):
|
|
232
|
+
"""Fixed one-minute window per bucket, kept in a velocity table: one
|
|
233
|
+
atomic upsert per bucket (``ON CONFLICT (bucket) DO UPDATE SET hits =
|
|
234
|
+
hits + 1 RETURNING hits``), so concurrent requests in one window each
|
|
235
|
+
count. The first refusal wins; later buckets are not counted after it.
|
|
236
|
+
|
|
237
|
+
Every bucket counts on ONE side transaction, committed before the
|
|
238
|
+
request goes on, as :func:`record_event` writes: a request that ends in
|
|
239
|
+
an error (a bad token, a refusal — this one included) rolls its own
|
|
240
|
+
transaction back, and the hits that most need counting would be lost
|
|
241
|
+
with it; the row locks are released at once instead of serializing the
|
|
242
|
+
caller's other requests behind a slow one. The lock wait is bounded
|
|
243
|
+
(``EVENT_LOCK_TIMEOUT``): a bucket still contended after it — a flood on
|
|
244
|
+
one address or user — is refused like an exceeded one (a 403 and its
|
|
245
|
+
event), not a 500. Any other failure (no unique index on ``bucket``: run
|
|
246
|
+
the schema lane) raises, so the guard fails closed."""
|
|
247
|
+
keys = [(b, f"{b}:{now.strftime('%Y%m%d%H%M')}") for b in buckets]
|
|
248
|
+
open_transaction = getattr(getattr(tx, "engine", None), "side_transaction", None)
|
|
249
|
+
if not callable(open_transaction):
|
|
250
|
+
return _count_buckets(tx, table, keys, now, limit)
|
|
251
|
+
try:
|
|
252
|
+
with open_transaction() as rate_tx:
|
|
253
|
+
if "postgres" in str(_pgddl.server_name(rate_tx) or "").lower():
|
|
254
|
+
rate_tx.execute(
|
|
255
|
+
"SELECT set_config('lock_timeout', %s, true)",
|
|
256
|
+
(EVENT_LOCK_TIMEOUT,),
|
|
257
|
+
)
|
|
258
|
+
return _count_buckets(rate_tx, table, keys, now, limit)
|
|
259
|
+
except DbLockTimeoutError:
|
|
260
|
+
names = ", ".join(b for b, _ in keys)
|
|
261
|
+
return "rate_limit", f"{names} contended past {EVENT_LOCK_TIMEOUT}"
|
|
262
|
+
|
|
263
|
+
|
|
264
|
+
def _count_buckets(tx, table, keys, now, limit):
|
|
265
|
+
for bucket, key in keys:
|
|
266
|
+
refusal = _rate_refusal(_count_hit(tx, table, key, now), bucket, limit)
|
|
267
|
+
if refusal:
|
|
268
|
+
return refusal
|
|
269
|
+
return None
|
|
270
|
+
|
|
271
|
+
|
|
272
|
+
def _count_hit(tx, table, key, now):
|
|
273
|
+
row = tx.table(table).merge(
|
|
274
|
+
{"bucket": key, "window_start": now, "hits": 1},
|
|
275
|
+
pk={"bucket": key},
|
|
276
|
+
on_conflict={"hits": Expr(f'COALESCE("{table}".hits, 0) + 1')},
|
|
277
|
+
insert_only=["window_start"],
|
|
278
|
+
returning=["hits"],
|
|
279
|
+
)
|
|
280
|
+
if not row or row.get("hits") is None:
|
|
281
|
+
raise RuntimeError(f"security: rate bucket {key!r} returned no count")
|
|
282
|
+
return int(row["hits"])
|
|
283
|
+
|
|
284
|
+
|
|
285
|
+
def _rate_refusal(hits, bucket, limit):
|
|
226
286
|
if hits > limit:
|
|
227
287
|
return "rate_limit", f"{bucket} exceeded {limit} requests/minute ({hits})"
|
|
228
288
|
return None
|
|
@@ -320,9 +380,8 @@ def enforce(tx, aws_event, context, *, now=None):
|
|
|
320
380
|
if not refusal and truthy(config.get("security_rate_limit_enabled")):
|
|
321
381
|
if not ip_in(facts["ip"], parse_cidrs(config.get("rate_limit_exempt"))):
|
|
322
382
|
limit = int(config.get("security_rate_limit_per_minute") or 120)
|
|
323
|
-
|
|
324
|
-
|
|
325
|
-
refusal = check_rate(tx, f"user:{user}", limit=limit, now=now)
|
|
383
|
+
buckets = [f"ip:{facts['ip']}"] + ([f"user:{user}"] if user else [])
|
|
384
|
+
refusal = check_rates(tx, buckets, limit=limit, now=now)
|
|
326
385
|
|
|
327
386
|
if refusal:
|
|
328
387
|
guard, reason = refusal
|
velocity/db/core/table.py
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import copy
|
|
2
2
|
import logging
|
|
3
3
|
import re
|
|
4
|
-
import sqlparse
|
|
5
4
|
from collections import defaultdict
|
|
6
5
|
from collections.abc import Iterable, Mapping, Sequence
|
|
7
6
|
from velocity.db import exceptions
|
|
@@ -23,7 +22,7 @@ class Query:
|
|
|
23
22
|
"""
|
|
24
23
|
|
|
25
24
|
def __init__(self, sql, params=()):
|
|
26
|
-
self.sql =
|
|
25
|
+
self.sql = sql
|
|
27
26
|
self.params = tuple(params)
|
|
28
27
|
|
|
29
28
|
def __str__(self):
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import re
|
|
2
2
|
import datetime
|
|
3
3
|
import hashlib
|
|
4
|
-
import sqlparse
|
|
5
4
|
|
|
6
5
|
from velocity.db import exceptions
|
|
7
6
|
from ..base.sql import BaseSQLDialect
|
|
@@ -775,7 +774,7 @@ class SQL(BaseSQLDialect):
|
|
|
775
774
|
if skip_locked:
|
|
776
775
|
sql.append("SKIP LOCKED")
|
|
777
776
|
|
|
778
|
-
sql =
|
|
777
|
+
sql = " ".join(sql)
|
|
779
778
|
return sql, tuple(vals)
|
|
780
779
|
|
|
781
780
|
@classmethod
|
|
@@ -878,9 +877,7 @@ class SQL(BaseSQLDialect):
|
|
|
878
877
|
if not excluded and where_clauses:
|
|
879
878
|
sql_parts.append("WHERE " + TableHelper.join_predicates(where_clauses))
|
|
880
879
|
|
|
881
|
-
final_sql =
|
|
882
|
-
" ".join(sql_parts), reindent=True, keyword_case="upper"
|
|
883
|
-
)
|
|
880
|
+
final_sql = " ".join(sql_parts)
|
|
884
881
|
return final_sql, tuple(vals)
|
|
885
882
|
|
|
886
883
|
@classmethod
|
|
@@ -915,7 +912,7 @@ class SQL(BaseSQLDialect):
|
|
|
915
912
|
sql_parts.append("(")
|
|
916
913
|
sql_parts.append(",".join(vals_placeholders))
|
|
917
914
|
sql_parts.append(")")
|
|
918
|
-
sql =
|
|
915
|
+
sql = " ".join(sql_parts)
|
|
919
916
|
return sql, tuple(args)
|
|
920
917
|
|
|
921
918
|
@classmethod
|
|
@@ -1026,9 +1023,7 @@ class SQL(BaseSQLDialect):
|
|
|
1026
1023
|
sql.append(sql_update)
|
|
1027
1024
|
vals.extend(vals_update)
|
|
1028
1025
|
|
|
1029
|
-
|
|
1030
|
-
|
|
1031
|
-
final_sql = sqlparse.format(" ".join(sql), reindent=True, keyword_case="upper")
|
|
1026
|
+
final_sql = " ".join(sql)
|
|
1032
1027
|
return final_sql, tuple(vals)
|
|
1033
1028
|
|
|
1034
1029
|
# Table.merge(on_conflict=/insert_only=/returning=) and Table.claim.
|
|
@@ -1149,9 +1144,7 @@ class SQL(BaseSQLDialect):
|
|
|
1149
1144
|
clause = cls._returning_clause(returning)
|
|
1150
1145
|
if clause:
|
|
1151
1146
|
parts.append(clause)
|
|
1152
|
-
final_sql =
|
|
1153
|
-
" ".join(parts), reindent=True, keyword_case="upper"
|
|
1154
|
-
)
|
|
1147
|
+
final_sql = " ".join(parts)
|
|
1155
1148
|
return final_sql, tuple(vals)
|
|
1156
1149
|
|
|
1157
1150
|
@classmethod
|
|
@@ -1482,9 +1475,7 @@ class SQL(BaseSQLDialect):
|
|
|
1482
1475
|
")",
|
|
1483
1476
|
]
|
|
1484
1477
|
|
|
1485
|
-
final_sql =
|
|
1486
|
-
" ".join(sql_parts), reindent=True, keyword_case="upper"
|
|
1487
|
-
)
|
|
1478
|
+
final_sql = " ".join(sql_parts)
|
|
1488
1479
|
return final_sql, tuple(vals)
|
|
1489
1480
|
|
|
1490
1481
|
@classmethod
|
|
@@ -1670,7 +1661,7 @@ class SQL(BaseSQLDialect):
|
|
|
1670
1661
|
f"CREATE INDEX IF NOT EXISTS {index_identifier} ON {fqtn} USING GIN (TO_TSVECTOR('simple', COALESCE(sys_keywords, '')));"
|
|
1671
1662
|
)
|
|
1672
1663
|
|
|
1673
|
-
sql =
|
|
1664
|
+
sql = " ".join(sql)
|
|
1674
1665
|
return sql, tuple()
|
|
1675
1666
|
|
|
1676
1667
|
@classmethod
|
|
@@ -1833,7 +1824,7 @@ class SQL(BaseSQLDialect):
|
|
|
1833
1824
|
if not statements:
|
|
1834
1825
|
return None
|
|
1835
1826
|
|
|
1836
|
-
sql =
|
|
1827
|
+
sql = " ".join(statements)
|
|
1837
1828
|
return sql, tuple()
|
|
1838
1829
|
|
|
1839
1830
|
@classmethod
|
|
@@ -2012,7 +2003,7 @@ class SQL(BaseSQLDialect):
|
|
|
2012
2003
|
vals.append(val)
|
|
2013
2004
|
connect = "AND"
|
|
2014
2005
|
|
|
2015
|
-
sql =
|
|
2006
|
+
sql = " ".join(sql)
|
|
2016
2007
|
return sql, tuple(vals)
|
|
2017
2008
|
|
|
2018
2009
|
@classmethod
|
|
@@ -2049,7 +2040,6 @@ class SQL(BaseSQLDialect):
|
|
|
2049
2040
|
if on_update:
|
|
2050
2041
|
sql += f" ON UPDATE {str(on_update).upper()}"
|
|
2051
2042
|
sql += ";"
|
|
2052
|
-
sql = sqlparse.format(sql, reindent=True, keyword_case="upper")
|
|
2053
2043
|
return sql, tuple()
|
|
2054
2044
|
|
|
2055
2045
|
@classmethod
|
|
@@ -2157,7 +2147,7 @@ class SQL(BaseSQLDialect):
|
|
|
2157
2147
|
sql.append(s)
|
|
2158
2148
|
vals.extend(v)
|
|
2159
2149
|
|
|
2160
|
-
sql =
|
|
2150
|
+
sql = " ".join(sql)
|
|
2161
2151
|
return sql, tuple(vals)
|
|
2162
2152
|
|
|
2163
2153
|
@classmethod
|
|
@@ -2182,7 +2172,7 @@ class SQL(BaseSQLDialect):
|
|
|
2182
2172
|
name = f"IDX__{table.replace('.', '_')}__{name}"
|
|
2183
2173
|
sql.append(name)
|
|
2184
2174
|
|
|
2185
|
-
sql =
|
|
2175
|
+
sql = " ".join(sql)
|
|
2186
2176
|
return sql, tuple()
|
|
2187
2177
|
|
|
2188
2178
|
@classmethod
|
|
@@ -2230,7 +2220,7 @@ class SQL(BaseSQLDialect):
|
|
|
2230
2220
|
f"ADD COLUMN IF NOT EXISTS {TableHelper.quote(col_name_clean)} {col_type} {null_clause};"
|
|
2231
2221
|
)
|
|
2232
2222
|
|
|
2233
|
-
final_sql =
|
|
2223
|
+
final_sql = " ".join(sql)
|
|
2234
2224
|
return final_sql, tuple()
|
|
2235
2225
|
|
|
2236
2226
|
@classmethod
|
|
@@ -2242,7 +2232,7 @@ class SQL(BaseSQLDialect):
|
|
|
2242
2232
|
sql.append(f"{key},")
|
|
2243
2233
|
if sql[-1][-1] == ",":
|
|
2244
2234
|
sql[-1] = sql[-1][:-1]
|
|
2245
|
-
sql =
|
|
2235
|
+
sql = " ".join(sql)
|
|
2246
2236
|
return sql, tuple()
|
|
2247
2237
|
|
|
2248
2238
|
@classmethod
|
|
@@ -2252,14 +2242,14 @@ class SQL(BaseSQLDialect):
|
|
|
2252
2242
|
sql.append(f"USING {TableHelper.quote(column)}::{TYPES.get_conv(value)}")
|
|
2253
2243
|
if not nullable:
|
|
2254
2244
|
sql.append("NOT NULL")
|
|
2255
|
-
sql =
|
|
2245
|
+
sql = " ".join(sql)
|
|
2256
2246
|
return sql, tuple()
|
|
2257
2247
|
|
|
2258
2248
|
@classmethod
|
|
2259
2249
|
def alter_column_by_sql(cls, table, column, value):
|
|
2260
2250
|
sql = [f"ALTER TABLE {TableHelper.quote(table)} ALTER COLUMN"]
|
|
2261
2251
|
sql.append(f"{TableHelper.quote(column)} {value}")
|
|
2262
|
-
sql =
|
|
2252
|
+
sql = " ".join(sql)
|
|
2263
2253
|
return sql, tuple()
|
|
2264
2254
|
|
|
2265
2255
|
@classmethod
|
|
@@ -2298,7 +2288,7 @@ class SQL(BaseSQLDialect):
|
|
|
2298
2288
|
th.assert_no_joins("DELETE")
|
|
2299
2289
|
sql.append(s)
|
|
2300
2290
|
vals.extend(v)
|
|
2301
|
-
sql =
|
|
2291
|
+
sql = " ".join(sql)
|
|
2302
2292
|
return sql, tuple(vals)
|
|
2303
2293
|
|
|
2304
2294
|
@classmethod
|
|
@@ -2316,7 +2306,7 @@ class SQL(BaseSQLDialect):
|
|
|
2316
2306
|
sql.append(name)
|
|
2317
2307
|
sql.append("AS")
|
|
2318
2308
|
sql.append(query)
|
|
2319
|
-
sql =
|
|
2309
|
+
sql = " ".join(sql)
|
|
2320
2310
|
return sql, tuple()
|
|
2321
2311
|
|
|
2322
2312
|
@classmethod
|
|
@@ -2325,7 +2315,7 @@ class SQL(BaseSQLDialect):
|
|
|
2325
2315
|
if silent:
|
|
2326
2316
|
sql.append("IF EXISTS")
|
|
2327
2317
|
sql.append(name)
|
|
2328
|
-
sql =
|
|
2318
|
+
sql = " ".join(sql)
|
|
2329
2319
|
return sql, tuple()
|
|
2330
2320
|
|
|
2331
2321
|
@classmethod
|
|
@@ -2359,7 +2349,7 @@ class SQL(BaseSQLDialect):
|
|
|
2359
2349
|
s, v = TableHelper(tx, table).make_where(where)
|
|
2360
2350
|
sql.append(s)
|
|
2361
2351
|
vals.extend(v)
|
|
2362
|
-
sql =
|
|
2352
|
+
sql = " ".join(sql)
|
|
2363
2353
|
return sql, tuple(vals)
|
|
2364
2354
|
|
|
2365
2355
|
@classmethod
|
|
@@ -2453,10 +2443,8 @@ class SQL(BaseSQLDialect):
|
|
|
2453
2443
|
orderby = list(columns)
|
|
2454
2444
|
subjoin = " AND ".join([f"t.{col} = dup.{col}" for col in columns])
|
|
2455
2445
|
ob = ", ".join(orderby)
|
|
2456
|
-
final_sql =
|
|
2457
|
-
f"SELECT t.* FROM {table} t JOIN ({sub_sql}) dup ON {subjoin} ORDER BY {ob}"
|
|
2458
|
-
reindent=True,
|
|
2459
|
-
keyword_case="upper",
|
|
2446
|
+
final_sql = (
|
|
2447
|
+
f"SELECT t.* FROM {table} t JOIN ({sub_sql}) dup ON {subjoin} ORDER BY {ob}"
|
|
2460
2448
|
)
|
|
2461
2449
|
return final_sql, tuple(vals)
|
|
2462
2450
|
|
|
@@ -2474,9 +2462,5 @@ class SQL(BaseSQLDialect):
|
|
|
2474
2462
|
|
|
2475
2463
|
groupby_clause = ", ".join([f"lower({col})" for col in columns])
|
|
2476
2464
|
|
|
2477
|
-
sql =
|
|
2478
|
-
f"SELECT {subquery_select} FROM {table} GROUP BY {groupby_clause} HAVING COUNT(*) > 1",
|
|
2479
|
-
reindent=True,
|
|
2480
|
-
keyword_case="upper",
|
|
2481
|
-
)
|
|
2465
|
+
sql = f"SELECT {subquery_select} FROM {table} GROUP BY {groupby_clause} HAVING COUNT(*) > 1"
|
|
2482
2466
|
return sql, tuple()
|
|
@@ -2,7 +2,6 @@ import os
|
|
|
2
2
|
import unittest
|
|
3
3
|
from velocity.db.servers import postgres
|
|
4
4
|
from velocity.db.core.table import Query
|
|
5
|
-
import sqlparse
|
|
6
5
|
|
|
7
6
|
test_db = "test_foreign_key_db"
|
|
8
7
|
engine = postgres.initialize(database=test_db)
|
|
@@ -17,6 +16,11 @@ _INTEGRATION = os.environ.get("VELOCITY_INTEGRATION", "").lower() in (
|
|
|
17
16
|
_needs_db = unittest.skipUnless(_INTEGRATION, "requires live PostgreSQL FK schema")
|
|
18
17
|
|
|
19
18
|
|
|
19
|
+
def _flat(sql):
|
|
20
|
+
"""Statements run as built (no pretty-printing): compare ignoring whitespace."""
|
|
21
|
+
return " ".join(sql.split())
|
|
22
|
+
|
|
23
|
+
|
|
20
24
|
@engine.transaction
|
|
21
25
|
class TestSqlBuilder(unittest.TestCase):
|
|
22
26
|
|
|
@@ -67,7 +71,7 @@ HAVING B.name <> %s
|
|
|
67
71
|
ORDER BY B.name DESC,
|
|
68
72
|
C.title ASC,
|
|
69
73
|
sys_id DESC"""
|
|
70
|
-
self.assertEqual(sql, expected_sql)
|
|
74
|
+
self.assertEqual(_flat(sql), _flat(expected_sql))
|
|
71
75
|
self.assertEqual(
|
|
72
76
|
vals, (1, [1, 2, 3, 4, 5], [1, 2, 3, 4, 5], 1000, 2, 1, 10, "test")
|
|
73
77
|
)
|
|
@@ -75,29 +79,20 @@ ORDER BY B.name DESC,
|
|
|
75
79
|
def test_select_with_wildcard(self, tx):
|
|
76
80
|
sql, vals = tx.table("users").select(sql_only=True)
|
|
77
81
|
expected_sql = "SELECT * FROM users"
|
|
78
|
-
|
|
79
|
-
expected_sql, reindent=True, keyword_case="upper"
|
|
80
|
-
)
|
|
81
|
-
self.assertEqual(sql, expected_sql)
|
|
82
|
+
self.assertEqual(_flat(sql), _flat(expected_sql))
|
|
82
83
|
self.assertEqual(vals, ())
|
|
83
84
|
|
|
84
85
|
def test_select_with_columns(self, tx):
|
|
85
86
|
sql, vals = tx.table("users").select(columns=["id", "name"], sql_only=True)
|
|
86
87
|
expected_sql = "SELECT id, name FROM users"
|
|
87
|
-
|
|
88
|
-
expected_sql, reindent=True, keyword_case="upper"
|
|
89
|
-
)
|
|
90
|
-
self.assertEqual(sql, expected_sql)
|
|
88
|
+
self.assertEqual(_flat(sql), _flat(expected_sql))
|
|
91
89
|
self.assertEqual(vals, ())
|
|
92
90
|
|
|
93
91
|
def test_select_with_distinct(self, tx):
|
|
94
92
|
sql, vals = tx.table("users").select(columns="DISTINCT id, name", sql_only=True)
|
|
95
93
|
print(sql)
|
|
96
94
|
expected_sql = "SELECT DISTINCT id, name FROM users"
|
|
97
|
-
|
|
98
|
-
expected_sql, reindent=True, keyword_case="upper"
|
|
99
|
-
)
|
|
100
|
-
self.assertEqual(sql, expected_sql)
|
|
95
|
+
self.assertEqual(_flat(sql), _flat(expected_sql))
|
|
101
96
|
self.assertEqual(vals, ())
|
|
102
97
|
|
|
103
98
|
@_needs_db
|
|
@@ -115,7 +110,7 @@ ORDER BY B.name DESC,
|
|
|
115
110
|
'ON "A"."profile_id" = "B"."id" '
|
|
116
111
|
'WHERE "B"."email" = %s'
|
|
117
112
|
)
|
|
118
|
-
self.assertEqual(sql, expected_sql)
|
|
113
|
+
self.assertEqual(_flat(sql), _flat(expected_sql))
|
|
119
114
|
self.assertEqual(vals, ("test@example.com",))
|
|
120
115
|
|
|
121
116
|
def xtest_group_by(self):
|
|
@@ -123,7 +118,7 @@ ORDER BY B.name DESC,
|
|
|
123
118
|
columns="id, COUNT(*)", table="users", groupby="id"
|
|
124
119
|
)
|
|
125
120
|
expected_sql = 'SELECT "id", COUNT(*) FROM "users" GROUP BY id'
|
|
126
|
-
self.assertEqual(sql, expected_sql)
|
|
121
|
+
self.assertEqual(_flat(sql), _flat(expected_sql))
|
|
127
122
|
self.assertEqual(vals, [])
|
|
128
123
|
|
|
129
124
|
def xtest_order_by(self):
|
|
@@ -131,7 +126,7 @@ ORDER BY B.name DESC,
|
|
|
131
126
|
columns="id, name", table="users", orderby="name DESC"
|
|
132
127
|
)
|
|
133
128
|
expected_sql = 'SELECT "id", "name" FROM "users" ORDER BY name DESC'
|
|
134
|
-
self.assertEqual(sql, expected_sql)
|
|
129
|
+
self.assertEqual(_flat(sql), _flat(expected_sql))
|
|
135
130
|
self.assertEqual(vals, [])
|
|
136
131
|
|
|
137
132
|
def xtest_limit_offset(self):
|
|
@@ -141,13 +136,13 @@ ORDER BY B.name DESC,
|
|
|
141
136
|
expected_sql = (
|
|
142
137
|
'SELECT "id", "name" FROM "users" OFFSET 10 ROWS FETCH NEXT 20 ROWS ONLY'
|
|
143
138
|
)
|
|
144
|
-
self.assertEqual(sql, expected_sql)
|
|
139
|
+
self.assertEqual(_flat(sql), _flat(expected_sql))
|
|
145
140
|
self.assertEqual(vals, [])
|
|
146
141
|
|
|
147
142
|
def xtest_for_update(self):
|
|
148
143
|
sql, vals = SqlBuilder.select(columns="id, name", table="users", lock=True)
|
|
149
144
|
expected_sql = 'SELECT "id", "name" FROM "users" FOR UPDATE'
|
|
150
|
-
self.assertEqual(sql, expected_sql)
|
|
145
|
+
self.assertEqual(_flat(sql), _flat(expected_sql))
|
|
151
146
|
self.assertEqual(vals, [])
|
|
152
147
|
|
|
153
148
|
def xtest_skip_locked(self):
|
|
@@ -155,7 +150,7 @@ ORDER BY B.name DESC,
|
|
|
155
150
|
columns="id, name", table="users", skip_locked=True
|
|
156
151
|
)
|
|
157
152
|
expected_sql = 'SELECT "id", "name" FROM "users" FOR UPDATE SKIP LOCKED'
|
|
158
|
-
self.assertEqual(sql, expected_sql)
|
|
153
|
+
self.assertEqual(_flat(sql), _flat(expected_sql))
|
|
159
154
|
self.assertEqual(vals, [])
|
|
160
155
|
|
|
161
156
|
def xtest_invalid_table(self):
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: velocity-python
|
|
3
|
-
Version: 0.9.
|
|
3
|
+
Version: 0.9.4
|
|
4
4
|
Summary: A rapid application development library for interfacing with data storage
|
|
5
5
|
Author-email: Velocity Team <info@codeclubs.org>
|
|
6
6
|
License-Expression: MIT
|
|
@@ -19,7 +19,6 @@ Classifier: Operating System :: OS Independent
|
|
|
19
19
|
Requires-Python: >=3.11
|
|
20
20
|
Description-Content-Type: text/markdown
|
|
21
21
|
License-File: LICENSE
|
|
22
|
-
Requires-Dist: sqlparse>=0.5.0
|
|
23
22
|
Provides-Extra: aws
|
|
24
23
|
Requires-Dist: boto3>=1.35.0; extra == "aws"
|
|
25
24
|
Requires-Dist: requests>=2.32.0; extra == "aws"
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
velocity/__init__.py,sha256=
|
|
1
|
+
velocity/__init__.py,sha256=LQvWrQ_E0n_N5MpD66cec4EmIkVVG4DomZiIyvZIsXA,362
|
|
2
2
|
velocity/cache.py,sha256=pthvw7gDVEXRzkTcQtA5YVf4Q1IxAamWsba4UReT0RE,8933
|
|
3
3
|
velocity/hooks.py,sha256=jY_qtAapNHvptmryFSD-Zc7RvLhV6e5nJEH3x2xTgCw,20575
|
|
4
4
|
velocity/logging.py,sha256=MAsZap1cDSdOBNRc_9ezQxup5dHOS0ARxU9NI_-UK3E,4037
|
|
@@ -40,7 +40,7 @@ velocity/aws/capabilities/infra.py,sha256=nUorjg7KpGhLW9ShUGdyh6yAwSKVy7xCAKKXwa
|
|
|
40
40
|
velocity/aws/capabilities/jobs.py,sha256=mf6sU7NG_j4Vzth6RARpazbUD7hx79FmTowXD0xunfc,5192
|
|
41
41
|
velocity/aws/capabilities/provisioning.py,sha256=4PF5QzQ_Pa51v5XN1OOn1juDxWqWPO3WI5fupqA9Agw,17844
|
|
42
42
|
velocity/aws/capabilities/retention.py,sha256=V-vSbfPdpm7w67kaXi3OkmqtqEYFDeDn6P8kCs_rEzs,3198
|
|
43
|
-
velocity/aws/capabilities/security.py,sha256=
|
|
43
|
+
velocity/aws/capabilities/security.py,sha256=37mqO5LtSL2gyaVspSh-l-boUJDL23es0s9u4alVoGI,25429
|
|
44
44
|
velocity/aws/capabilities/single_session.py,sha256=UQhBc4hR-qSZfpBM_o8434Xpg6Bt3EbzI7ugZIxJh8Y,3798
|
|
45
45
|
velocity/aws/capabilities/workflow.py,sha256=P7k6n2oZVovToAcHJUQwLdkD7duS4wKwBQKXaAMAnnU,1875
|
|
46
46
|
velocity/aws/deploy/__init__.py,sha256=nOLW_NqxEv7i2xRSoc4wmawfAEo9z7oPrjxJagKZzaM,4832
|
|
@@ -106,7 +106,7 @@ velocity/db/core/lazy_engine.py,sha256=yFJFN0WIrEQhZh-tSMeWWBOTvi6pyYiMNHQP32MFZ
|
|
|
106
106
|
velocity/db/core/result.py,sha256=Ij0YtKKiUjX2mfG0Kkz8VA0n-X08xyz-vGyYjHoCDwY,15822
|
|
107
107
|
velocity/db/core/row.py,sha256=A2U5cRW03wFOf15jDr_LUCJe0pNW6RYddG-PK3vYqX4,18777
|
|
108
108
|
velocity/db/core/sequence.py,sha256=dap4Ip0m3htgWV9eCF6ajt-SImnPJJGb8pb8kZVVY4Y,4064
|
|
109
|
-
velocity/db/core/table.py,sha256=
|
|
109
|
+
velocity/db/core/table.py,sha256=6T5qkbXPZsnZSxNwyceKK3owIg8Emt2STW8vk_5XxLI,126222
|
|
110
110
|
velocity/db/core/transaction.py,sha256=GSVuhqzrLXtdqWojn5b9X92M9ERm-lbvCntKzlmXbsc,56245
|
|
111
111
|
velocity/db/core/view.py,sha256=lrT1V-NlRioCSfk5pmdXGdCEafdP-t1Pl_EalIrX_cc,5286
|
|
112
112
|
velocity/db/servers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
@@ -124,7 +124,7 @@ velocity/db/servers/mysql/types.py,sha256=_4Fq0CQ9alOtt2JMZHyWJ7-uAsmFObEx9oRiW-
|
|
|
124
124
|
velocity/db/servers/postgres/__init__.py,sha256=AuXBcg1Pjd4nSF4NivVvEi14pBlyUkHCDORTWXTW8l0,8442
|
|
125
125
|
velocity/db/servers/postgres/operators.py,sha256=y9k6enReeR5hJxU_lYYR2epoaw4qCxEqmYJJ5jjaVWA,1166
|
|
126
126
|
velocity/db/servers/postgres/reserved.py,sha256=5tKLaqFV-HrWRj-nsrxl5KGbmeM3ukn_bPZK36XEu8M,3648
|
|
127
|
-
velocity/db/servers/postgres/sql.py,sha256=
|
|
127
|
+
velocity/db/servers/postgres/sql.py,sha256=uuulPINJpy3vlfqRkQhLjoKi2eGNwkNaX5wph_hRwkY,91498
|
|
128
128
|
velocity/db/servers/postgres/types.py,sha256=0c1liFhJas6EL-CcFfgf9cwLbFu55R05t7GmEzaXg0Q,9901
|
|
129
129
|
velocity/db/servers/sqlite/__init__.py,sha256=Kf456zvJ9iffTAxCqxkKrSSnQkOpXxIuzfiiQcVFSbY,2333
|
|
130
130
|
velocity/db/servers/sqlite/operators.py,sha256=ItDbTrTozpSG_QAt0zwZDf6p1GItPafcL1RNxGBVJqI,1220
|
|
@@ -148,7 +148,7 @@ velocity/db/tests/test_result_sql_aware.py,sha256=jdIk60JDJjeev8i-nCAsbQZsGOyMr1
|
|
|
148
148
|
velocity/db/tests/test_row_get_missing_column.py,sha256=yAqCnw77HDCrCJuVfagAqzqKUKO7t10SM4dywgIKnvc,3286
|
|
149
149
|
velocity/db/tests/test_schema_locking_initializers.py,sha256=eIKKxBLS94An_BKJ38YN7jiGODkp48RIdov5AefYHB4,8461
|
|
150
150
|
velocity/db/tests/test_schema_locking_simple.py,sha256=hT-28E1AMlnOPwe8Qa6QiNQ0-yR1c5977TacbeCbFpM,3429
|
|
151
|
-
velocity/db/tests/test_sql_builder.py,sha256=
|
|
151
|
+
velocity/db/tests/test_sql_builder.py,sha256=6iG-QV24c5KUpc5ZGyt8yEjOlL-JLEucZrgBptqbLfM,6065
|
|
152
152
|
velocity/db/tests/test_tablehelper.py,sha256=1eE9kdGLiXb3mGs_kW7hmCkLTESXFAUzxkV-gdlSELs,19767
|
|
153
153
|
velocity/db/tests/test_view_helper.py,sha256=IUBXoOJ3x4s8gNy8LM4H8WNeMBZcCCX1WUOZLGkF-VI,2974
|
|
154
154
|
velocity/db/tests/postgres/__init__.py,sha256=zh28mNshfTljxi_3WAvvmkAxImLduEoHoUT_MAwkzxc,19
|
|
@@ -254,9 +254,9 @@ velocity/workflow/points.py,sha256=g_vQ3cdHdx_JloVCS5dVjo_jJoSolO92K5p3suDzxlE,1
|
|
|
254
254
|
velocity/workflow/schema.py,sha256=1ZAkGZ_4YrTAfY6TIPCviWQJGLhhmAJmkxisfLyy2og,21597
|
|
255
255
|
velocity/workflow/traveler.py,sha256=Ik1InoEo69sZB1wVV-UinVo4P0P5QlcV_hh858p3OWE,20562
|
|
256
256
|
velocity/workflow/views.py,sha256=oTPjpuheND8y4VbcTY8c-4fMdSHKb0jgGzXMuT_G7_s,32175
|
|
257
|
-
velocity_python-0.9.
|
|
258
|
-
velocity_python-0.9.
|
|
259
|
-
velocity_python-0.9.
|
|
260
|
-
velocity_python-0.9.
|
|
261
|
-
velocity_python-0.9.
|
|
262
|
-
velocity_python-0.9.
|
|
257
|
+
velocity_python-0.9.4.dist-info/licenses/LICENSE,sha256=aoN245GG8s9oRUU89KNiGTU4_4OtnNmVi4hQeChg6rM,1076
|
|
258
|
+
velocity_python-0.9.4.dist-info/METADATA,sha256=-FK2yC9InT4hH-wiYPk3-FX3JgIK0pN-oIR1H950VZc,17789
|
|
259
|
+
velocity_python-0.9.4.dist-info/WHEEL,sha256=mOdXR9C3wMVov7cSY8PY-XCzo3SmmWCHvGQr5csJoao,91
|
|
260
|
+
velocity_python-0.9.4.dist-info/entry_points.txt,sha256=nXUKJHkOGQCSPoagdmMNd_qycrle1LVU-GhYknLGM1M,56
|
|
261
|
+
velocity_python-0.9.4.dist-info/top_level.txt,sha256=JW2vJPmodgdgSz7H6yoZvnxF8S3fTMIv-YJWCT1sNW0,9
|
|
262
|
+
velocity_python-0.9.4.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|