Skip to content

Commit 5bb7632

Browse files
mxrmxr
authored
Set up SQL autoformatter (#55)
1 parent fa13855 commit 5bb7632

File tree

4 files changed

+97
-108
lines changed

4 files changed

+97
-108
lines changed

‎.pre-commit-config.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,11 @@ repos:
3434
- id: ruff
3535
args: [--fix]
3636
- id: ruff-format
37+
- repo: https://github.com/sqlfluff/sqlfluff
38+
rev: 3.3.0
39+
hooks:
40+
- id: sqlfluff-fix
41+
args: [--dialect, sqlite]
3742
- repo: https://github.com/pre-commit/mirrors-mypy
3843
rev: v1.14.1
3944
hooks:

‎sqlite_export_for_ynab/ddl/create-tables.sql‎

Lines changed: 76 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
1-
CREATE TABLE IF NOT EXISTS budgets (id TEXT primary key, name TEXT, last_knowledge_of_server INT)
2-
;
1+
CREATE TABLE IF NOT EXISTS budgets (
2+
id TEXT PRIMARY KEY,
3+
name TEXT,
4+
last_knowledge_of_server INT
5+
);
36

47
CREATE TABLE IF NOT EXISTS accounts (
5-
id TEXT primary key,
8+
id TEXT PRIMARY KEY,
69
budget_id TEXT,
710
balance INT,
811
cleared_balance INT,
@@ -16,36 +19,33 @@ CREATE TABLE IF NOT EXISTS accounts (
1619
note TEXT,
1720
on_budget BOOLEAN,
1821
transfer_payee_id TEXT,
19-
TYPE TEXT,
22+
type TEXT,
2023
uncleared_balance INT,
21-
foreign key (budget_id) references budgets (id)
22-
)
23-
;
24+
FOREIGN KEY (budget_id) REFERENCES budgets (id)
25+
);
2426

2527
CREATE TABLE IF NOT EXISTS account_periodic_values (
26-
DATE TEXT,
28+
"date" TEXT,
2729
name TEXT,
2830
budget_id TEXT,
2931
account_id TEXT,
3032
amount INT,
31-
primary key (DATE, name, budget_id, account_id),
32-
foreign key (budget_id) references budgets (id),
33-
foreign key (account_id) references accounts (id)
34-
)
35-
;
33+
PRIMARY KEY (date, name, budget_id, account_id),
34+
FOREIGN KEY (budget_id) REFERENCES budgets (id),
35+
FOREIGN KEY (account_id) REFERENCES accounts (id)
36+
);
3637

3738
CREATE TABLE IF NOT EXISTS category_groups (
38-
id TEXT primary key,
39+
id TEXT PRIMARY KEY,
3940
budget_id TEXT,
4041
name TEXT,
4142
hidden BOOLEAN,
4243
deleted BOOLEAN,
43-
foreign key (budget_id) references budgets (id)
44-
)
45-
;
44+
FOREIGN KEY (budget_id) REFERENCES budgets (id)
45+
);
4646

4747
CREATE TABLE IF NOT EXISTS categories (
48-
id TEXT primary key,
48+
id TEXT PRIMARY KEY,
4949
budget_id TEXT,
5050
category_group_id TEXT,
5151
category_group_name TEXT,
@@ -61,32 +61,30 @@ CREATE TABLE IF NOT EXISTS categories (
6161
goal_day INT,
6262
goal_cadence INT,
6363
goal_cadence_frequency INT,
64-
goal_creation_month text,
64+
goal_creation_month TEXT,
6565
goal_target INT,
66-
goal_target_month text,
66+
goal_target_month TEXT,
6767
goal_percentage_complete INT,
6868
goal_months_to_budget INT,
6969
goal_under_funded INT,
7070
goal_overall_funded INT,
7171
goal_overall_left INT,
7272
deleted BOOLEAN,
73-
foreign key (budget_id) references budgets (id),
74-
foreign key (category_group_id) references category_groups (id)
75-
)
76-
;
73+
FOREIGN KEY (budget_id) REFERENCES budgets (id),
74+
FOREIGN KEY (category_group_id) REFERENCES category_groups (id)
75+
);
7776

7877
CREATE TABLE IF NOT EXISTS payees (
79-
id TEXT primary key,
78+
id TEXT PRIMARY KEY,
8079
budget_id TEXT,
8180
name TEXT,
8281
transfer_account_id TEXT,
8382
deleted BOOLEAN,
84-
foreign key (budget_id) references budgets (id)
85-
)
86-
;
83+
FOREIGN KEY (budget_id) REFERENCES budgets (id)
84+
);
8785

