Skip to content

Commit 0e31442

Browse files
authored
Merge branch 'main' into add-transaction-support
2 parents 3026e2e + bd06696 commit 0e31442

3 files changed

Lines changed: 11 additions & 6 deletions

File tree

.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,4 +198,4 @@ dotnet_naming_style.pascal_case.capitalization = pascal_case
198198
dotnet_naming_style.begins_with_i.required_prefix = I
199199
dotnet_naming_style.begins_with_i.required_suffix =
200200
dotnet_naming_style.begins_with_i.word_separator =
201-
dotnet_naming_style.begins_with_i.capitalization = pascal_case
201+
dotnet_naming_style.begins_with_i.capitalization = pascal_case

.pre-commit-config.yaml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,12 @@ repos:
33
rev: 3.4.1
44
hooks:
55
- id: sqlfluff-fix
6-
args: [--FIX-EVEN-UNPARSABLE]
6+
args: [--FIX-EVEN-UNPARSABLE]
7+
- repo: local
8+
hooks:
9+
- id: dotnet-format
10+
name: dotnet format
11+
entry: dotnet format --include
12+
language: system
13+
pass_filenames: true
14+
files: ^((?!GeneratedProtobuf/|examples/).)*\.cs$

Makefile

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
SHELL := /bin/bash
22
PWD := $(shell pwd)
33

4-
dotnet-format:
5-
dotnet format --exclude GeneratedProtobuf --exclude examples
6-
74
protobuf-generate:
85
./scripts/generate_protobuf.sh
96

@@ -34,7 +31,7 @@ sqlc-generate-requests:
3431
sqlc-generate:
3532
SQLCCACHE=./; sqlc -f sqlc.local.yaml generate
3633

37-
test-plugin: protobuf-generate sync-sqlc-options dotnet-publish-process sqlc-generate-requests unit-tests sqlc-generate generate-end2end-tests dotnet-build run-end2end-tests update-wasm-plugin
34+
test-plugin: protobuf-generate sync-sqlc-options dotnet-publish-process sqlc-generate-requests unit-tests sqlc-generate generate-end2end-tests dotnet-build run-end2end-tests
3835

3936
# WASM type plugin
4037
setup-ci-wasm-plugin:

0 commit comments

Comments
 (0)