Skip to content

Commit 5550a2b

Browse files
gmaclennangmaclennan
committed
Merge branch 'main' into feat/new-comapeocat-format
* main: fix: NO_ROLE should not sync config core (#1143) fix: Don't use getAddress in start/stop of local-discovery (#1136) chore: update drizzle to v1-beta.1 (#1140)
2 parents 1337426 + 3b0e4d5 commit 5550a2b

17 files changed

Lines changed: 1738 additions & 863 deletions

‎drizzle/client/meta/0000_snapshot.json‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
{
2-
"version": "5",
2+
"version": "6",
33
"dialect": "sqlite",
4-
"id": "e75103ab-bbcb-4ca9-a0c4-2d9095b63add",
5-
"prevId": "00000000-0000-0000-0000-000000000000",
64
"tables": {
75
"localDeviceInfo": {
86
"name": "localDeviceInfo",
@@ -33,7 +31,8 @@
3331
},
3432
"foreignKeys": {},
3533
"compositePrimaryKeys": {},
36-
"uniqueConstraints": {}
34+
"uniqueConstraints": {},
35+
"checkConstraints": {}
3736
},
3837
"projectSettings_backlink": {
3938
"name": "projectSettings_backlink",
@@ -49,7 +48,8 @@
4948
"indexes": {},
5049
"foreignKeys": {},
5150
"compositePrimaryKeys": {},
52-
"uniqueConstraints": {}
51+
"uniqueConstraints": {},
52+
"checkConstraints": {}
5353
},
5454
"projectKeys": {
5555
"name": "projectKeys",
@@ -94,7 +94,8 @@
9494
"indexes": {},
9595
"foreignKeys": {},
9696
"compositePrimaryKeys": {},
97-
"uniqueConstraints": {}
97+
"uniqueConstraints": {},
98+
"checkConstraints": {}
9899
},
99100
"projectSettings": {
100101
"name": "projectSettings",
@@ -187,13 +188,16 @@
187188
"indexes": {},
188189
"foreignKeys": {},
189190
"compositePrimaryKeys": {},
190-
"uniqueConstraints": {}
191+
"uniqueConstraints": {},
192+
"checkConstraints": {}
191193
}
192194
},
193195
"enums": {},
194196
"_meta": {
195-
"schemas": {},
196197
"tables": {},
197198
"columns": {}
198-
}
199+
},
200+
"id": "e75103ab-bbcb-4ca9-a0c4-2d9095b63add",
201+
"prevId": "00000000-0000-0000-0000-000000000000",
202+
"views": {}
199203
}

‎drizzle/client/meta/0001_snapshot.json‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
{
2-
"version": "5",
2+
"version": "6",
33
"dialect": "sqlite",
4-
"id": "a80440f2-1097-40a6-ab81-3295f0a8c5c1",
5-
"prevId": "e75103ab-bbcb-4ca9-a0c4-2d9095b63add",
64
"tables": {
75
"deviceSettings": {
86
"name": "deviceSettings",
@@ -40,7 +38,8 @@
4038
},
4139
"foreignKeys": {},
4240
"compositePrimaryKeys": {},
43-
"uniqueConstraints": {}
41+
"uniqueConstraints": {},
42+
"checkConstraints": {}
4443
},
4544
"projectSettings_backlink": {
4645
"name": "projectSettings_backlink",
@@ -56,7 +55,8 @@
5655
"indexes": {},
5756
"foreignKeys": {},
5857
"compositePrimaryKeys": {},
59-
"uniqueConstraints": {}
58+
"uniqueConstraints": {},
59+
"checkConstraints": {}
6060
},
6161
"projectKeys": {
6262
"name": "projectKeys",
@@ -101,7 +101,8 @@
101101
"indexes": {},
102102
"foreignKeys": {},
103103
"compositePrimaryKeys": {},
104-
"uniqueConstraints": {}
104+
"uniqueConstraints": {},
105+
"checkConstraints": {}
105106
},
106107
"projectSettings": {
107108
"name": "projectSettings",
@@ -194,15 +195,18 @@
194195
"indexes": {},
195196
"foreignKeys": {},
196197
"compositePrimaryKeys": {},
197-
"uniqueConstraints": {}
198+
"uniqueConstraints": {},
199+
"checkConstraints": {}
198200
}
199201
},
200202
"enums": {},
201203
"_meta": {
202-
"schemas": {},
203204
"tables": {
204205
"\"localDeviceInfo\"": "\"deviceSettings\""
205206
},
206207
"columns": {}
207-
}
208+
},
209+
"id": "a80440f2-1097-40a6-ab81-3295f0a8c5c1",
210+
"prevId": "e75103ab-bbcb-4ca9-a0c4-2d9095b63add",
211+
"views": {}
208212
}

