Skip to content

Commit 98ff4a7

Browse files
jc21jc21
committed
Fix inconsistencies between int and bool in db
1 parent 7edcb8e commit 98ff4a7

File tree

7 files changed

+144
-152
lines changed

7 files changed

+144
-152
lines changed

‎backend/cmd/server/main.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ func checkSetup() {
6969

7070
if db != nil {
7171
db.Model(&user.Model{}).
72-
Where("is_disabled = ?", 0).
73-
Where("is_system = ?", 0).
72+
Where("is_disabled = ?", false).
73+
Where("is_system = ?", false).
7474
Count(&count)
7575

7676
if count == 0 {

‎backend/embed/migrations/mysql/20201013035318_initial_schema.sql

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ CREATE TABLE IF NOT EXISTS `jwt_keys`
55
`id` INT AUTO_INCREMENT PRIMARY KEY,
66
`created_at` BIGINT NOT NULL DEFAULT 0,
77
`updated_at` BIGINT NOT NULL DEFAULT 0,
8-
`is_deleted` INT NOT NULL DEFAULT 0,
8+
`is_deleted` INT NOT NULL DEFAULT 0, -- int on purpose, gormism
99
`public_key` TEXT NOT NULL,
1010
`private_key` TEXT NOT NULL
1111
);
@@ -15,12 +15,12 @@ CREATE TABLE IF NOT EXISTS `user`
1515
`id` INT AUTO_INCREMENT PRIMARY KEY,
1616
`created_at` BIGINT NOT NULL DEFAULT 0,
1717
`updated_at` BIGINT NOT NULL DEFAULT 0,
18-
`is_deleted` INT NOT NULL DEFAULT 0,
18+
`is_deleted` INT NOT NULL DEFAULT 0, -- int on purpose, gormism
1919
`name` VARCHAR(50) NOT NULL,
2020
`nickname` VARCHAR(50) NOT NULL,
2121
`email` VARCHAR(255) NOT NULL,
22-
`is_system` INT NOT NULL DEFAULT 0,
23-
`is_disabled` INT NOT NULL DEFAULT 0
22+
`is_system` BOOLEAN NOT NULL DEFAULT FALSE,
23+
`is_disabled` BOOLEAN NOT NULL DEFAULT FALSE
2424
);
2525

2626
CREATE TABLE IF NOT EXISTS `capability`
@@ -42,7 +42,7 @@ CREATE TABLE IF NOT EXISTS `auth`
4242
`id` INT AUTO_INCREMENT PRIMARY KEY,
4343
`created_at` BIGINT NOT NULL DEFAULT 0,
4444
`updated_at` BIGINT NOT NULL DEFAULT 0,
45-
`is_deleted` INT NOT NULL DEFAULT 0,
45+
`is_deleted` INT NOT NULL DEFAULT 0, -- int on purpose, gormism
4646
`user_id` INT NOT NULL,
4747
`type` VARCHAR(50) NOT NULL,
4848
`secret` VARCHAR(255) NOT NULL,
@@ -55,7 +55,7 @@ CREATE TABLE IF NOT EXISTS `setting`
5555
`id` INT AUTO_INCREMENT PRIMARY KEY,
5656
`created_at` BIGINT NOT NULL DEFAULT 0,
5757
`updated_at` BIGINT NOT NULL DEFAULT 0,
58-
`is_deleted` INT NOT NULL DEFAULT 0,
58+
`is_deleted` INT NOT NULL DEFAULT 0, -- int on purpose, gormism
5959
`name` VARCHAR(50) NOT NULL,
6060
`description` VARCHAR(255) NOT NULL DEFAULT '',
6161
`value` TEXT NOT NULL,
@@ -67,7 +67,7 @@ CREATE TABLE IF NOT EXISTS `audit_log`
6767
`id` INT AUTO_INCREMENT PRIMARY KEY,
6868
`created_at` BIGINT NOT NULL DEFAULT 0,
6969
`updated_at` BIGINT NOT NULL DEFAULT 0,
70-
`is_deleted` INT NOT NULL DEFAULT 0,
70+
`is_deleted` INT NOT NULL DEFAULT 0, -- int on purpose, gormism
7171
`user_id` INT NOT NULL,
7272
`object_type` VARCHAR(50) NOT NULL,
7373
`object_id` INT NOT NULL,
@@ -81,21 +81,21 @@ CREATE TABLE IF NOT EXISTS `certificate_authority`
8181
`id` INT AUTO_INCREMENT PRIMARY KEY,
8282
`created_at` BIGINT NOT NULL DEFAULT 0,
8383
`updated_at` BIGINT NOT NULL DEFAULT 0,
84-
`is_deleted` INT NOT NULL DEFAULT 0,
84+
`is_deleted` INT NOT NULL DEFAULT 0, -- int on purpose, gormism
8585
`name` VARCHAR(50) NOT NULL,
8686
`acmesh_server` VARCHAR(255) NOT NULL DEFAULT '',
8787
`ca_bundle` VARCHAR(255) NOT NULL DEFAULT '',
88-
`is_wildcard_supported` INT NOT NULL DEFAULT 0, -- specific to each CA, acme v1 doesn't usually have wildcards
88+
`is_wildcard_supported` BOOLEAN NOT NULL DEFAULT FALSE, -- specific to each CA, acme v1 doesn't usually have wildcards
8989
`max_domains` INT NOT NULL DEFAULT 5, -- per request
90-
`is_readonly` INT NOT NULL DEFAULT 0
90+
`is_readonly` BOOLEAN NOT NULL DEFAULT FALSE
9191
);
9292

