Maurits van der Schee 4 years ago
parent
commit
e1906844a2

+ 6
- 4
tests/fixtures/blog_mysql.sql View File

@@ -167,14 +167,16 @@ CREATE TABLE `kunsthåndværk` (
167 167
   `Umlauts ä_ö_ü-COUNT` int(11) NOT NULL,
168 168
   `user_id` int(11) NOT NULL,
169 169
   `invisible` varchar(36),
170
+  `invisible_id` varchar(36),
170 171
   PRIMARY KEY (`id`),
171 172
   CONSTRAINT `kunsthåndværk_Umlauts ä_ö_ü-COUNT_fkey` UNIQUE (`Umlauts ä_ö_ü-COUNT`),
172
-  CONSTRAINT `kunsthåndværk_user_id_fkey` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`)
173
+  CONSTRAINT `kunsthåndværk_user_id_fkey` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`),
174
+  CONSTRAINT `kunsthåndværk_invisible_id_fkey` FOREIGN KEY (`invisible_id`) REFERENCES `invisibles` (`id`)
173 175
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
174 176
 
175
-INSERT INTO `kunsthåndværk` (`id`, `Umlauts ä_ö_ü-COUNT`, `user_id`, `invisible`) VALUES
176
-('e42c77c6-06a4-4502-816c-d112c7142e6d', 1, 1, NULL),
177
-('e31ecfe6-591f-4660-9fbd-1a232083037f', 2, 2, NULL);
177
+INSERT INTO `kunsthåndværk` (`id`, `Umlauts ä_ö_ü-COUNT`, `user_id`, `invisible`, `invisible_id`) VALUES
178
+('e42c77c6-06a4-4502-816c-d112c7142e6d', 1, 1, NULL, 'e42c77c6-06a4-4502-816c-d112c7142e6d'),
179
+('e31ecfe6-591f-4660-9fbd-1a232083037f', 2, 2, NULL, 'e42c77c6-06a4-4502-816c-d112c7142e6d');
178 180
 
179 181
 DROP TABLE IF EXISTS `invisibles`;
