better fix for #513

mevdschee · mevdschee · commit 1e2a7628e3f1 · 2019-03-15T22:36:59.000+01:00
diff --git a/tests/fixtures/blog_mysql.sql b/tests/fixtures/blog_mysql.sql
@@ -15,23 +15,26 @@ CREATE TABLE `categories` (
 
 INSERT INTO `categories` (`name`, `icon`) VALUES
 ('announcement',	NULL),
-('article',	NULL);
+('article',	NULL),
+('comment',	NULL);
 
 DROP TABLE IF EXISTS `comments`;
 CREATE TABLE `comments` (
   `id` bigint(20) NOT NULL AUTO_INCREMENT,
   `post_id` int(11) NOT NULL,
   `message` varchar(255) NOT NULL,
+  `category_id` int(11) NOT NULL,
   PRIMARY KEY (`id`),
   KEY `post_id` (`post_id`),
-  CONSTRAINT `comments_post_id_fkey` FOREIGN KEY (`post_id`) REFERENCES `posts` (`id`)
+  CONSTRAINT `comments_post_id_fkey` FOREIGN KEY (`post_id`) REFERENCES `posts` (`id`),
+  CONSTRAINT `comments_category_id_fkey` FOREIGN KEY (`category_id`) REFERENCES `categories` (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
 
-INSERT INTO `comments` (`post_id`, `message`) VALUES
-(1,	'great'),
-(1,	'fantastic'),
-(2,	'thank you'),
-(2,	'awesome');
+INSERT INTO `comments` (`post_id`, `message`, `category_id`) VALUES
+(1,	'great', 3),
+(1,	'fantastic', 3),
+(2,	'thank you', 3),
+(2,	'awesome', 3);
 
 DROP TABLE IF EXISTS `posts`;
 CREATE TABLE `posts` (
diff --git a/tests/fixtures/blog_pgsql.sql b/tests/fixtures/blog_pgsql.sql
@@ -52,7 +52,8 @@ CREATE TABLE categories (
 CREATE TABLE comments (
     id bigserial NOT NULL,
     post_id integer NOT NULL,
-    message character varying(255) NOT NULL
+    message character varying(255) NOT NULL,
+    category_id integer NOT NULL    
 );
 
 
@@ -185,17 +186,18 @@ CREATE TABLE "nopk" (
 
 INSERT INTO "categories" ("name", "icon") VALUES
 ('announcement',	NULL),
-('article',	NULL);
+('article',	NULL),
+('comment',	NULL);
 
 --
 -- Data for Name: comments; Type: TABLE DATA; Schema: public; Owner: postgres
 --
 
-INSERT INTO "comments" ("post_id", "message") VALUES
-(1,	'great'),
-(1,	'fantastic'),
-(2,	'thank you'),
-(2,	'awesome');
+INSERT INTO "comments" ("post_id", "message", "category_id") VALUES
+(1,	'great', 3),
+(1,	'fantastic', 3),
+(2,	'thank you', 3),
+(2,	'awesome', 3);
 
 --
 -- Data for Name: post_tags; Type: TABLE DATA; Schema: public; Owner: postgres
@@ -388,6 +390,12 @@ ALTER TABLE ONLY "invisibles"
 
 CREATE INDEX comments_post_id_idx ON comments USING btree (post_id);
 
+--
+-- Name: comments_category_id_idx; Type: INDEX; Schema: public; Owner: postgres; Tablespace:
+--
+
+CREATE INDEX comments_category_id_idx ON comments USING btree (category_id);
+
 
 --
 -- Name: post_tags_post_id_idx; Type: INDEX; Schema: public; Owner: postgres; Tablespace:
@@ -446,6 +454,14 @@ ALTER TABLE ONLY comments
     ADD CONSTRAINT comments_post_id_fkey FOREIGN KEY (post_id) REFERENCES posts(id);
 
 
+--
+-- Name: comments_category_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: postgres
+--
+
+ALTER TABLE ONLY comments
+    ADD CONSTRAINT comments_category_id_fkey FOREIGN KEY (category_id) REFERENCES categories(id);
+
+
 --
 -- Name: post_tags_post_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: postgres
 --
diff --git a/tests/fixtures/blog_sqlsrv.sql b/tests/fixtures/blog_sqlsrv.sql
@@ -40,6 +40,12 @@ ALTER TABLE [comments] DROP	CONSTRAINT [FK_comments_posts]
 END
 GO
 
+IF (OBJECT_ID('FK_comments_categories', 'F') IS NOT NULL)
+BEGIN
+ALTER TABLE [comments] DROP	CONSTRAINT [FK_comments_categories]
+END
+GO
+
 IF (OBJECT_ID('barcodes2', 'U') IS NOT NULL)
 BEGIN
 DROP TABLE [barcodes2]
@@ -142,6 +148,7 @@ CREATE TABLE [comments](
 	[id] [bigint] IDENTITY,
 	[post_id] [int] NOT NULL,
 	[message] [nvarchar](255) NOT NULL,
+	[category_id] [int] NOT NULL,
 	PRIMARY KEY CLUSTERED([id] ASC)
 )
 GO
@@ -253,14 +260,16 @@ INSERT [categories] ([name], [icon]) VALUES (N'announcement', NULL)
 GO
 INSERT [categories] ([name], [icon]) VALUES (N'article', NULL)
 GO
+INSERT [categories] ([name], [icon]) VALUES (N'comment', NULL)
+GO
 
-INSERT [comments] ([post_id], [message]) VALUES (1, N'great')
+INSERT [comments] ([post_id], [message], [category_id]) VALUES (1, N'great', 3)
 GO
-INSERT [comments] ([post_id], [message]) VALUES (1, N'fantastic')
+INSERT [comments] ([post_id], [message], [category_id]) VALUES (1, N'fantastic', 3)
 GO
-INSERT [comments] ([post_id], [message]) VALUES (2, N'thank you')
+INSERT [comments] ([post_id], [message], [category_id]) VALUES (2, N'thank you', 3)
 GO
-INSERT [comments] ([post_id], [message]) VALUES (2, N'awesome')
+INSERT [comments] ([post_id], [message], [category_id]) VALUES (2, N'awesome', 3)
 GO
 
 INSERT [post_tags] ([post_id], [tag_id]) VALUES (1, 1)
@@ -318,6 +327,12 @@ GO
 ALTER TABLE [comments] CHECK	CONSTRAINT [FK_comments_posts]
 GO
 
+ALTER TABLE [comments]  WITH CHECK ADD 	CONSTRAINT [FK_comments_categories] FOREIGN KEY([category_id])
+REFERENCES [categories] ([id])
+GO
+ALTER TABLE [comments] CHECK	CONSTRAINT [FK_comments_categories]
+GO
+
 ALTER TABLE [post_tags]  WITH CHECK ADD 	CONSTRAINT [FK_post_tags_posts] FOREIGN KEY([post_id])
 REFERENCES [posts] ([id])
 GO
diff --git a/tests/functional/001_records/029_list_example_from_readme_comments_only.log b/tests/functional/001_records/029_list_example_from_readme_comments_only.log
@@ -2,6 +2,6 @@ GET /records/posts?join=comments&filter=id,eq,1
 ===
 200
 Content-Type: application/json
-Content-Length: 170
+Content-Length: 202
 
-{"records":[{"id":1,"user_id":1,"category_id":1,"content":"blog started","comments":[{"id":1,"post_id":1,"message":"great"},{"id":2,"post_id":1,"message":"fantastic"}]}]}
+{"records":[{"id":1,"user_id":1,"category_id":1,"content":"blog started","comments":[{"id":1,"post_id":1,"message":"great","category_id":3},{"id":2,"post_id":1,"message":"fantastic","category_id":3}]}]}
diff --git a/tests/functional/001_records/031_list_example_from_readme_tags_with_join_path.log b/tests/functional/001_records/031_list_example_from_readme_tags_with_join_path.log
@@ -2,6 +2,6 @@ GET /records/posts?join=categories&join=post_tags,tags&join=comments&filter=id,e
 ===
 200
 Content-Type: application/json
-Content-Length: 378
+Content-Length: 410
 
-{"records":[{"id":1,"user_id":1,"category_id":{"id":1,"name":"announcement","icon":null},"content":"blog started","post_tags":[{"id":1,"post_id":1,"tag_id":{"id":1,"name":"funny","is_important":false}},{"id":2,"post_id":1,"tag_id":{"id":2,"name":"important","is_important":true}}],"comments":[{"id":1,"post_id":1,"message":"great"},{"id":2,"post_id":1,"message":"fantastic"}]}]}
+{"records":[{"id":1,"user_id":1,"category_id":{"id":1,"name":"announcement","icon":null},"content":"blog started","post_tags":[{"id":1,"post_id":1,"tag_id":{"id":1,"name":"funny","is_important":false}},{"id":2,"post_id":1,"tag_id":{"id":2,"name":"important","is_important":true}}],"comments":[{"id":1,"post_id":1,"message":"great","category_id":3},{"id":2,"post_id":1,"message":"fantastic","category_id":3}]}]}
diff --git a/tests/functional/001_records/032_list_example_from_readme.log b/tests/functional/001_records/032_list_example_from_readme.log
@@ -2,6 +2,6 @@ GET /records/posts?join=categories&join=tags&join=comments&filter=id,eq,1
 ===
 200
 Content-Type: application/json
-Content-Length: 318
+Content-Length: 350
 
-{"records":[{"id":1,"user_id":1,"category_id":{"id":1,"name":"announcement","icon":null},"content":"blog started","post_tags":[{"id":1,"name":"funny","is_important":false},{"id":2,"name":"important","is_important":true}],"comments":[{"id":1,"post_id":1,"message":"great"},{"id":2,"post_id":1,"message":"fantastic"}]}]}
+{"records":[{"id":1,"user_id":1,"category_id":{"id":1,"name":"announcement","icon":null},"content":"blog started","post_tags":[{"id":1,"name":"funny","is_important":false},{"id":2,"name":"important","is_important":true}],"comments":[{"id":1,"post_id":1,"message":"great","category_id":3},{"id":2,"post_id":1,"message":"fantastic","category_id":3}]}]}
diff --git a/tests/functional/001_records/034_list_example_from_readme_with_transform_with_exclude.log b/tests/functional/001_records/034_list_example_from_readme_with_transform_with_exclude.log
@@ -1,4 +1,4 @@
-GET /records/posts?join=categories&join=post_tags,tags&join=comments&exclude=comments.message&filter=id,eq,1
+GET /records/posts?join=categories&join=post_tags,tags&join=comments&exclude=comments.message,comments.category_id&filter=id,eq,1
 
 ===
 200
diff --git a/tests/functional/001_records/038_list_categories_with_binary_content.log b/tests/functional/001_records/038_list_categories_with_binary_content.log
@@ -1,4 +1,4 @@
-GET /records/categories
+GET /records/categories?filter=id,le,2
 ===
 200
 Content-Type: application/json
diff --git a/tests/functional/001_records/055_filter_category_on_null_icon.log b/tests/functional/001_records/055_filter_category_on_null_icon.log
@@ -1,12 +1,12 @@
-GET /records/categories?filter=icon,is,null
+GET /records/categories?filter=icon,is,null&filter=id,le,2
 ===
 200
 Content-Type: application/json
 Content-Length: 94
 
 {"records":[{"id":1,"name":"announcement","icon":null},{"id":2,"name":"article","icon":null}]}
 ===
-GET /records/categories?filter=icon,is
+GET /records/categories?filter=icon,is&filter=id,le,2
 ===
 200
 Content-Type: application/json
diff --git a/tests/functional/001_records/068_add_comment_with_sanitation.log b/tests/functional/001_records/068_add_comment_with_sanitation.log
@@ -1,6 +1,6 @@
 POST /records/comments
 
-{"user_id":1,"post_id":2,"message":"<h1>Title</h1> <p>Body</p>"}
+{"user_id":1,"post_id":2,"message":"<h1>Title</h1> <p>Body</p>","category_id":3}
 ===
 200
 Content-Type: application/json
@@ -12,6 +12,6 @@ GET /records/comments/5
 ===
 200
 Content-Type: application/json
-Content-Length: 43
+Content-Length: 59
 
-{"id":5,"post_id":2,"message":"Title Body"}
+{"id":5,"post_id":2,"message":"Title Body","category_id":3}
diff --git a/tests/functional/001_records/071_add_comment_with_invisible_record.log b/tests/functional/001_records/071_add_comment_with_invisible_record.log
@@ -1,6 +1,6 @@
 POST /records/comments
 
-{"user_id":1,"post_id":2,"message":"invisible"}
+{"user_id":1,"post_id":2,"message":"invisible","category_id":3}
 ===
 200
 Content-Type: application/json
diff --git a/tests/functional/001_records/079_read_post_with_categories.log b/tests/functional/001_records/079_read_post_with_categories.log
@@ -0,0 +1,31 @@
+GET /records/posts/1?join=tags&include=tags.name
+===
+200
+Content-Type: application/json
+Content-Length: 74
+
+{"id":1,"post_tags":[{"id":1,"name":"funny"},{"id":2,"name":"important"}]}
+===
+GET /records/posts/1?join=categories&include=category_id,categories.name
+===
+200
+Content-Type: application/json
+Content-Length: 53
+
+{"id":1,"category_id":{"id":1,"name":"announcement"}}
+===
+GET /records/posts/1?join=comments,categories&include=category_id,categories.name
+===
+200
+Content-Type: application/json
+Content-Length: 145
+
+{"id":1,"category_id":1,"comments":[{"post_id":1,"category_id":{"id":3,"name":"comment"}},{"post_id":1,"category_id":{"id":3,"name":"comment"}}]}
+===
+GET /records/posts/1?join=categories&join=comments,categories&include=category_id,categories.name
+===
+200
+Content-Type: application/json
+Content-Length: 174
+
+{"id":1,"category_id":{"id":1,"name":"announcement"},"comments":[{"post_id":1,"category_id":{"id":3,"name":"comment"}},{"post_id":1,"category_id":{"id":3,"name":"comment"}}]}
diff --git a/tests/functional/003_columns/001_get_database.log b/tests/functional/003_columns/001_get_database.log
@@ -2,6 +2,6 @@ GET /columns
 ===
 200
 Content-Type: application/json
-Content-Length: 2587
+Content-Length: 2645
 
-{"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":"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":"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}]}]}
+{"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":"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}]}]}

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,6 @@ GET /records/posts?join=comments&filter=id,eq,1`
`2`	`2`	`===`
`3`	`3`	`200`
`4`	`4`	`Content-Type: application/json`
`5`		`-Content-Length: 170`
	`5`	`+Content-Length: 202`
`6`	`6`
`7`		`-{"records":[{"id":1,"user_id":1,"category_id":1,"content":"blog started","comments":[{"id":1,"post_id":1,"message":"great"},{"id":2,"post_id":1,"message":"fantastic"}]}]}`
	`7`	`+{"records":[{"id":1,"user_id":1,"category_id":1,"content":"blog started","comments":[{"id":1,"post_id":1,"message":"great","category_id":3},{"id":2,"post_id":1,"message":"fantastic","category_id":3}]}]}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-GET /records/posts?join=categories&join=post_tags,tags&join=comments&exclude=comments.message&filter=id,eq,1`
	`1`	`+GET /records/posts?join=categories&join=post_tags,tags&join=comments&exclude=comments.message,comments.category_id&filter=id,eq,1`
`2`	`2`
`3`	`3`	`===`
`4`	`4`	`200`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-GET /records/categories`
	`1`	`+GET /records/categories?filter=id,le,2`
`2`	`2`	`===`
`3`	`3`	`200`
`4`	`4`	`Content-Type: application/json`
Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,12 @@`
`1`		`-GET /records/categories?filter=icon,is,null`
	`1`	`+GET /records/categories?filter=icon,is,null&filter=id,le,2`
`2`	`2`	`===`
`3`	`3`	`200`
`4`	`4`	`Content-Type: application/json`
`5`	`5`	`Content-Length: 94`
`6`	`6`
`7`	`7`	`{"records":[{"id":1,"name":"announcement","icon":null},{"id":2,"name":"article","icon":null}]}`
`8`	`8`	`===`
`9`		`-GET /records/categories?filter=icon,is`
	`9`	`+GET /records/categories?filter=icon,is&filter=id,le,2`
`10`	`10`	`===`
`11`	`11`	`200`
`12`	`12`	`Content-Type: application/json`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`POST /records/comments`
`2`	`2`
`3`		`-{"user_id":1,"post_id":2,"message":"<h1>Title</h1> <p>Body</p>"}`
	`3`	`+{"user_id":1,"post_id":2,"message":"<h1>Title</h1> <p>Body</p>","category_id":3}`
`4`	`4`	`===`
`5`	`5`	`200`
`6`	`6`	`Content-Type: application/json`
`@@ -12,6 +12,6 @@ GET /records/comments/5`
`12`	`12`	`===`
`13`	`13`	`200`
`14`	`14`	`Content-Type: application/json`
`15`		`-Content-Length: 43`
	`15`	`+Content-Length: 59`
`16`	`16`
`17`		`-{"id":5,"post_id":2,"message":"Title Body"}`
	`17`	`+{"id":5,"post_id":2,"message":"Title Body","category_id":3}`