8886
CREATE TABLE IF NOT EXISTS transactions (
89-
id TEXT primary key,
87+
id TEXT PRIMARY KEY,
9088
budget_id TEXT,
9189
account_id TEXT,
9290
account_name TEXT,
@@ -95,7 +93,7 @@ CREATE TABLE IF NOT EXISTS transactions (
9593
category_id TEXT,
9694
category_name TEXT,
9795
cleared TEXT,
98-
DATE TEXT,
96+
"date" TEXT,
9997
debt_transaction_type TEXT,
10098
deleted BOOLEAN,
10199
flag_color TEXT,
@@ -109,15 +107,14 @@ CREATE TABLE IF NOT EXISTS transactions (
109107
payee_name TEXT,
110108
transfer_account_id TEXT,
111109
transfer_transaction_id TEXT,
112-
foreign key (budget_id) references budgets (id),
113-
foreign key (account_id) references accounts (id),
114-
foreign key (category_id) references categories (id),
115-
foreign key (payee_id) references payees (id)
116-
)
117-
;
110+
FOREIGN KEY (budget_id) REFERENCES budgets (id),
111+
FOREIGN KEY (account_id) REFERENCES accounts (id),
112+
FOREIGN KEY (category_id) REFERENCES categories (id),
113+
FOREIGN KEY (payee_id) REFERENCES payees (id)
114+
);
118115

119116
CREATE TABLE IF NOT EXISTS subtransactions (
120-
id TEXT primary key,
117+
id TEXT PRIMARY KEY,
121118
budget_id TEXT,
122119
amount INT,
123120
category_id TEXT,
@@ -129,54 +126,51 @@ CREATE TABLE IF NOT EXISTS subtransactions (
129126
transaction_id TEXT,
130127
transfer_account_id TEXT,
131128
transfer_transaction_id TEXT,
132-
foreign key (budget_id) references budget (id),
133-
foreign key (transfer_account_id) references accounts (id),
134-
foreign key (category_id) references categories (id),
135-
foreign key (payee_id) references payees (id),
136-
foreign key (transaction_id) references transaction_id (id)
137-
)
138-
;
129+
FOREIGN KEY (budget_id) REFERENCES budget (id),
130+
FOREIGN KEY (transfer_account_id) REFERENCES accounts (id),
131+
FOREIGN KEY (category_id) REFERENCES categories (id),
132+
FOREIGN KEY (payee_id) REFERENCES payees (id),
133+
FOREIGN KEY (transaction_id) REFERENCES transaction_id (id)
134+
);
139135

140136
CREATE TABLE IF NOT EXISTS scheduled_transactions (
141-
id TEXT primary key,
137+
id TEXT PRIMARY KEY,
142138
budget_id TEXT,
143-
account_id text,
144-
account_name text,
145-
amount int,
146-
category_id text,
147-
category_name text,
148-
date_first text,
149-
date_next text,
150-
deleted boolean,
151-
flag_color text,
152-
flag_name text,
153-
frequency text,
154-
memo text,
155-
payee_id text,
156-
payee_name text,
157-
transfer_account_id text,
158-
foreign key (budget_id) references budgets (id),
159-
foreign key (account_id) references accounts (id),
160-
foreign key (category_id) references categories (id),
161-
foreign key (payee_id) references payees (id),
162-
foreign key (transfer_account_id) references accounts (id)
163-
)
164-
;
139+
account_id TEXT,
140+
account_name TEXT,
141+
amount INT,
142+
category_id TEXT,
143+
category_name TEXT,
144+
date_first TEXT,
145+
date_next TEXT,
146+
deleted BOOLEAN,
147+
flag_color TEXT,
148+
flag_name TEXT,
149+
frequency TEXT,
150+
memo TEXT,
151+
payee_id TEXT,
152+
payee_name TEXT,
153+
transfer_account_id TEXT,
154+
FOREIGN KEY (budget_id) REFERENCES budgets (id),
155+
FOREIGN KEY (account_id) REFERENCES accounts (id),
156+
FOREIGN KEY (category_id) REFERENCES categories (id),
157+
FOREIGN KEY (payee_id) REFERENCES payees (id),
158+
FOREIGN KEY (transfer_account_id) REFERENCES accounts (id)
159+
);
165160

