Skip to content

Commit 25f8c34

Browse files
SynarSynar
committed
backend: minor, change SQL capitalization
1 parent e62c3f5 commit 25f8c34

File tree

7 files changed

+80
-80
lines changed

7 files changed

+80
-80
lines changed

‎backend/src/models/access_token.rs

+12-12
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,9 @@ impl AccessToken {
9999
id,
100100
title,
101101
token,
102-
permissions as "permissions: Json<Permissions>",
102+
permissions AS "permissions: Json<Permissions>",
103103
active,
104-
0 as "last_week_visits!"
104+
0 AS "last_week_visits!"
105105
"#,
106106
access_token.title,
107107
access_token.token,
@@ -131,9 +131,9 @@ impl AccessToken {
131131
id,
132132
title,
133133
token,
134-
permissions as "permissions: Json<Permissions>",
134+
permissions AS "permissions: Json<Permissions>",
135135
active,
136-
(SELECT COUNT(*) FROM access_tokens_visits WHERE token_id = id AND visited_at > NOW() - INTERVAL '1 week') as "last_week_visits!"
136+
(SELECT COUNT(*) FROM access_tokens_visits WHERE token_id = id AND visited_at > NOW() - INTERVAL '1 week') AS "last_week_visits!"
137137
"#,
138138
given_id,
139139
update.title,
@@ -172,9 +172,9 @@ impl AccessToken {
172172
id,
173173
title,
174174
token,
175-
permissions as "permissions: Json<Permissions>",
175+
permissions AS "permissions: Json<Permissions>",
176176
active,
177-
0 as "last_week_visits!"
177+
0 AS "last_week_visits!"
178178
FROM access_tokens
179179
WHERE token = $1
180180
"#,
@@ -196,9 +196,9 @@ impl AccessToken {
196196
id,
197197
title,
198198
token,
199-
permissions as "permissions: Json<Permissions>",
199+
permissions AS "permissions: Json<Permissions>",
200200
active,
201-
(SELECT COUNT(*) FROM access_tokens_visits WHERE token_id = id AND visited_at > NOW() - INTERVAL '1 week') as "last_week_visits!"
201+
(SELECT COUNT(*) FROM access_tokens_visits WHERE token_id = id AND visited_at > NOW() - INTERVAL '1 week') AS "last_week_visits!"
202202
FROM access_tokens
203203
WHERE id = $1
204204
"#,
@@ -217,9 +217,9 @@ impl AccessToken {
217217
id,
218218
title,
219219
token,
220-
permissions as "permissions: Json<Permissions>",
220+
permissions AS "permissions: Json<Permissions>",
221221
active,
222-
(SELECT COUNT(*) FROM access_tokens_visits WHERE token_id = id AND visited_at > NOW() - INTERVAL '1 week') as "last_week_visits!"
222+
(SELECT COUNT(*) FROM access_tokens_visits WHERE token_id = id AND visited_at > NOW() - INTERVAL '1 week') AS "last_week_visits!"
223223
FROM access_tokens
224224
"#
225225
)
@@ -262,7 +262,7 @@ impl AccessToken {
262262
GROUP BY referrer
263263
)
264264
SELECT json_object_agg(referrer, total) FROM origins
265-
), '{}') as "origins: JsonValue",
265+
), '{}') AS "origins: JsonValue",
266266
(
267267
WITH date_series AS (
268268
SELECT generate_series(
@@ -292,7 +292,7 @@ impl AccessToken {
292292
visit_count
293293
), '{}') AS visits
294294
FROM aggregated_visits
295-
) as "visits_30_days: JsonValue"
295+
) AS "visits_30_days: JsonValue"
296296
"#,
297297
access_token_id
298298
)