‎drizzle/client/meta/0002_snapshot.json‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
{
2-
"version": "5",
2+
"version": "6",
33
"dialect": "sqlite",
4-
"id": "facbbc92-fe5b-4ce0-9bcd-189143af55f9",
5-
"prevId": "a80440f2-1097-40a6-ab81-3295f0a8c5c1",
64
"tables": {
75
"deviceSettings": {
86
"name": "deviceSettings",
@@ -40,7 +38,8 @@
4038
},
4139
"foreignKeys": {},
4240
"compositePrimaryKeys": {},
43-
"uniqueConstraints": {}
41+
"uniqueConstraints": {},
42+
"checkConstraints": {}
4443
},
4544
"projectSettings_backlink": {
4645
"name": "projectSettings_backlink",
@@ -56,7 +55,8 @@
5655
"indexes": {},
5756
"foreignKeys": {},
5857
"compositePrimaryKeys": {},
59-
"uniqueConstraints": {}
58+
"uniqueConstraints": {},
59+
"checkConstraints": {}
6060
},
6161
"projectKeys": {
6262
"name": "projectKeys",
@@ -101,7 +101,8 @@
101101
"indexes": {},
102102
"foreignKeys": {},
103103
"compositePrimaryKeys": {},
104-
"uniqueConstraints": {}
104+
"uniqueConstraints": {},
105+
"checkConstraints": {}
105106
},
106107
"projectSettings": {
107108
"name": "projectSettings",
@@ -208,13 +209,16 @@
208209
"indexes": {},
209210
"foreignKeys": {},
210211
"compositePrimaryKeys": {},
211-
"uniqueConstraints": {}
212+
"uniqueConstraints": {},
213+
"checkConstraints": {}
212214
}
213215
},
214216
"enums": {},
215217
"_meta": {
216-
"schemas": {},
217218
"tables": {},
218219
"columns": {}
219-
}
220+
},
221+
"id": "facbbc92-fe5b-4ce0-9bcd-189143af55f9",
222+
"prevId": "a80440f2-1097-40a6-ab81-3295f0a8c5c1",
223+
"views": {}
220224
}

‎drizzle/client/meta/0003_snapshot.json‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
{
2-
"version": "5",
2+
"version": "6",
33
"dialect": "sqlite",
4-
"id": "3b7b9e2d-3a35-47e3-977e-b5dcbe2fd302",
5-
"prevId": "facbbc92-fe5b-4ce0-9bcd-189143af55f9",
64
"tables": {
75
"deviceSettings": {
86
"name": "deviceSettings",
@@ -40,7 +38,8 @@
4038
},
4139
"foreignKeys": {},
4240
"compositePrimaryKeys": {},
43-
"uniqueConstraints": {}
41+
"uniqueConstraints": {},
42+
"checkConstraints": {}
4443
},
4544
"projectSettings_backlink": {
4645
"name": "projectSettings_backlink",
@@ -56,7 +55,8 @@
5655
"indexes": {},
5756
"foreignKeys": {},
5857
"compositePrimaryKeys": {},
59-
"uniqueConstraints": {}
58+
"uniqueConstraints": {},
59+
"checkConstraints": {}
6060
},
6161
"projectKeys": {
6262
"name": "projectKeys",
@@ -101,7 +101,8 @@
101101
"indexes": {},
102102
"foreignKeys": {},
103103
"compositePrimaryKeys": {},
104-
"uniqueConstraints": {}
104+
"uniqueConstraints": {},
105+
"checkConstraints": {}
105106
},
106107
"projectSettings": {
107108
"name": "projectSettings",
@@ -215,13 +216,16 @@
215216
"indexes": {},
216217
"foreignKeys": {},
217218
"compositePrimaryKeys": {},
218-
"uniqueConstraints": {}
219+
"uniqueConstraints": {},
220+
"checkConstraints": {}
219221
}
220222
},
221223
"enums": {},
222224
"_meta": {
223-
"schemas": {},
224225
"tables": {},
225226
"columns": {}
226-
}
227+
},
228+
"id": "3b7b9e2d-3a35-47e3-977e-b5dcbe2fd302",
229+
"prevId": "facbbc92-fe5b-4ce0-9bcd-189143af55f9",
230+
"views": {}
227231
}

‎drizzle/client/meta/0004_snapshot.json‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
{
2-
"version": "5",
2+
"version": "6",
33
"dialect": "sqlite",
4-
"id": "2dec4710-70ac-4857-b889-2bc3586695ee",
5-
"prevId": "3b7b9e2d-3a35-47e3-977e-b5dcbe2fd302",
64
"tables": {
75
"deviceSettings": {
86
"name": "deviceSettings",
@@ -40,7 +38,8 @@
4038
},
4139
"foreignKeys": {},
4240
"compositePrimaryKeys": {},
43-
"uniqueConstraints": {}
41+
"uniqueConstraints": {},
42+
"checkConstraints": {}
4443
},
4544
"projectSettings_backlink": {
4645
"name": "projectSettings_backlink",
@@ -56,7 +55,8 @@
5655
"indexes": {},
5756
"foreignKeys": {},
5857
"compositePrimaryKeys": {},
59-
"uniqueConstraints": {}
58+
"uniqueConstraints": {},
59+
"checkConstraints": {}
6060
},
6161
"projectKeys": {
6262
"name": "projectKeys",
@@ -109,7 +109,8 @@
109109
"indexes": {},
110110
"foreignKeys": {},
111111
"compositePrimaryKeys": {},
112-
"uniqueConstraints": {}
112+
"uniqueConstraints": {},
113+
"checkConstraints": {}
113114
},
114115
"projectSettings": {
115116
"name": "projectSettings",
@@ -223,13 +224,16 @@
223224
"indexes": {},
224225
"foreignKeys": {},
225226
"compositePrimaryKeys": {},
226-
"uniqueConstraints": {}
227+
"uniqueConstraints": {},
228+
"checkConstraints": {}
227229
}
228230
},
229231
"enums": {},
230232
"_meta": {
231-
"schemas": {},
232233
"tables": {},
233234
"columns": {}
234-
}
235+
},
236+
"id": "2dec4710-70ac-4857-b889-2bc3586695ee",
237+
"prevId": "3b7b9e2d-3a35-47e3-977e-b5dcbe2fd302",
238+
"views": {}
235239
}

0 commit comments

Comments
 (0)