9393
CREATE TABLE IF NOT EXISTS `dns_provider`
9494
(
9595
`id` INT AUTO_INCREMENT PRIMARY KEY,
9696
`created_at` BIGINT NOT NULL DEFAULT 0,
9797
`updated_at` BIGINT NOT NULL DEFAULT 0,
98-
`is_deleted` INT NOT NULL DEFAULT 0,
98+
`is_deleted` INT NOT NULL DEFAULT 0, -- int on purpose, gormism
9999
`user_id` INT NOT NULL,
100100
`name` VARCHAR(50) NOT NULL,
101101
`acmesh_name` VARCHAR(50) NOT NULL,
@@ -109,7 +109,7 @@ CREATE TABLE IF NOT EXISTS certificate
109109
`id` INT AUTO_INCREMENT PRIMARY KEY,
110110
`created_at` BIGINT NOT NULL DEFAULT 0,
111111
`updated_at` BIGINT NOT NULL DEFAULT 0,
112-
`is_deleted` INT NOT NULL DEFAULT 0,
112+
`is_deleted` INT NOT NULL DEFAULT 0, -- int on purpose, gormism
113113
`user_id` INT NOT NULL,
114114
`type` VARCHAR(50) NOT NULL, -- custom,dns,http
115115
`certificate_authority_id` INT, -- 0 for a custom cert
@@ -120,7 +120,7 @@ CREATE TABLE IF NOT EXISTS certificate
120120
`status` VARCHAR(50) NOT NULL, -- ready,requesting,failed,provided
121121
`error_message` TEXT NOT NULL,
122122
`meta` TEXT NOT NULL,
123-
`is_ecc` INT NOT NULL DEFAULT 0,
123+
`is_ecc` BOOLEAN NOT NULL DEFAULT FALSE,
124124
FOREIGN KEY (`user_id`) REFERENCES `user`(`id`),
125125
FOREIGN KEY (`certificate_authority_id`) REFERENCES `certificate_authority`(`id`),
126126
FOREIGN KEY (`dns_provider_id`) REFERENCES `dns_provider`(`id`)
@@ -131,14 +131,14 @@ CREATE TABLE IF NOT EXISTS `stream`
131131
`id` INT AUTO_INCREMENT PRIMARY KEY,
132132
`created_at` BIGINT NOT NULL DEFAULT 0,
133133
`updated_at` BIGINT NOT NULL DEFAULT 0,
134-
`is_deleted` INT NOT NULL DEFAULT 0,
134+
`is_deleted` INT NOT NULL DEFAULT 0, -- int on purpose, gormism
135135
`user_id` INT NOT NULL,
136136
`listen_interface` VARCHAR(50) NOT NULL,
137137
`incoming_port` INT NOT NULL,
138138
`tcp_forwarding` INT NOT NULL DEFAULT 0,
139139
`udp_forwarding` INT NOT NULL DEFAULT 0,
140140
`advanced_config` TEXT NOT NULL,
141-
`is_disabled` INT NOT NULL DEFAULT 0,
141+
`is_disabled` BOOLEAN NOT NULL DEFAULT FALSE,
142142
FOREIGN KEY (`user_id`) REFERENCES `user`(`id`)
143143
);
144144