180 182
 CREATE TABLE `invisibles` (

+ 20
- 4
tests/fixtures/blog_pgsql.sql View File

@@ -162,7 +162,8 @@ CREATE TABLE "kunsthåndværk" (
162 162
   id character varying(36) NOT NULL,
163 163
   "Umlauts ä_ö_ü-COUNT" integer NOT NULL,
164 164
   user_id integer NOT NULL,
165
-  invisible character varying(36)
165
+  invisible character varying(36),
166
+  invisible_id character varying(36)
166 167
 );
167 168
 
168 169
 --
@@ -276,9 +277,9 @@ INSERT INTO "barcodes" ("product_id", "hex", "bin", "ip_address") VALUES
276 277
 -- Data for Name: kunsthåndværk; Type: TABLE DATA; Schema: public; Owner: postgres
277 278
 --
278 279
 
279
-INSERT INTO "kunsthåndværk" ("id", "Umlauts ä_ö_ü-COUNT", "user_id", "invisible") VALUES
280
-('e42c77c6-06a4-4502-816c-d112c7142e6d', 1, 1, NULL),
281
-('e31ecfe6-591f-4660-9fbd-1a232083037f', 2, 2, NULL);
280
+INSERT INTO "kunsthåndværk" ("id", "Umlauts ä_ö_ü-COUNT", "user_id", "invisible", "invisible_id") VALUES
281
+('e42c77c6-06a4-4502-816c-d112c7142e6d', 1, 1, NULL, 'e42c77c6-06a4-4502-816c-d112c7142e6d'),
282
+('e31ecfe6-591f-4660-9fbd-1a232083037f', 2, 2, NULL, 'e42c77c6-06a4-4502-816c-d112c7142e6d');
282 283
 
283 284
 --
284 285
 -- Data for Name: invisibles; Type: TABLE DATA; Schema: public; Owner: postgres
@@ -456,6 +457,13 @@ CREATE INDEX "kunsthåndværk_Umlauts ä_ö_ü-COUNT_idx" ON "kunsthåndværk" U
456 457
 CREATE INDEX "kunsthåndværk_user_id_idx" ON "kunsthåndværk" USING btree (user_id);
457 458
 
458 459
 
460
+--
461
+-- Name: kunsthåndværk_invisible_id_idx; Type: INDEX; Schema: public; Owner: postgres; Tablespace:
462
+--
463
+
464
+CREATE INDEX "kunsthåndværk_invisible_id_idx" ON "kunsthåndværk" USING btree (invisible_id);
465
+
466
+
459 467
 --
460 468
 -- Name: comments_post_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: postgres
461 469
 --
@@ -519,6 +527,7 @@ ALTER TABLE ONLY barcodes
519 527
 ALTER TABLE ONLY "kunsthåndværk"
520 528
     ADD CONSTRAINT "kunsthåndværk_Umlauts ä_ö_ü-COUNT_uc" UNIQUE ("Umlauts ä_ö_ü-COUNT");
521 529
 
530
+
522 531
 --
523 532
 -- Name: kunsthåndværk_user_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: postgres
524 533
 --
@@ -527,6 +536,13 @@ ALTER TABLE ONLY "kunsthåndværk"
527 536
     ADD CONSTRAINT "kunsthåndværk_user_id_fkey" FOREIGN KEY (user_id) REFERENCES users(id);
528 537
 
529 538
 
539
+--
540
+-- Name: kunsthåndværk_invisible_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: postgres
541
+--
542
+
543
+ALTER TABLE ONLY "kunsthåndværk"
544
+    ADD CONSTRAINT "kunsthåndværk_invisible_id_fkey" FOREIGN KEY (invisible_id) REFERENCES invisibles(id);
545
+
530 546
 --
531 547
 -- PostgreSQL database dump complete
532 548
 --

+ 5
- 3
tests/fixtures/blog_sqlite.sql View File

@@ -148,11 +148,13 @@ CREATE TABLE "kunsthåndværk" (
148 148
   "Umlauts ä_ö_ü-COUNT" integer NOT NULL UNIQUE,
149 149
   "user_id" integer NOT NULL,
150 150
   "invisible" varchar(36),
151
-  FOREIGN KEY ("user_id") REFERENCES "users" ("id") ON DELETE RESTRICT ON UPDATE RESTRICT
151
+  "invisible_id" varchar(36),
152
+  FOREIGN KEY ("user_id") REFERENCES "users" ("id") ON DELETE RESTRICT ON UPDATE RESTRICT,
153
+  FOREIGN KEY ("invisible_id") REFERENCES "invisibles" ("id") ON DELETE RESTRICT ON UPDATE RESTRICT
152 154
 );
153 155
 
154
-INSERT INTO "kunsthåndværk" ("id", "Umlauts ä_ö_ü-COUNT", "user_id", "invisible") VALUES ('e42c77c6-06a4-4502-816c-d112c7142e6d', 1, 1, NULL);
155
-INSERT INTO "kunsthåndværk" ("id", "Umlauts ä_ö_ü-COUNT", "user_id", "invisible") VALUES ('e31ecfe6-591f-4660-9fbd-1a232083037f', 2, 2, NULL);
156
+INSERT INTO "kunsthåndværk" ("id", "Umlauts ä_ö_ü-COUNT", "user_id", "invisible", "invisible_id") VALUES ('e42c77c6-06a4-4502-816c-d112c7142e6d', 1, 1, NULL, 'e42c77c6-06a4-4502-816c-d112c7142e6d');
157
+INSERT INTO "kunsthåndværk" ("id", "Umlauts ä_ö_ü-COUNT", "user_id", "invisible", "invisible_id") VALUES ('e31ecfe6-591f-4660-9fbd-1a232083037f', 2, 2, NULL, 'e42c77c6-06a4-4502-816c-d112c7142e6d');
156 158
 
157 159
 DROP TABLE IF EXISTS "invisibles";
158 160
 CREATE TABLE "invisibles" (

+ 9
- 2
tests/fixtures/blog_sqlsrv.sql View File

@@ -285,6 +285,7 @@ CREATE TABLE [kunsthåndværk](
285 285
 	[Umlauts ä_ö_ü-COUNT] [int] NOT NULL,
286 286
 	[user_id] [int] NOT NULL,
287 287
 	[invisible] [nvarchar](36),
288
+	[invisible_id] [nvarchar](36),
288 289
 	CONSTRAINT [kunsthåndværk_pkey] PRIMARY KEY CLUSTERED([id] ASC)
289 290
 )
290 291
 GO
@@ -372,9 +373,9 @@ GO
372 373
 INSERT [barcodes] ([product_id], [hex], [bin], [ip_address]) VALUES (1, N'00ff01', 0x00ff01, N'127.0.0.1')
373 374
 GO
374 375
 
375
-INSERT [kunsthåndværk] ([id], [Umlauts ä_ö_ü-COUNT], [user_id], [invisible]) VALUES ('e42c77c6-06a4-4502-816c-d112c7142e6d', 1, 1, NULL)
376
+INSERT [kunsthåndværk] ([id], [Umlauts ä_ö_ü-COUNT], [user_id], [invisible], [invisible_id]) VALUES ('e42c77c6-06a4-4502-816c-d112c7142e6d', 1, 1, NULL, 'e42c77c6-06a4-4502-816c-d112c7142e6d')
376 377
 GO
377
-INSERT [kunsthåndværk] ([id], [Umlauts ä_ö_ü-COUNT], [user_id], [invisible]) VALUES ('e31ecfe6-591f-4660-9fbd-1a232083037f', 2, 2, NULL)
378
+INSERT [kunsthåndværk] ([id], [Umlauts ä_ö_ü-COUNT], [user_id], [invisible], [invisible_id]) VALUES ('e31ecfe6-591f-4660-9fbd-1a232083037f', 2, 2, NULL, 'e42c77c6-06a4-4502-816c-d112c7142e6d')
378 379
 GO
379 380
 
380 381
 INSERT [invisibles] ([id]) VALUES ('e42c77c6-06a4-4502-816c-d112c7142e6d')
@@ -433,3 +434,9 @@ REFERENCES [users] ([id])
433 434
 GO
434 435
 ALTER TABLE [kunsthåndværk] CHECK	CONSTRAINT [kunsthåndværk_user_id_fkey]
435 436
 GO
437
+
438
+ALTER TABLE [kunsthåndværk]  WITH CHECK ADD 	CONSTRAINT [kunsthåndværk_invisible_id_fkey] FOREIGN KEY([invisible_id])
439
+REFERENCES [invisibles] ([id])
440
+GO
441
+ALTER TABLE [kunsthåndværk] CHECK	CONSTRAINT [kunsthåndværk_invisible_id_fkey]
442
+GO

+ 10
- 2
tests/functional/001_records/062_read_kunsthandvaerk.log View File

@@ -2,6 +2,14 @@ GET /records/kunsthåndværk/e42c77c6-06a4-4502-816c-d112c7142e6d
2 2
 ===
3 3
 200
4 4
 Content-Type: application/json
5
-Content-Length: 84
5
+Content-Length: 138
6 6
 
7
-{"id":"e42c77c6-06a4-4502-816c-d112c7142e6d","Umlauts ä_ö_ü-COUNT":1,"user_id":1}
7
+{"id":"e42c77c6-06a4-4502-816c-d112c7142e6d","Umlauts ä_ö_ü-COUNT":1,"user_id":1,"invisible_id":"e42c77c6-06a4-4502-816c-d112c7142e6d"}
8
+===
9
+GET /records/kunsthåndværk/e42c77c6-06a4-4502-816c-d112c7142e6d?join=invisibles
10
+===
11
+200
12
+Content-Type: application/json
13
+Content-Length: 138
14
+
15
+{"id":"e42c77c6-06a4-4502-816c-d112c7142e6d","Umlauts ä_ö_ü-COUNT":1,"user_id":1,"invisible_id":"e42c77c6-06a4-4502-816c-d112c7142e6d"}

+ 2
- 2
tests/functional/001_records/063_list_kunsthandvaerk.log View File

@@ -2,6 +2,6 @@ GET /records/kunsthåndværk
2 2
 ===
3 3
 200
4 4
 Content-Type: application/json
5
-Content-Length: 98
5
+Content-Length: 152
6 6
 
7
-{"records":[{"id":"e42c77c6-06a4-4502-816c-d112c7142e6d","Umlauts ä_ö_ü-COUNT":1,"user_id":1}]}
7
+{"records":[{"id":"e42c77c6-06a4-4502-816c-d112c7142e6d","Umlauts ä_ö_ü-COUNT":1,"user_id":1,"invisible_id":"e42c77c6-06a4-4502-816c-d112c7142e6d"}]}

+ 4
- 4
tests/functional/001_records/073_multi_tenancy_kunsthandvaerk.log View File

@@ -12,9 +12,9 @@ GET /records/kunsthåndværk/b55decba-8eb5-436b-af3e-148f7b4eacda
12 12
 ===
13 13
 200
14 14
 Content-Type: application/json
15
-Content-Length: 84
15
+Content-Length: 104
16 16
 
17
-{"id":"b55decba-8eb5-436b-af3e-148f7b4eacda","Umlauts ä_ö_ü-COUNT":4,"user_id":1}
17
+{"id":"b55decba-8eb5-436b-af3e-148f7b4eacda","Umlauts ä_ö_ü-COUNT":4,"user_id":1,"invisible_id":null}
18 18
 ===
19 19
 PUT /records/kunsthåndværk/b55decba-8eb5-436b-af3e-148f7b4eacda
20 20
 
@@ -30,9 +30,9 @@ GET /records/kunsthåndværk/b55decba-8eb5-436b-af3e-148f7b4eacda
30 30
 ===
31 31
 200
32 32
 Content-Type: application/json
33
-Content-Length: 84
33
+Content-Length: 104
34 34
 
35
-{"id":"b55decba-8eb5-436b-af3e-148f7b4eacda","Umlauts ä_ö_ü-COUNT":4,"user_id":1}
35
+{"id":"b55decba-8eb5-436b-af3e-148f7b4eacda","Umlauts ä_ö_ü-COUNT":4,"user_id":1,"invisible_id":null}
36 36
 ===
37 37
 DELETE /records/kunsthåndværk/e31ecfe6-591f-4660-9fbd-1a232083037f
38 38
 ===

+ 4
- 4
tests/functional/001_records/085_update_invisble_column_kunsthandvaerk copy.log View File

@@ -12,9 +12,9 @@ GET /records/kunsthåndværk/b55decba-8eb5-436b-af3e-148f7b4eacda
12 12
 ===
13 13
 200
14 14
 Content-Type: application/json
15
-Content-Length: 84
15
+Content-Length: 104
16 16
 
17
-{"id":"b55decba-8eb5-436b-af3e-148f7b4eacda","Umlauts ä_ö_ü-COUNT":4,"user_id":1}
17
+{"id":"b55decba-8eb5-436b-af3e-148f7b4eacda","Umlauts ä_ö_ü-COUNT":4,"user_id":1,"invisible_id":null}
18 18
 ===
19 19
 PUT /records/kunsthåndværk/b55decba-8eb5-436b-af3e-148f7b4eacda
20 20
 
@@ -30,9 +30,9 @@ GET /records/kunsthåndværk/b55decba-8eb5-436b-af3e-148f7b4eacda
30 30
 ===
31 31
 200
32 32
 Content-Type: application/json
33
-Content-Length: 84
33
+Content-Length: 104
34 34
 
35
-{"id":"b55decba-8eb5-436b-af3e-148f7b4eacda","Umlauts ä_ö_ü-COUNT":3,"user_id":1}
35
+{"id":"b55decba-8eb5-436b-af3e-148f7b4eacda","Umlauts ä_ö_ü-COUNT":3,"user_id":1,"invisible_id":null}
36 36
 ===
37 37
 DELETE /records/kunsthåndværk/b55decba-8eb5-436b-af3e-148f7b4eacda
38 38
 ===

+ 2
- 2
tests/functional/003_columns/001_get_database_with_geometry_fields.log View File

@@ -2,6 +2,6 @@ GET /columns
2 2
 ===
3 3
 200
4 4
 Content-Type: application/json
5
-Content-Length: 2712
5
+Content-Length: 2799
6 6
 
7
-{"tables":[{"name":"barcodes","type":"table","columns":[{"name":"id","type":"integer","pk":true},{"name":"product_id","type":"integer","fk":"products"},{"name":"hex","type":"varchar","length":255},{"name":"bin","type":"blob"},{"name":"ip_address","type":"varchar","length":15,"nullable":true}]},{"name":"categories","type":"table","columns":[{"name":"id","type":"integer","pk":true},{"name":"name","type":"varchar","length":255},{"name":"icon","type":"blob","nullable":true}]},{"name":"comments","type":"table","columns":[{"name":"id","type":"bigint","pk":true},{"name":"post_id","type":"integer","fk":"posts"},{"name":"message","type":"varchar","length":255},{"name":"category_id","type":"integer","fk":"categories"}]},{"name":"countries","type":"table","columns":[{"name":"id","type":"integer","pk":true},{"name":"name","type":"varchar","length":255},{"name":"shape","type":"geometry"}]},{"name":"events","type":"table","columns":[{"name":"id","type":"integer","pk":true},{"name":"name","type":"varchar","length":255},{"name":"datetime","type":"timestamp","nullable":true},{"name":"visitors","type":"bigint","nullable":true}]},{"name":"kunsthåndværk","type":"table","columns":[{"name":"id","type":"varchar","length":36,"pk":true},{"name":"Umlauts ä_ö_ü-COUNT","type":"integer"},{"name":"user_id","type":"integer","fk":"users"}]},{"name":"nopk","type":"table","columns":[{"name":"id","type":"varchar","length":36}]},{"name":"post_tags","type":"table","columns":[{"name":"id","type":"integer","pk":true},{"name":"post_id","type":"integer","fk":"posts"},{"name":"tag_id","type":"integer","fk":"tags"}]},{"name":"posts","type":"table","columns":[{"name":"id","type":"integer","pk":true},{"name":"user_id","type":"integer","fk":"users"},{"name":"category_id","type":"integer","fk":"categories"},{"name":"content","type":"varchar","length":255}]},{"name":"products","type":"table","columns":[{"name":"id","type":"integer","pk":true},{"name":"name","type":"varchar","length":255},{"name":"price","type":"decimal","precision":10,"scale":2},{"name":"properties","type":"clob"},{"name":"created_at","type":"timestamp"},{"name":"deleted_at","type":"timestamp","nullable":true}]},{"name":"tag_usage","type":"view","columns":[{"name":"name","type":"varchar","length":255},{"name":"count","type":"bigint"}]},{"name":"tags","type":"table","columns":[{"name":"id","type":"integer","pk":true},{"name":"name","type":"varchar","length":255},{"name":"is_important","type":"boolean"}]},{"name":"users","type":"table","columns":[{"name":"id","type":"integer","pk":true},{"name":"username","type":"varchar","length":255},{"name":"password","type":"varchar","length":255},{"name":"location","type":"geometry","nullable":true}]}]}
7
+{"tables":[{"name":"barcodes","type":"table","columns":[{"name":"id","type":"integer","pk":true},{"name":"product_id","type":"integer","fk":"products"},{"name":"hex","type":"varchar","length":255},{"name":"bin","type":"blob"},{"name":"ip_address","type":"varchar","length":15,"nullable":true}]},{"name":"categories","type":"table","columns":[{"name":"id","type":"integer","pk":true},{"name":"name","type":"varchar","length":255},{"name":"icon","type":"blob","nullable":true}]},{"name":"comments","type":"table","columns":[{"name":"id","type":"bigint","pk":true},{"name":"post_id","type":"integer","fk":"posts"},{"name":"message","type":"varchar","length":255},{"name":"category_id","type":"integer","fk":"categories"}]},{"name":"countries","type":"table","columns":[{"name":"id","type":"integer","pk":true},{"name":"name","type":"varchar","length":255},{"name":"shape","type":"geometry"}]},{"name":"events","type":"table","columns":[{"name":"id","type":"integer","pk":true},{"name":"name","type":"varchar","length":255},{"name":"datetime","type":"timestamp","nullable":true},{"name":"visitors","type":"bigint","nullable":true}]},{"name":"kunsthåndværk","type":"table","columns":[{"name":"id","type":"varchar","length":36,"pk":true},{"name":"Umlauts ä_ö_ü-COUNT","type":"integer"},{"name":"user_id","type":"integer","fk":"users"},{"name":"invisible_id","type":"varchar","length":36,"nullable":true,"fk":"invisibles"}]},{"name":"nopk","type":"table","columns":[{"name":"id","type":"varchar","length":36}]},{"name":"post_tags","type":"table","columns":[{"name":"id","type":"integer","pk":true},{"name":"post_id","type":"integer","fk":"posts"},{"name":"tag_id","type":"integer","fk":"tags"}]},{"name":"posts","type":"table","columns":[{"name":"id","type":"integer","pk":true},{"name":"user_id","type":"integer","fk":"users"},{"name":"category_id","type":"integer","fk":"categories"},{"name":"content","type":"varchar","length":255}]},{"name":"products","type":"table","columns":[{"name":"id","type":"integer","pk":true},{"name":"name","type":"varchar","length":255},{"name":"price","type":"decimal","precision":10,"scale":2},{"name":"properties","type":"clob"},{"name":"created_at","type":"timestamp"},{"name":"deleted_at","type":"timestamp","nullable":true}]},{"name":"tag_usage","type":"view","columns":[{"name":"name","type":"varchar","length":255},{"name":"count","type":"bigint"}]},{"name":"tags","type":"table","columns":[{"name":"id","type":"integer","pk":true},{"name":"name","type":"varchar","length":255},{"name":"is_important","type":"boolean"}]},{"name":"users","type":"table","columns":[{"name":"id","type":"integer","pk":true},{"name":"username","type":"varchar","length":255},{"name":"password","type":"varchar","length":255},{"name":"location","type":"geometry","nullable":true}]}]}

Loading…
Cancel
Save