Skip to content

Commit 9ae22b0

Browse files
dependabot[bot]slifty
authored andcommitted
Bump sqlfluff from 4.1.0 to 4.2.0 in /sqlfluff
Bumps [sqlfluff](https://github.com/sqlfluff/sqlfluff) from 4.1.0 to 4.2.0. - [Release notes](https://github.com/sqlfluff/sqlfluff/releases) - [Changelog](https://github.com/sqlfluff/sqlfluff/blob/main/CHANGELOG.md) - [Commits](sqlfluff/sqlfluff@4.1.0...4.2.0) --- updated-dependencies: - dependency-name: sqlfluff dependency-version: 4.2.0 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>
1 parent 02a98b1 commit 9ae22b0

7 files changed

Lines changed: 29 additions & 31 deletions

File tree

.sqlfluff

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,3 +47,5 @@ status = 'pending'
4747
memberFunderShortCode = 'placeholder'
4848
baseFieldShortCode = 'placeholder'
4949
userKeycloakUserId = '00000000-0000-0000-0000-000000000000'
50+
bulkUploadTaskId = 1
51+
isCollaborative = false

sqlfluff/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sqlfluff==4.1.0
1+
sqlfluff==4.2.0

src/__tests__/baseFields.int.test.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -615,10 +615,8 @@ describe('/baseFields', () => {
615615
const baseFields = await loadBaseFieldBundle(
616616
db,
617617
null,
618-
{
619-
negated: false,
620-
list: [BaseFieldSensitivityClassification.PUBLIC],
621-
},
618+
false,
619+
[BaseFieldSensitivityClassification.PUBLIC],
622620
NO_LIMIT,
623621
NO_OFFSET,
624622
);
Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { generateLoadBundleOperation } from '../generators';
2-
import type { ExpandedParameterFilter } from '../../parameters';
32
import type {
43
BaseField,
54
BaseFieldSensitivityClassification,
@@ -8,8 +7,12 @@ import type {
87
const loadBaseFieldBundle = generateLoadBundleOperation<
98
BaseField,
109
[
11-
sensitivityFilter: ExpandedParameterFilter<BaseFieldSensitivityClassification>,
10+
sensitivityFilterNegated: boolean,
11+
sensitivityFilterList: BaseFieldSensitivityClassification[],
1212
]
13-
>('baseFields.selectWithPagination', ['sensitivityFilter']);
13+
>('baseFields.selectWithPagination', [
14+
'sensitivityFilterNegated',
15+
'sensitivityFilterList',
16+
]);
1417

1518
export { loadBaseFieldBundle };

src/database/queries/baseFields/select.sql

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,14 @@ SELECT base_field_to_json(base_fields.*) AS object
22
FROM base_fields
33
WHERE
44
CASE
5-
WHEN :sensitivityFilter.list::sensitivity_classification [] IS NULL
5+
WHEN :sensitivityFilterList::sensitivity_classification [] IS NULL
66
THEN TRUE
7+
WHEN :sensitivityFilterNegated THEN
8+
NOT (base_fields.sensitivity_classification = any(
9+
:sensitivityFilterList::sensitivity_classification []
10+
))
711
ELSE
8-
CASE
9-
WHEN :sensitivityFilter.negated THEN
10-
NOT (base_fields.sensitivity_classification = any(
11-
:sensitivityFilter.list::sensitivity_classification []
12-
))
13-
ELSE
14-
base_fields.sensitivity_classification = any(
15-
:sensitivityFilter.list::sensitivity_classification []
16-
)
17-
END
12+
base_fields.sensitivity_classification = any(
13+
:sensitivityFilterList::sensitivity_classification []
14+
)
1815
END;

src/database/queries/baseFields/selectWithPagination.sql

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,16 @@ WITH
44
FROM base_fields
55
WHERE
66
CASE
7-
WHEN :sensitivityFilter.list::sensitivity_classification [] IS NULL
7+
WHEN :sensitivityFilterList::sensitivity_classification [] IS NULL
88
THEN TRUE
9+
WHEN :sensitivityFilterNegated THEN
10+
NOT (base_fields.sensitivity_classification = any(
11+
:sensitivityFilterList::sensitivity_classification []
12+
))
913
ELSE
10-
CASE
11-
WHEN :sensitivityFilter.negated THEN
12-
NOT (base_fields.sensitivity_classification = any(
13-
:sensitivityFilter.list::sensitivity_classification []
14-
))
15-
ELSE
16-
base_fields.sensitivity_classification = any(
17-
:sensitivityFilter.list::sensitivity_classification []
18-
)
19-
END
14+
base_fields.sensitivity_classification = any(
15+
:sensitivityFilterList::sensitivity_classification []
16+
)
2017
END
2118
),
2219

src/handlers/baseFieldsHandlers.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ const getBaseFields = async (req: Request, res: Response): Promise<void> => {
4141
const baseFieldBundle = await loadBaseFieldBundle(
4242
db,
4343
authContext,
44-
sensitivityClassificationFilter,
44+
sensitivityClassificationFilter.negated,
45+
sensitivityClassificationFilter.list,
4546
limit,
4647
offset,
4748
);

0 commit comments

Comments
 (0)