@@ -147,7 +147,7 @@ CREATE TABLE IF NOT EXISTS `nginx_template`
147147
`id` INT AUTO_INCREMENT PRIMARY KEY,
148148
`created_at` BIGINT NOT NULL DEFAULT 0,
149149
`updated_at` BIGINT NOT NULL DEFAULT 0,
150-
`is_deleted` INT NOT NULL DEFAULT 0,
150+
`is_deleted` INT NOT NULL DEFAULT 0, -- int on purpose, gormism
151151
`user_id` INT NOT NULL,
152152
`name` VARCHAR(50) NOT NULL,
153153
`type` VARCHAR(50) NOT NULL,
@@ -160,12 +160,12 @@ CREATE TABLE IF NOT EXISTS `upstream`
160160
`id` INT AUTO_INCREMENT PRIMARY KEY,
161161
`created_at` BIGINT NOT NULL DEFAULT 0,
162162
`updated_at` BIGINT NOT NULL DEFAULT 0,
163-
`is_deleted` INT NOT NULL DEFAULT 0,
163+
`is_deleted` INT NOT NULL DEFAULT 0, -- int on purpose, gormism
164164
`user_id` INT NOT NULL,
165165
`name` VARCHAR(50) NOT NULL,
166166
`nginx_template_id` INT NOT NULL,
167-
`ip_hash` INT NOT NULL DEFAULT 0,
168-
`ntlm` INT NOT NULL DEFAULT 0,
167+
`ip_hash` BOOLEAN NOT NULL DEFAULT FALSE,
168+
`ntlm` BOOLEAN NOT NULL DEFAULT FALSE,
169169
`keepalive` INT NOT NULL DEFAULT 0,
170170
`keepalive_requests` INT NOT NULL DEFAULT 0,
171171
`keepalive_time` VARCHAR(50) NOT NULL DEFAULT '',
@@ -182,14 +182,14 @@ CREATE TABLE IF NOT EXISTS `upstream_server`
182182
`id` INT AUTO_INCREMENT PRIMARY KEY,
183183
`created_at` BIGINT NOT NULL DEFAULT 0,
184184
`updated_at` BIGINT NOT NULL DEFAULT 0,
185-
`is_deleted` INT NOT NULL DEFAULT 0,
185+
`is_deleted` INT NOT NULL DEFAULT 0, -- int on purpose, gormism
186186
`upstream_id` INT NOT NULL,
187187
`server` VARCHAR(50) NOT NULL,
188188
`weight` INT NOT NULL DEFAULT 0,
189189
`max_conns` INT NOT NULL DEFAULT 0,
190190
`max_fails` INT NOT NULL DEFAULT 0,
191191
`fail_timeout` INT NOT NULL DEFAULT 0,
192-
`is_backup` INT NOT NULL DEFAULT 0,
192+
`is_backup` BOOLEAN NOT NULL DEFAULT FALSE,
193193
FOREIGN KEY (`upstream_id`) REFERENCES `upstream`(`id`)
194194
);
195195

@@ -198,7 +198,7 @@ CREATE TABLE IF NOT EXISTS `access_list`
198198
`id` INT AUTO_INCREMENT PRIMARY KEY,
199199
`created_at` BIGINT NOT NULL DEFAULT 0,
200200
`updated_at` BIGINT NOT NULL DEFAULT 0,
201-
`is_deleted` INT NOT NULL DEFAULT 0,
201+
`is_deleted` INT NOT NULL DEFAULT 0, -- int on purpose, gormism
202202
`user_id` INT NOT NULL,
203203
`name` VARCHAR(50) NOT NULL,
204204
`meta` TEXT NOT NULL,
@@ -210,7 +210,7 @@ CREATE TABLE IF NOT EXISTS host
210210
`id` INT AUTO_INCREMENT PRIMARY KEY,
211211
`created_at` BIGINT NOT NULL DEFAULT 0,
212212
`updated_at` BIGINT NOT NULL DEFAULT 0,
213-
`is_deleted` INT NOT NULL DEFAULT 0,
213+
`is_deleted` INT NOT NULL DEFAULT 0, -- int on purpose, gormism
214214
`user_id` INT NOT NULL,
215215
`type` VARCHAR(50) NOT NULL,
216216
`nginx_template_id` INT NOT NULL,
@@ -222,18 +222,18 @@ CREATE TABLE IF NOT EXISTS host
222222
`proxy_port` INT NOT NULL DEFAULT 0,
223223
`certificate_id` INT NOT NULL DEFAULT 0,
224224
`access_list_id` INT NOT NULL DEFAULT 0,
225-
`ssl_forced` INT NOT NULL DEFAULT 0,
226-
`caching_enabled` INT NOT NULL DEFAULT 0,
227-
`block_exploits` INT NOT NULL DEFAULT 0,
228-
`allow_websocket_upgrade` INT NOT NULL DEFAULT 0,
229-
`http2_support` INT NOT NULL DEFAULT 0,
230-
`hsts_enabled` INT NOT NULL DEFAULT 0,
231-
`hsts_subdomains` INT NOT NULL DEFAULT 0,
225+
`ssl_forced` BOOLEAN NOT NULL DEFAULT FALSE,
226+
`caching_enabled` BOOLEAN NOT NULL DEFAULT FALSE,
227+
`block_exploits` BOOLEAN NOT NULL DEFAULT FALSE,
228+
`allow_websocket_upgrade` BOOLEAN NOT NULL DEFAULT FALSE,
229+
`http2_support` BOOLEAN NOT NULL DEFAULT FALSE,
230+
`hsts_enabled` BOOLEAN NOT NULL DEFAULT FALSE,
231+
`hsts_subdomains` BOOLEAN NOT NULL DEFAULT FALSE,
232232
`paths` TEXT NOT NULL,
233233
`advanced_config` TEXT NOT NULL,
234234
`status` VARCHAR(50) NOT NULL DEFAULT '',
235235
`error_message` TEXT NOT NULL,
236-
`is_disabled` INT NOT NULL DEFAULT 0,
236+
`is_disabled` BOOLEAN NOT NULL DEFAULT FALSE,
237237
FOREIGN KEY (`user_id`) REFERENCES `user`(`id`),
238238
FOREIGN KEY (`nginx_template_id`) REFERENCES `nginx_template`(`id`),
239239
FOREIGN KEY (`upstream_id`) REFERENCES `upstream`(`id`),

0 commit comments

Comments
 (0)