‎backend/src/models/category.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ impl Category {
4141
title,
4242
family_id,
4343
default_status,
44-
(SELECT hash FROM icons WHERE id = icon_id) as icon_hash,
44+
(SELECT hash FROM icons WHERE id = icon_id) AS icon_hash,
4545
fill_color,
4646
border_color,
4747
version
@@ -66,7 +66,7 @@ impl Category {
6666
title,
6767
family_id,
6868
default_status,
69-
(SELECT hash FROM icons WHERE id = icon_id) as icon_hash,
69+
(SELECT hash FROM icons WHERE id = icon_id) AS icon_hash,
7070
fill_color,
7171
border_color,
7272
version
@@ -100,7 +100,7 @@ impl Category {
100100
title,
101101
family_id,
102102
default_status,
103-
(SELECT hash FROM icons WHERE id = icon_id) as icon_hash,
103+
(SELECT hash FROM icons WHERE id = icon_id) AS icon_hash,
104104
fill_color,
105105
border_color,
106106
version
@@ -142,7 +142,7 @@ impl Category {
142142
title,
143143
family_id,
144144
default_status,
145-
(SELECT hash FROM icons WHERE id = icon_id) as icon_hash,
145+
(SELECT hash FROM icons WHERE id = icon_id) AS icon_hash,
146146
fill_color,
147147
border_color,
148148
version
@@ -167,7 +167,7 @@ impl Category {
167167
title,
168168
family_id,
169169
default_status,
170-
(SELECT hash FROM icons WHERE id = icon_id) as icon_hash,
170+
(SELECT hash FROM icons WHERE id = icon_id) AS icon_hash,
171171
fill_color,
172172
border_color,
173173
version

‎backend/src/models/comment.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ impl AdminComment {
153153
RETURNING *
154154
)
155155
SELECT i.id, i.entity_id, i.author, i.text, i.data, i.created_at, i.updated_at, i.moderated, i.version,
156-
display_name as entity_display_name, category_id as entity_category_id
156+
display_name AS entity_display_name, category_id AS entity_category_id
157157
FROM inserted i
158158
JOIN entities e
159159
ON e.id = entity_id
@@ -195,7 +195,7 @@ impl AdminComment {
195195
RETURNING *
196196
)
197197
SELECT i.id, i.entity_id, i.author, i.text, i.data, i.created_at, i.updated_at, i.moderated, i.version,
198-
e.display_name as entity_display_name, e.category_id as entity_category_id
198+
e.display_name AS entity_display_name, e.category_id AS entity_category_id
199199
FROM inserted i
200200
JOIN entities e
201201
ON e.id = entity_id
@@ -218,7 +218,7 @@ impl AdminComment {
218218
AdminComment,
219219
r#"
220220
SELECT c.id, c.entity_id, c.author, c.text, c.data, c.created_at, c.updated_at, c.moderated, c.version,
221-
e.display_name as entity_display_name, e.category_id as entity_category_id
221+
e.display_name AS entity_display_name, e.category_id AS entity_category_id
222222
FROM comments c
223223
JOIN entities e ON e.id = c.entity_id
224224
WHERE c.id = $1
@@ -253,7 +253,7 @@ impl AdminComment {
253253
AdminComment,
254254
r#"
255255
SELECT c.id, c.entity_id, c.author, c.text, c.data, c.created_at, c.updated_at, c.moderated, c.version,
256-
e.display_name as entity_display_name, e.category_id as entity_category_id
256+
e.display_name AS entity_display_name, e.category_id AS entity_category_id
257257
FROM comments c
258258
JOIN entities e ON e.id = c.entity_id
259259
WHERE entity_id = $1
@@ -270,7 +270,7 @@ impl AdminComment {
270270
sqlx::query_as!(
271271
AdminListedComment,
272272
r#"
273-
SELECT c.id, c.entity_id, e.display_name as entity_display_name, e.category_id as entity_category_id, c.created_at,
273+
SELECT c.id, c.entity_id, e.display_name AS entity_display_name, e.category_id AS entity_category_id, c.created_at,
274274
c.author, c.moderated, c.updated_at
275275
FROM comments c
276276
INNER JOIN entities e ON c.entity_id = e.id

‎backend/src/models/entity.rs

+11-11
Original file line numberDiff line numberDiff line change
@@ -119,13 +119,13 @@ impl PublicEntity {
119119
PublicEntity,
120120
r#"
121121
SELECT e.id, c.family_id, e.category_id, e.display_name, e.data, e.created_at, e.updated_at,
122-
e.locations as "locations: Json<Vec<UnprocessedLocation>>",
122+
e.locations AS "locations: Json<Vec<UnprocessedLocation>>",
123123
COALESCE(
124124
(SELECT array_agg(t.tag_id) FROM entity_tags t WHERE t.entity_id = e.id),
125125
array[]::uuid[]
126-
) as "tags!",
127-
f.entity_form as "entity_form: Json<Form>",
128-
f.comment_form as "comment_form: Json<Form>"
126+
) AS "tags!",
127+
f.entity_form AS "entity_form: Json<Form>",
128+
f.comment_form AS "comment_form: Json<Form>"
129129
FROM entities e
130130
INNER JOIN categories c ON e.category_id = c.id
131131
INNER JOIN families f ON c.family_id = f.id
@@ -155,7 +155,7 @@ impl PublicEntity {
155155
COALESCE(
156156
(SELECT array_agg(t.tag_id) FROM entity_tags t WHERE t.entity_id = e.id),
157157
array[]::uuid[]
158-
) as "tags!"
158+
) AS "tags!"
159159
FROM entities e
160160
INNER JOIN entities_entities ee ON e.id = ee.child_id
161161
WHERE ee.parent_id = $1 AND e.moderated AND NOT e.hidden
@@ -181,7 +181,7 @@ impl PublicEntity {
181181
COALESCE(
182182
(SELECT array_agg(t.tag_id) FROM entity_tags t WHERE t.entity_id = e.id),
183183
array[]::uuid[]
184-
) as "tags!"
184+
) AS "tags!"
185185
FROM entities e
186186
INNER JOIN entities_entities ee ON e.id = ee.parent_id
187187
WHERE ee.child_id = $1 AND e.moderated AND NOT e.hidden
@@ -476,7 +476,7 @@ impl AdminEntity {
476476
COALESCE(
477477
(SELECT array_agg(t.tag_id) FROM entity_tags t WHERE t.entity_id = e.id),
478478
array[]::uuid[]
479-
) as "tags!"
479+
) AS "tags!"
480480
FROM entities e
481481
INNER JOIN entities_entities ee ON e.id = ee.parent_id
482482
WHERE ee.child_id = $1
@@ -500,7 +500,7 @@ impl AdminEntity {
500500
COALESCE(
501501
(SELECT array_agg(t.tag_id) FROM entity_tags t WHERE t.entity_id = e.id),
502502
array[]::uuid[]
503-
) as "tags!"
503+
) AS "tags!"
504504
FROM entities e
505505
INNER JOIN entities_entities ee ON e.id = ee.child_id
506506
WHERE ee.parent_id = $1
@@ -517,13 +517,13 @@ impl AdminEntity {
517517
AdminEntity,
518518
r#"
519519
SELECT e.id, c.family_id, e.display_name, e.category_id,
520-
e.locations as "locations: Json<Vec<UnprocessedLocation>>",
520+
e.locations AS "locations: Json<Vec<UnprocessedLocation>>",
521521
e.data, e.hidden, e.moderation_notes, e.moderated,
522522
e.created_at, e.updated_at, e.version,
523523
COALESCE(
524524
(SELECT array_agg(t.tag_id) FROM entity_tags t WHERE t.entity_id = e.id),
525525
array[]::uuid[]
526-
) as "tags!"
526+
) AS "tags!"
527527
FROM entities e
528528
INNER JOIN categories c ON e.category_id = c.id
529529
WHERE e.id = $1
@@ -544,7 +544,7 @@ impl AdminEntity {
544544
COALESCE(
545545
(SELECT array_agg(t.tag_id) FROM entity_tags t WHERE t.entity_id = e.id),
546546
array[]::uuid[]
547-
) as "tags!"
547+
) AS "tags!"
548548
FROM entities e
549549
WHERE NOT e.moderated
550550
ORDER BY created_at

‎backend/src/models/entity_cache.rs

+28-28
Original file line numberDiff line numberDiff line change
@@ -262,16 +262,16 @@ impl ViewerCachedEntity {
262262
CachedClusteredEntity,
263263
r#"
264264
SELECT
265-
id as "id!",
266-
entity_id as "entity_id!",
267-
category_id as "category_id!",
268-
family_id as "family_id!",
269-
display_name as "display_name!",
265+
id AS "id!",
266+
entity_id AS "entity_id!",
267+
category_id AS "category_id!",
268+
family_id AS "family_id!",
269+
display_name AS "display_name!",
270270
parent_id,
271271
parent_display_name,
272-
web_mercator_x as "web_mercator_x!",
273-
web_mercator_y as "web_mercator_y!",
274-
plain_text_location as "plain_text_location!",
272+
web_mercator_x AS "web_mercator_x!",
273+
web_mercator_y AS "web_mercator_y!",
274+
plain_text_location AS "plain_text_location!",
275275
cluster_id,
276276
cluster_center_x,
277277
cluster_center_y
@@ -383,16 +383,16 @@ impl ViewerCachedEntity {
383383
PaginatedCachedEntity,
384384
r#"
385385
SELECT
386-
id as "id!",
387-
entity_id as "entity_id!",
388-
category_id as "category_id!",
389-
family_id as "family_id!",
390-
display_name as "display_name!",
391-
parents as "parents!: Json<Vec<ParentRepresentation>>",
392-
locations as "locations!: Json<Vec<LocationRepresentation>>",
393-
total_results as "total_results!",
394-
total_pages as "total_pages!",
395-
response_current_page as "response_current_page!"
386+
id AS "id!",
387+
entity_id AS "entity_id!",
388+
category_id AS "category_id!",
389+
family_id AS "family_id!",
390+
display_name AS "display_name!",
391+
parents AS "parents!: Json<Vec<ParentRepresentation>>",
392+
locations AS "locations!: Json<Vec<LocationRepresentation>>",
393+
total_results AS "total_results!",
394+
total_pages AS "total_pages!",
395+
response_current_page AS "response_current_page!"
396396
FROM search_entities(
397397
$1,
398398
$2,
@@ -459,16 +459,16 @@ impl AdminCachedEntity {
459459
AdminPaginatedCachedEntity,
460460
r#"
461461
SELECT
462-
id as "id!",
463-
entity_id as "entity_id!",
464-
category_id as "category_id!",
465-
tags_ids as "tags_ids!",
466-
family_id as "family_id!",
467-
display_name as "display_name!",
468-
total_results as "total_results!",
469-
total_pages as "total_pages!",
470-
response_current_page as "response_current_page!",
471-
hidden as "hidden!"
462+
id AS "id!",
463+
entity_id AS "entity_id!",
464+
category_id AS "category_id!",
465+
tags_ids AS "tags_ids!",
466+
family_id AS "family_id!",
467+
display_name AS "display_name!",
468+
total_results AS "total_results!",
469+
total_pages AS "total_pages!",
470+
response_current_page AS "response_current_page!",
471+
hidden AS "hidden!"
472472
FROM search_entities_admin(
473473
$1,
474474
$2,

‎backend/src/models/family.rs

+12-12
Original file line numberDiff line numberDiff line change
@@ -262,9 +262,9 @@ impl Family {
262262
RETURNING
263263
id,
264264
title,
265-
(SELECT hash FROM icons WHERE id = icon_id) as icon_hash,
266-
entity_form as "entity_form: Json<Form>",
267-
comment_form as "comment_form: Json<Form>",
265+
(SELECT hash FROM icons WHERE id = icon_id) AS icon_hash,
266+
entity_form AS "entity_form: Json<Form>",
267+
comment_form AS "comment_form: Json<Form>",
268268
sort_order,
269269
version
270270
"#,
@@ -359,9 +359,9 @@ impl Family {
359359
sqlx::query_as!(
360360
Family,
361361
r#"
362-
SELECT id, title, (SELECT hash FROM icons WHERE id = icon_id) as icon_hash,
363-
entity_form as "entity_form: Json<Form>",
364-
comment_form as "comment_form: Json<Form>",
362+
SELECT id, title, (SELECT hash FROM icons WHERE id = icon_id) AS icon_hash,
363+
entity_form AS "entity_form: Json<Form>",
364+
comment_form AS "comment_form: Json<Form>",
365365
sort_order,
366366
version
367367
FROM families
@@ -403,9 +403,9 @@ impl Family {
403403
sqlx::query_as!(
404404
Family,
405405
r#"
406-
SELECT families.id, families.title, (SELECT hash FROM icons WHERE id = families.icon_id) as icon_hash,
407-
families.entity_form as "entity_form: Json<Form>",
408-
families.comment_form as "comment_form: Json<Form>",
406+
SELECT families.id, families.title, (SELECT hash FROM icons WHERE id = families.icon_id) AS icon_hash,
407+
families.entity_form AS "entity_form: Json<Form>",
408+
families.comment_form AS "comment_form: Json<Form>",
409409
families.sort_order,
410410
families.version
411411
FROM families
@@ -426,9 +426,9 @@ impl Family {
426426
sqlx::query_as!(
427427
Family,
428428
r#"
429-
SELECT families.id, families.title, (SELECT hash FROM icons WHERE id = families.icon_id) as icon_hash,
430-
families.entity_form as "entity_form: Json<Form>",
431-
families.comment_form as "comment_form: Json<Form>",
429+
SELECT families.id, families.title, (SELECT hash FROM icons WHERE id = families.icon_id) AS icon_hash,
430+
families.entity_form AS "entity_form: Json<Form>",
431+
families.comment_form AS "comment_form: Json<Form>",
432432
families.sort_order,
433433
families.version
434434
FROM families

0 commit comments

Comments
 (0)