166161
CREATE TABLE IF NOT EXISTS scheduled_subtransactions (
167-
id TEXT primary key,
162+
id TEXT PRIMARY KEY,
168163
budget_id TEXT,
169-
scheduled_transaction_id text,
170-
amount int,
171-
memo text,
172-
payee_id text,
173-
category_id text,
174-
transfer_account_id text,
175-
deleted boolean,
176-
foreign key (budget_id) references budget (id),
177-
foreign key (transfer_account_id) references accounts (id),
178-
foreign key (category_id) references categories (id),
179-
foreign key (payee_id) references payees (id),
180-
foreign key (scheduled_transaction_id) references transaction_id (id)
181-
)
182-
;
164+
scheduled_transaction_id TEXT,
165+
amount INT,
166+
memo TEXT,
167+
payee_id TEXT,
168+
category_id TEXT,
169+
transfer_account_id TEXT,
170+
deleted BOOLEAN,
171+
FOREIGN KEY (budget_id) REFERENCES budget (id),
172+
FOREIGN KEY (transfer_account_id) REFERENCES accounts (id),
173+
FOREIGN KEY (category_id) REFERENCES categories (id),
174+
FOREIGN KEY (payee_id) REFERENCES payees (id),
175+
FOREIGN KEY (scheduled_transaction_id) REFERENCES transaction_id (id)
176+
);

‎sqlite_export_for_ynab/ddl/drop-tables.sql‎

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,19 @@
1-
DROP TABLE IF EXISTS budgets
2-
;
1+
DROP TABLE IF EXISTS budgets;
32

4-
DROP TABLE IF EXISTS accounts
5-
;
3+
DROP TABLE IF EXISTS accounts;
64

7-
DROP TABLE IF EXISTS account_periodic_values
8-
;
5+
DROP TABLE IF EXISTS account_periodic_values;
96

10-
DROP TABLE IF EXISTS category_groups
11-
;
7+
DROP TABLE IF EXISTS category_groups;
128

13-
DROP TABLE IF EXISTS categories
14-
;
9+
DROP TABLE IF EXISTS categories;
1510

16-
DROP TABLE IF EXISTS payees
17-
;
11+
DROP TABLE IF EXISTS payees;
1812

19-
DROP TABLE IF EXISTS transactions
20-
;
13+
DROP TABLE IF EXISTS transactions;
2114

22-
DROP TABLE IF EXISTS subtransactions
23-
;
15+
DROP TABLE IF EXISTS subtransactions;
2416

25-
DROP TABLE IF EXISTS scheduled_transactions
26-
;
17+
DROP TABLE IF EXISTS scheduled_transactions;
2718

28-
DROP TABLE IF EXISTS scheduled_subtransactions
29-
;
19+
DROP TABLE IF EXISTS scheduled_subtransactions;

‎tests/_main_test.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -126,13 +126,13 @@ def test_insert_accounts(cur):
126126
"id": ACCOUNT_ID_1,
127127
"budget_id": BUDGET_ID_1,
128128
"name": ACCOUNTS[0]["name"],
129-
"TYPE": ACCOUNTS[0]["type"],
129+
"type": ACCOUNTS[0]["type"],
130130
},
131131
{
132132
"id": ACCOUNT_ID_2,
133133
"budget_id": BUDGET_ID_1,
134134
"name": ACCOUNTS[1]["name"],
135-
"TYPE": ACCOUNTS[1]["type"],
135+
"type": ACCOUNTS[1]["type"],
136136
},
137137
]
138138

@@ -142,14 +142,14 @@ def test_insert_accounts(cur):
142142
"account_id": ACCOUNT_ID_1,
143143
"budget_id": BUDGET_ID_1,
144144
"name": "debt_escrow_amounts",
145-
"DATE": "2024-01-01",
145+
"date": "2024-01-01",
146146
"amount": 160000,
147147
},
148148
{
149149
"account_id": ACCOUNT_ID_1,
150150
"budget_id": BUDGET_ID_1,
151151
"name": "debt_interest_rates",
152-
"DATE": "2024-02-01",
152+
"date": "2024-02-01",
153153
"amount": 5000,
154154
},
155155
]
@@ -238,13 +238,13 @@ def test_insert_transactions(cur):
238238
{
239239
"id": TRANSACTION_ID_1,
240240
"budget_id": BUDGET_ID_1,
241-
"DATE": "2024-01-01",
241+
"date": "2024-01-01",
242242
"amount": -10000,
243243
},
244244
{
245245
"id": TRANSACTION_ID_2,
246246
"budget_id": BUDGET_ID_1,
247-
"DATE": "2024-02-01",
247+
"date": "2024-02-01",
248248
"amount": -15000,
249249
},
250250
]

0 commit comments

Comments
 (0)