From fa84bb895ce952e1f070b24ab4abaaf587d9821b Mon Sep 17 00:00:00 2001 From: John Hall Date: Tue, 9 Jun 2015 16:02:59 -0700 Subject: [PATCH 1/8] fixed examples for pg on windows --- config/mysql/custom.json | 22 +- config/pg/custom.json | 22 +- config/sqlite/custom.json | 22 +- fixtures/pg/insert.sql | 416 +++++++++++++++++++------------------- fixtures/pg/schema.sql | 308 ++++++++++++++++------------ package.json | 47 +++-- path.js | 13 +- 7 files changed, 459 insertions(+), 391 deletions(-) diff --git a/config/mysql/custom.json b/config/mysql/custom.json index fa0e46c..ce6d21a 100644 --- a/config/mysql/custom.json +++ b/config/mysql/custom.json @@ -1,7 +1,7 @@ { "editors": { "app": { - "path": "/home/mighty/node/modules/express-admin-examples/config/custom/editors/app.js", + "path": "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/editors/app.js", "slug": "upload" }, "public": { @@ -11,7 +11,7 @@ ] }, "local": { - "path": "/home/mighty/node/modules/express-admin-examples/config/custom/editors", + "path": "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/editors", "js": [ "/jslib/tinymce/js/tinymce/tinymce.min.js", "/jslib/tinymce/js/tinymce/jquery.tinymce.min.js", @@ -22,7 +22,7 @@ }, "view1": { "app": { - "path": "/home/mighty/node/modules/express-admin-examples/config/custom/app1/app.js", + "path": "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/app1/app.js", "slug": "view1", "verbose": "Simple", "mainview": { @@ -32,7 +32,7 @@ }, "view2": { "app": { - "path" : "/home/mighty/node/modules/express-admin-examples/config/custom/app2/app.js", + "path" : "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/app2/app.js", "slug": "view2", "verbose": "Custom global static files", "mainview": { @@ -41,7 +41,7 @@ }, "public": { "local": { - "path": "/home/mighty/node/modules/express-admin-examples/config/custom/app2/public", + "path": "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/app2/public", "css": [ "/css/global.css" ], @@ -53,7 +53,7 @@ }, "view3": { "app": { - "path" : "/home/mighty/node/modules/express-admin-examples/config/custom/app3/app.js", + "path" : "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/app3/app.js", "slug": "view3", "verbose": "Custom local static files", "mainview": { @@ -62,13 +62,13 @@ }, "public": { "local": { - "path": "/home/mighty/node/modules/express-admin-examples/config/custom/app3/public" + "path": "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/app3/public" } } }, "view4": { "app": { - "path" : "/home/mighty/node/modules/express-admin-examples/config/custom/app4/app.js", + "path" : "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/app4/app.js", "slug": "view4", "verbose": "Breadcrumbs", "mainview": { @@ -78,7 +78,7 @@ }, "stats": { "app": { - "path" : "/home/mighty/node/modules/express-admin-examples/config/custom/highcharts/app.js", + "path" : "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/highcharts/app.js", "slug": "stats", "verbose": "Highcharts Statistics", "mainview": { @@ -89,7 +89,7 @@ "static": { "public": { "local": { - "path": "/home/mighty/node/modules/express-admin-examples/config/custom/static", + "path": "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/static", "js": [ "/mtm-tags.js", "/theme.js", @@ -100,6 +100,6 @@ } }, "events": { - "events": "/home/mighty/node/modules/express-admin-examples/config/custom/events/events.js" + "events": "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/events/events.js" } } \ No newline at end of file diff --git a/config/pg/custom.json b/config/pg/custom.json index cf999bd..77cfb27 100644 --- a/config/pg/custom.json +++ b/config/pg/custom.json @@ -1,7 +1,7 @@ { "editors": { "app": { - "path": "/home/mighty/node/modules/express-admin-examples/config/custom/editors/app.js", + "path": "C:/Users/revlin/Projects/maponics-source/express-admin-examples/config/custom/editors/app.js", "slug": "upload" }, "public": { @@ -11,7 +11,7 @@ ] }, "local": { - "path": "/home/mighty/node/modules/express-admin-examples/config/custom/editors", + "path": "C:/Users/revlin/Projects/maponics-source/express-admin-examples/config/custom/editors", "js": [ "/jslib/tinymce/js/tinymce/tinymce.min.js", "/jslib/tinymce/js/tinymce/jquery.tinymce.min.js", @@ -22,7 +22,7 @@ }, "view1": { "app": { - "path": "/home/mighty/node/modules/express-admin-examples/config/custom/app1/app.js", + "path": "C:/Users/revlin/Projects/maponics-source/express-admin-examples/config/custom/app1/app.js", "slug": "view1", "verbose": "Simple", "mainview": { @@ -32,7 +32,7 @@ }, "view2": { "app": { - "path" : "/home/mighty/node/modules/express-admin-examples/config/custom/app2/app.js", + "path" : "C:/Users/revlin/Projects/maponics-source/express-admin-examples/config/custom/app2/app.js", "slug": "view2", "verbose": "Custom global static files", "mainview": { @@ -40,7 +40,7 @@ } }, "public": { - "path": "/home/mighty/node/modules/express-admin-examples/config/custom/app2/public", + "path": "C:/Users/revlin/Projects/maponics-source/express-admin-examples/config/custom/app2/public", "css": [ "/css/global.css" ], @@ -51,7 +51,7 @@ }, "view3": { "app": { - "path" : "/home/mighty/node/modules/express-admin-examples/config/custom/app3/app.js", + "path" : "C:/Users/revlin/Projects/maponics-source/express-admin-examples/config/custom/app3/app.js", "slug": "view3", "verbose": "Custom local static files", "mainview": { @@ -59,12 +59,12 @@ } }, "public": { - "path": "/home/mighty/node/modules/express-admin-examples/config/custom/app3/public" + "path": "C:/Users/revlin/Projects/maponics-source/express-admin-examples/config/custom/app3/public" } }, "view4": { "app": { - "path" : "/home/mighty/node/modules/express-admin-examples/config/custom/app4/app.js", + "path" : "C:/Users/revlin/Projects/maponics-source/express-admin-examples/config/custom/app4/app.js", "slug": "view4", "verbose": "Breadcrumbs", "mainview": { @@ -74,7 +74,7 @@ }, "stats": { "app": { - "path" : "/home/mighty/node/modules/express-admin-examples/config/custom/highcharts/app.js", + "path" : "C:/Users/revlin/Projects/maponics-source/express-admin-examples/config/custom/highcharts/app.js", "slug": "stats", "verbose": "Highcharts Statistics", "mainview": { @@ -85,7 +85,7 @@ "static": { "public": { "local": { - "path": "/home/mighty/node/modules/express-admin-examples/config/custom/static", + "path": "C:/Users/revlin/Projects/maponics-source/express-admin-examples/config/custom/static", "js": [ "/mtm-tags.js", "/theme.js", @@ -96,6 +96,6 @@ } }, "events": { - "events": "/home/mighty/node/modules/express-admin-examples/config/custom/events/events.js" + "events": "C:/Users/revlin/Projects/maponics-source/express-admin-examples/config/custom/events/events.js" } } \ No newline at end of file diff --git a/config/sqlite/custom.json b/config/sqlite/custom.json index fa0e46c..ce6d21a 100644 --- a/config/sqlite/custom.json +++ b/config/sqlite/custom.json @@ -1,7 +1,7 @@ { "editors": { "app": { - "path": "/home/mighty/node/modules/express-admin-examples/config/custom/editors/app.js", + "path": "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/editors/app.js", "slug": "upload" }, "public": { @@ -11,7 +11,7 @@ ] }, "local": { - "path": "/home/mighty/node/modules/express-admin-examples/config/custom/editors", + "path": "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/editors", "js": [ "/jslib/tinymce/js/tinymce/tinymce.min.js", "/jslib/tinymce/js/tinymce/jquery.tinymce.min.js", @@ -22,7 +22,7 @@ }, "view1": { "app": { - "path": "/home/mighty/node/modules/express-admin-examples/config/custom/app1/app.js", + "path": "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/app1/app.js", "slug": "view1", "verbose": "Simple", "mainview": { @@ -32,7 +32,7 @@ }, "view2": { "app": { - "path" : "/home/mighty/node/modules/express-admin-examples/config/custom/app2/app.js", + "path" : "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/app2/app.js", "slug": "view2", "verbose": "Custom global static files", "mainview": { @@ -41,7 +41,7 @@ }, "public": { "local": { - "path": "/home/mighty/node/modules/express-admin-examples/config/custom/app2/public", + "path": "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/app2/public", "css": [ "/css/global.css" ], @@ -53,7 +53,7 @@ }, "view3": { "app": { - "path" : "/home/mighty/node/modules/express-admin-examples/config/custom/app3/app.js", + "path" : "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/app3/app.js", "slug": "view3", "verbose": "Custom local static files", "mainview": { @@ -62,13 +62,13 @@ }, "public": { "local": { - "path": "/home/mighty/node/modules/express-admin-examples/config/custom/app3/public" + "path": "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/app3/public" } } }, "view4": { "app": { - "path" : "/home/mighty/node/modules/express-admin-examples/config/custom/app4/app.js", + "path" : "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/app4/app.js", "slug": "view4", "verbose": "Breadcrumbs", "mainview": { @@ -78,7 +78,7 @@ }, "stats": { "app": { - "path" : "/home/mighty/node/modules/express-admin-examples/config/custom/highcharts/app.js", + "path" : "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/highcharts/app.js", "slug": "stats", "verbose": "Highcharts Statistics", "mainview": { @@ -89,7 +89,7 @@ "static": { "public": { "local": { - "path": "/home/mighty/node/modules/express-admin-examples/config/custom/static", + "path": "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/static", "js": [ "/mtm-tags.js", "/theme.js", @@ -100,6 +100,6 @@ } }, "events": { - "events": "/home/mighty/node/modules/express-admin-examples/config/custom/events/events.js" + "events": "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/events/events.js" } } \ No newline at end of file diff --git a/fixtures/pg/insert.sql b/fixtures/pg/insert.sql index aa376a8..8370ac9 100644 --- a/fixtures/pg/insert.sql +++ b/fixtures/pg/insert.sql @@ -1,261 +1,261 @@ -- One to Many -truncate table "user" restart identity cascade; -truncate table "item" restart identity cascade; -truncate table "purchase" restart identity cascade; -alter sequence "item_id_seq" restart with 1; -alter sequence "user_id_seq" restart with 1; -alter sequence "purchase_id_seq" restart with 1; - -insert into "user" ("firstname","lastname","created_at","updated_at") VALUES ('Jeff','Cox','2014-01-10 22:17:13','2014-01-10 22:17:13'); -insert into "user" ("firstname","lastname","created_at","updated_at") VALUES ('Ann','Hart','2014-01-15 14:57:00','2014-01-15 14:57:00'); -insert into "user" ("firstname","lastname","created_at","updated_at") VALUES ('Jack','Dean','2014-01-20 01:12:33','2014-01-20 01:12:33'); - -insert into "item" ("name","image") VALUES ('coffee','http://i.imgur.com/aRGnsmZ.jpg'); -insert into "item" ("name","image") VALUES ('tea','http://i.imgur.com/Q4ifnMA.jpg'); -insert into "item" ("name","image") VALUES ('energy','http://i.imgur.com/MmWBoOR.jpg'); -insert into "item" ("name") VALUES ('cherries'); -insert into "item" ("name") VALUES ('chocolate'); - -insert into "purchase" ("item_id","user_id","cache","date") VALUES (1,3,17.5,'2012-01-01'); -insert into "purchase" ("item_id","user_id","cache","date") VALUES (2,1,37.5,'2012-01-12'); -insert into "purchase" ("item_id","user_id","cache","date") VALUES (1,2,66.0,'2012-01-15'); -insert into "purchase" ("item_id","user_id","cache","date","deleted","deleted_at") VALUES (4,3,15.0,'2012-01-27',true,'2012-03-01 1:15'); -insert into "purchase" ("item_id","user_id","cache","date") VALUES (1,2,18.9,'2012-02-07'); -insert into "purchase" ("item_id","user_id","cache","date") VALUES (2,1,100, '2012-02-19'); -insert into "purchase" ("item_id","user_id","cache","date") VALUES (4,3,20.0,'2012-02-20'); -insert into "purchase" ("item_id","user_id","cache","date") VALUES (2,3,50.0,'2012-03-08'); -insert into "purchase" ("item_id","user_id","cache","date") VALUES (3,1,18.0,'2012-03-16'); -insert into "purchase" ("item_id","user_id","cache","date") VALUES (5,2,9.00,'2012-03-18'); -insert into "purchase" ("item_id","user_id","cache","date") VALUES (2,3,3.50,'2012-03-29'); -insert into "purchase" ("item_id","user_id","cache","date") VALUES (5,1,19.0,'2012-04-09'); -insert into "purchase" ("item_id","user_id","cache","date") VALUES (4,2,22.7,'2012-04-13'); -insert into "purchase" ("item_id","user_id","cache","date") VALUES (3,3,44.5,'2012-04-21'); -insert into "purchase" ("item_id","user_id","cache","date","deleted","deleted_at") VALUES (1,2,12.6,'2012-04-26',true,'2012-04-28 14:57'); -insert into "purchase" ("item_id","user_id","cache","date") VALUES (2,2,16.0,'2012-04-26'); -insert into "purchase" ("item_id","user_id","cache","date") VALUES (2,1,40.0,'2012-05-06'); -insert into "purchase" ("item_id","user_id","cache","date") VALUES (3,2,16.8,'2012-05-15'); -insert into "purchase" ("item_id","user_id","cache","date") VALUES (4,3,9.0, '2012-05-22'); -insert into "purchase" ("item_id","user_id","cache","date") VALUES (2,1,40.0,'2012-06-06'); -insert into "purchase" ("item_id","user_id","cache","date") VALUES (3,2,16.0,'2012-06-15'); -insert into "purchase" ("item_id","user_id","cache","date") VALUES (5,3,19.0,'2012-06-22'); -insert into "purchase" ("item_id","user_id","cache","date","deleted","deleted_at") VALUES (3,3,40.0,'2012-06-24',true,'2012-06-27 7:49'); -insert into "purchase" ("item_id","user_id","cache","date") VALUES (1,3,70.0,'2012-06-27'); +truncate table "public"."user" restart identity cascade; +truncate table "public"."item" restart identity cascade; +truncate table "public"."purchase" restart identity cascade; +alter sequence "public"."public"."item_id_seq" restart with 1; +alter sequence "public"."public"."user_id_seq" restart with 1; +alter sequence "public"."public"."purchase_id_seq" restart with 1; + +insert into "public"."user" ("firstname","lastname","created_at","updated_at") VALUES ('Jeff','Cox','2014-01-10 22:17:13','2014-01-10 22:17:13'); +insert into "public"."user" ("firstname","lastname","created_at","updated_at") VALUES ('Ann','Hart','2014-01-15 14:57:00','2014-01-15 14:57:00'); +insert into "public"."user" ("firstname","lastname","created_at","updated_at") VALUES ('Jack','Dean','2014-01-20 01:12:33','2014-01-20 01:12:33'); + +insert into "public"."item" ("name","image") VALUES ('coffee','http://i.imgur.com/aRGnsmZ.jpg'); +insert into "public"."item" ("name","image") VALUES ('tea','http://i.imgur.com/Q4ifnMA.jpg'); +insert into "public"."item" ("name","image") VALUES ('energy','http://i.imgur.com/MmWBoOR.jpg'); +insert into "public"."item" ("name") VALUES ('cherries'); +insert into "public"."item" ("name") VALUES ('chocolate'); + +insert into "public"."purchase" ("item_id","user_id","cache","date") VALUES (1,3,17.5,'2012-01-01'); +insert into "public"."purchase" ("item_id","user_id","cache","date") VALUES (2,1,37.5,'2012-01-12'); +insert into "public"."purchase" ("item_id","user_id","cache","date") VALUES (1,2,66.0,'2012-01-15'); +insert into "public"."purchase" ("item_id","user_id","cache","date","deleted","deleted_at") VALUES (4,3,15.0,'2012-01-27',true,'2012-03-01 1:15'); +insert into "public"."purchase" ("item_id","user_id","cache","date") VALUES (1,2,18.9,'2012-02-07'); +insert into "public"."purchase" ("item_id","user_id","cache","date") VALUES (2,1,100, '2012-02-19'); +insert into "public"."purchase" ("item_id","user_id","cache","date") VALUES (4,3,20.0,'2012-02-20'); +insert into "public"."purchase" ("item_id","user_id","cache","date") VALUES (2,3,50.0,'2012-03-08'); +insert into "public"."purchase" ("item_id","user_id","cache","date") VALUES (3,1,18.0,'2012-03-16'); +insert into "public"."purchase" ("item_id","user_id","cache","date") VALUES (5,2,9.00,'2012-03-18'); +insert into "public"."purchase" ("item_id","user_id","cache","date") VALUES (2,3,3.50,'2012-03-29'); +insert into "public"."purchase" ("item_id","user_id","cache","date") VALUES (5,1,19.0,'2012-04-09'); +insert into "public"."purchase" ("item_id","user_id","cache","date") VALUES (4,2,22.7,'2012-04-13'); +insert into "public"."purchase" ("item_id","user_id","cache","date") VALUES (3,3,44.5,'2012-04-21'); +insert into "public"."purchase" ("item_id","user_id","cache","date","deleted","deleted_at") VALUES (1,2,12.6,'2012-04-26',true,'2012-04-28 14:57'); +insert into "public"."purchase" ("item_id","user_id","cache","date") VALUES (2,2,16.0,'2012-04-26'); +insert into "public"."purchase" ("item_id","user_id","cache","date") VALUES (2,1,40.0,'2012-05-06'); +insert into "public"."purchase" ("item_id","user_id","cache","date") VALUES (3,2,16.8,'2012-05-15'); +insert into "public"."purchase" ("item_id","user_id","cache","date") VALUES (4,3,9.0, '2012-05-22'); +insert into "public"."purchase" ("item_id","user_id","cache","date") VALUES (2,1,40.0,'2012-06-06'); +insert into "public"."purchase" ("item_id","user_id","cache","date") VALUES (3,2,16.0,'2012-06-15'); +insert into "public"."purchase" ("item_id","user_id","cache","date") VALUES (5,3,19.0,'2012-06-22'); +insert into "public"."purchase" ("item_id","user_id","cache","date","deleted","deleted_at") VALUES (3,3,40.0,'2012-06-24',true,'2012-06-27 7:49'); +insert into "public"."purchase" ("item_id","user_id","cache","date") VALUES (1,3,70.0,'2012-06-27'); -- Many to Many -truncate table "recipe_type" restart identity cascade; -truncate table "recipe_method" restart identity cascade; -truncate table "recipe" restart identity cascade; -truncate table "recipe_has_recipe_types" restart identity cascade; -truncate table "recipe_has_recipe_methods" restart identity cascade; -alter sequence "recipe_id_seq" restart with 1; -alter sequence "recipe_type_id_seq" restart with 1; -alter sequence "recipe_method_id_seq" restart with 1; - -insert into "recipe_type" ("title") VALUES ('type1'); -insert into "recipe_type" ("title") VALUES ('type2'); -insert into "recipe_type" ("title") VALUES ('type3'); -insert into "recipe_type" ("title") VALUES ('type4'); -insert into "recipe_type" ("title") VALUES ('type5'); - -insert into "recipe_method" ("title") VALUES ('method1'); -insert into "recipe_method" ("title") VALUES ('method2'); -insert into "recipe_method" ("title") VALUES ('method3'); -insert into "recipe_method" ("title") VALUES ('method4'); -insert into "recipe_method" ("title") VALUES ('method5'); - -insert into "recipe" ("name") VALUES ('recipe 1'); -insert into "recipe" ("name") VALUES ('recipe 2'); -insert into "recipe" ("name") VALUES ('recipe 3'); -insert into "recipe" ("name") VALUES ('recipe 4'); -insert into "recipe" ("name") VALUES ('recipe 5'); -insert into "recipe" ("name") VALUES ('recipe 6'); -insert into "recipe" ("name") VALUES ('recipe 7'); -insert into "recipe" ("name") VALUES ('recipe 8'); -insert into "recipe" ("name") VALUES ('recipe 9'); - -insert into "recipe_has_recipe_types" ("recipe_id","recipe_type_id") VALUES (1,2); -insert into "recipe_has_recipe_types" ("recipe_id","recipe_type_id") VALUES (1,4); -insert into "recipe_has_recipe_types" ("recipe_id","recipe_type_id") VALUES (1,5); -insert into "recipe_has_recipe_types" ("recipe_id","recipe_type_id") VALUES (2,3); -insert into "recipe_has_recipe_types" ("recipe_id","recipe_type_id") VALUES (2,2); -insert into "recipe_has_recipe_types" ("recipe_id","recipe_type_id") VALUES (2,1); -insert into "recipe_has_recipe_types" ("recipe_id","recipe_type_id") VALUES (3,1); -insert into "recipe_has_recipe_types" ("recipe_id","recipe_type_id") VALUES (3,2); -insert into "recipe_has_recipe_types" ("recipe_id","recipe_type_id") VALUES (5,4); -insert into "recipe_has_recipe_types" ("recipe_id","recipe_type_id") VALUES (6,5); -insert into "recipe_has_recipe_types" ("recipe_id","recipe_type_id") VALUES (6,2); -insert into "recipe_has_recipe_types" ("recipe_id","recipe_type_id") VALUES (7,4); -insert into "recipe_has_recipe_types" ("recipe_id","recipe_type_id") VALUES (7,1); -insert into "recipe_has_recipe_types" ("recipe_id","recipe_type_id") VALUES (7,3); -insert into "recipe_has_recipe_types" ("recipe_id","recipe_type_id") VALUES (8,2); -insert into "recipe_has_recipe_types" ("recipe_id","recipe_type_id") VALUES (9,2); -insert into "recipe_has_recipe_types" ("recipe_id","recipe_type_id") VALUES (9,4); - -insert into "recipe_has_recipe_methods" ("recipe_id","recipe_method_id") VALUES (1,2); -insert into "recipe_has_recipe_methods" ("recipe_id","recipe_method_id") VALUES (1,4); -insert into "recipe_has_recipe_methods" ("recipe_id","recipe_method_id") VALUES (2,5); -insert into "recipe_has_recipe_methods" ("recipe_id","recipe_method_id") VALUES (4,3); -insert into "recipe_has_recipe_methods" ("recipe_id","recipe_method_id") VALUES (5,1); -insert into "recipe_has_recipe_methods" ("recipe_id","recipe_method_id") VALUES (5,3); -insert into "recipe_has_recipe_methods" ("recipe_id","recipe_method_id") VALUES (5,5); -insert into "recipe_has_recipe_methods" ("recipe_id","recipe_method_id") VALUES (6,3); -insert into "recipe_has_recipe_methods" ("recipe_id","recipe_method_id") VALUES (6,4); -insert into "recipe_has_recipe_methods" ("recipe_id","recipe_method_id") VALUES (7,4); -insert into "recipe_has_recipe_methods" ("recipe_id","recipe_method_id") VALUES (8,1); -insert into "recipe_has_recipe_methods" ("recipe_id","recipe_method_id") VALUES (8,2); -insert into "recipe_has_recipe_methods" ("recipe_id","recipe_method_id") VALUES (8,3); -insert into "recipe_has_recipe_methods" ("recipe_id","recipe_method_id") VALUES (9,1); -insert into "recipe_has_recipe_methods" ("recipe_id","recipe_method_id") VALUES (9,2); -insert into "recipe_has_recipe_methods" ("recipe_id","recipe_method_id") VALUES (9,4); -insert into "recipe_has_recipe_methods" ("recipe_id","recipe_method_id") VALUES (9,5); +truncate table "public"."recipe_type" restart identity cascade; +truncate table "public"."recipe_method" restart identity cascade; +truncate table "public"."recipe" restart identity cascade; +truncate table "public"."recipe_has_recipe_types" restart identity cascade; +truncate table "public"."recipe_has_recipe_methods" restart identity cascade; +alter sequence "public"."recipe_id_seq" restart with 1; +alter sequence "public"."recipe_type_id_seq" restart with 1; +alter sequence "public"."recipe_method_id_seq" restart with 1; + +insert into "public"."recipe_type" ("title") VALUES ('type1'); +insert into "public"."recipe_type" ("title") VALUES ('type2'); +insert into "public"."recipe_type" ("title") VALUES ('type3'); +insert into "public"."recipe_type" ("title") VALUES ('type4'); +insert into "public"."recipe_type" ("title") VALUES ('type5'); + +insert into "public"."recipe_method" ("title") VALUES ('method1'); +insert into "public"."recipe_method" ("title") VALUES ('method2'); +insert into "public"."recipe_method" ("title") VALUES ('method3'); +insert into "public"."recipe_method" ("title") VALUES ('method4'); +insert into "public"."recipe_method" ("title") VALUES ('method5'); + +insert into "public"."recipe" ("name") VALUES ('recipe 1'); +insert into "public"."recipe" ("name") VALUES ('recipe 2'); +insert into "public"."recipe" ("name") VALUES ('recipe 3'); +insert into "public"."recipe" ("name") VALUES ('recipe 4'); +insert into "public"."recipe" ("name") VALUES ('recipe 5'); +insert into "public"."recipe" ("name") VALUES ('recipe 6'); +insert into "public"."recipe" ("name") VALUES ('recipe 7'); +insert into "public"."recipe" ("name") VALUES ('recipe 8'); +insert into "public"."recipe" ("name") VALUES ('recipe 9'); + +insert into "public"."recipe_has_recipe_types" ("recipe_id","recipe_type_id") VALUES (1,2); +insert into "public"."recipe_has_recipe_types" ("recipe_id","recipe_type_id") VALUES (1,4); +insert into "public"."recipe_has_recipe_types" ("recipe_id","recipe_type_id") VALUES (1,5); +insert into "public"."recipe_has_recipe_types" ("recipe_id","recipe_type_id") VALUES (2,3); +insert into "public"."recipe_has_recipe_types" ("recipe_id","recipe_type_id") VALUES (2,2); +insert into "public"."recipe_has_recipe_types" ("recipe_id","recipe_type_id") VALUES (2,1); +insert into "public"."recipe_has_recipe_types" ("recipe_id","recipe_type_id") VALUES (3,1); +insert into "public"."recipe_has_recipe_types" ("recipe_id","recipe_type_id") VALUES (3,2); +insert into "public"."recipe_has_recipe_types" ("recipe_id","recipe_type_id") VALUES (5,4); +insert into "public"."recipe_has_recipe_types" ("recipe_id","recipe_type_id") VALUES (6,5); +insert into "public"."recipe_has_recipe_types" ("recipe_id","recipe_type_id") VALUES (6,2); +insert into "public"."recipe_has_recipe_types" ("recipe_id","recipe_type_id") VALUES (7,4); +insert into "public"."recipe_has_recipe_types" ("recipe_id","recipe_type_id") VALUES (7,1); +insert into "public"."recipe_has_recipe_types" ("recipe_id","recipe_type_id") VALUES (7,3); +insert into "public"."recipe_has_recipe_types" ("recipe_id","recipe_type_id") VALUES (8,2); +insert into "public"."recipe_has_recipe_types" ("recipe_id","recipe_type_id") VALUES (9,2); +insert into "public"."recipe_has_recipe_types" ("recipe_id","recipe_type_id") VALUES (9,4); + +insert into "public"."recipe_has_recipe_methods" ("recipe_id","recipe_method_id") VALUES (1,2); +insert into "public"."recipe_has_recipe_methods" ("recipe_id","recipe_method_id") VALUES (1,4); +insert into "public"."recipe_has_recipe_methods" ("recipe_id","recipe_method_id") VALUES (2,5); +insert into "public"."recipe_has_recipe_methods" ("recipe_id","recipe_method_id") VALUES (4,3); +insert into "public"."recipe_has_recipe_methods" ("recipe_id","recipe_method_id") VALUES (5,1); +insert into "public"."recipe_has_recipe_methods" ("recipe_id","recipe_method_id") VALUES (5,3); +insert into "public"."recipe_has_recipe_methods" ("recipe_id","recipe_method_id") VALUES (5,5); +insert into "public"."recipe_has_recipe_methods" ("recipe_id","recipe_method_id") VALUES (6,3); +insert into "public"."recipe_has_recipe_methods" ("recipe_id","recipe_method_id") VALUES (6,4); +insert into "public"."recipe_has_recipe_methods" ("recipe_id","recipe_method_id") VALUES (7,4); +insert into "public"."recipe_has_recipe_methods" ("recipe_id","recipe_method_id") VALUES (8,1); +insert into "public"."recipe_has_recipe_methods" ("recipe_id","recipe_method_id") VALUES (8,2); +insert into "public"."recipe_has_recipe_methods" ("recipe_id","recipe_method_id") VALUES (8,3); +insert into "public"."recipe_has_recipe_methods" ("recipe_id","recipe_method_id") VALUES (9,1); +insert into "public"."recipe_has_recipe_methods" ("recipe_id","recipe_method_id") VALUES (9,2); +insert into "public"."recipe_has_recipe_methods" ("recipe_id","recipe_method_id") VALUES (9,4); +insert into "public"."recipe_has_recipe_methods" ("recipe_id","recipe_method_id") VALUES (9,5); -- One to One -truncate table "address" restart identity cascade; -truncate table "phone" restart identity cascade; -alter sequence "address_id_seq" restart with 1; -alter sequence "phone_id_seq" restart with 1; +truncate table "public"."address" restart identity cascade; +truncate table "public"."phone" restart identity cascade; +alter sequence "public"."address_id_seq" restart with 1; +alter sequence "public"."phone_id_seq" restart with 1; -insert into "address" ("user_id","street") VALUES (1,'South Lake'); -insert into "address" ("user_id","street") VALUES (2,'Steep Hill'); -insert into "address" ("user_id","street") VALUES (3,'Pine Woods'); +insert into "public"."address" ("user_id","street") VALUES (1,'South Lake'); +insert into "public"."address" ("user_id","street") VALUES (2,'Steep Hill'); +insert into "public"."address" ("user_id","street") VALUES (3,'Pine Woods'); -insert into "phone" ("user_id","mobile") VALUES (2,'123-555-5555'); -insert into "phone" ("user_id","mobile") VALUES (3,'456-555-5555'); +insert into "public"."phone" ("user_id","mobile") VALUES (2,'123-555-5555'); +insert into "public"."phone" ("user_id","mobile") VALUES (3,'456-555-5555'); -- Many to One -truncate table "car" restart identity cascade; -truncate table "repair" restart identity cascade; -truncate table "driver" restart identity cascade; -alter sequence "car_id_seq" restart with 1; -alter sequence "repair_id_seq" restart with 1; -alter sequence "driver_id_seq" restart with 1; - -insert into "car" ("model") VALUES ('Lamborghini Diablo'); -insert into "car" ("model") VALUES ('Subaru Impreza'); -insert into "car" ("model") VALUES ('Trabant'); - -insert into "repair" ("car_id","date") VALUES (1,'2013-01-13'); -insert into "repair" ("car_id","date") VALUES (1,'2013-04-07'); -insert into "repair" ("car_id","date") VALUES (2,'2013-02-15'); -insert into "repair" ("car_id","date") VALUES (2,'2013-05-18'); -insert into "repair" ("car_id","date") VALUES (3,'2013-03-12'); -insert into "repair" ("car_id","date") VALUES (3,'2013-01-02'); - -insert into "driver" ("car_id","name") VALUES (1,'John'); -insert into "driver" ("car_id","name") VALUES (1,'Ross'); -insert into "driver" ("car_id","name") VALUES (2,'Ann'); -insert into "driver" ("car_id","name") VALUES (2,'Patrick'); -insert into "driver" ("car_id","name") VALUES (3,'David'); -insert into "driver" ("car_id","name") VALUES (3,'Rossie'); +truncate table "public"."car" restart identity cascade; +truncate table "public"."repair" restart identity cascade; +truncate table "public"."driver" restart identity cascade; +alter sequence "public"."car_id_seq" restart with 1; +alter sequence "public"."repair_id_seq" restart with 1; +alter sequence "public"."driver_id_seq" restart with 1; + +insert into "public"."car" ("model") VALUES ('Lamborghini Diablo'); +insert into "public"."car" ("model") VALUES ('Subaru Impreza'); +insert into "public"."car" ("model") VALUES ('Trabant'); + +insert into "public"."repair" ("car_id","date") VALUES (1,'2013-01-13'); +insert into "public"."repair" ("car_id","date") VALUES (1,'2013-04-07'); +insert into "public"."repair" ("car_id","date") VALUES (2,'2013-02-15'); +insert into "public"."repair" ("car_id","date") VALUES (2,'2013-05-18'); +insert into "public"."repair" ("car_id","date") VALUES (3,'2013-03-12'); +insert into "public"."repair" ("car_id","date") VALUES (3,'2013-01-02'); + +insert into "public"."driver" ("car_id","name") VALUES (1,'John'); +insert into "public"."driver" ("car_id","name") VALUES (1,'Ross'); +insert into "public"."driver" ("car_id","name") VALUES (2,'Ann'); +insert into "public"."driver" ("car_id","name") VALUES (2,'Patrick'); +insert into "public"."driver" ("car_id","name") VALUES (3,'David'); +insert into "public"."driver" ("car_id","name") VALUES (3,'Rossie'); -- Controls -truncate table "controls_mtm_single" restart identity cascade; -truncate table "controls_mtm_multiple" restart identity cascade; +truncate table "public"."controls_mtm_single" restart identity cascade; +truncate table "public"."controls_mtm_multiple" restart identity cascade; -truncate table "controls_has_controls_mtm_single" restart identity cascade; -truncate table "controls_has_controls_mtm_multiple" restart identity cascade; +truncate table "public"."controls_has_controls_mtm_single" restart identity cascade; +truncate table "public"."controls_has_controls_mtm_multiple" restart identity cascade; -truncate table "controls" restart identity cascade; +truncate table "public"."controls" restart identity cascade; -truncate table "controls_otm_single" restart identity cascade; -truncate table "controls_otm_multiple" restart identity cascade; +truncate table "public"."controls_otm_single" restart identity cascade; +truncate table "public"."controls_otm_multiple" restart identity cascade; -truncate table "controls_inline_mtm_single" restart identity cascade; -truncate table "controls_inline_mtm_multiple" restart identity cascade; +truncate table "public"."controls_inline_mtm_single" restart identity cascade; +truncate table "public"."controls_inline_mtm_multiple" restart identity cascade; -truncate table "controls_inline_has_controls_inline_mtm_single" restart identity cascade; -truncate table "controls_inline_has_controls_inline_mtm_multiple" restart identity cascade; +truncate table "public"."controls_inline_has_controls_inline_mtm_single" restart identity cascade; +truncate table "public"."controls_inline_has_controls_inline_mtm_multiple" restart identity cascade; -truncate table "controls_inline" restart identity cascade; +truncate table "public"."controls_inline" restart identity cascade; -truncate table "controls_inline_otm_single" restart identity cascade; -truncate table "controls_inline_otm_multiple" restart identity cascade; +truncate table "public"."controls_inline_otm_single" restart identity cascade; +truncate table "public"."controls_inline_otm_multiple" restart identity cascade; -alter sequence "controls_otm_single_id_seq" restart with 1; -alter sequence "controls_otm_multiple_id_seq" restart with 1; +alter sequence "public"."controls_otm_single_id_seq" restart with 1; +alter sequence "public"."controls_otm_multiple_id_seq" restart with 1; -alter sequence "controls_id_seq" restart with 1; +alter sequence "public"."controls_id_seq" restart with 1; -alter sequence "controls_mtm_single_id_seq" restart with 1; -alter sequence "controls_mtm_multiple_id_seq" restart with 1; +alter sequence "public"."controls_mtm_single_id_seq" restart with 1; +alter sequence "public"."controls_mtm_multiple_id_seq" restart with 1; -alter sequence "controls_inline_otm_single_id_seq" restart with 1; -alter sequence "controls_inline_otm_multiple_id_seq" restart with 1; +alter sequence "public"."controls_inline_otm_single_id_seq" restart with 1; +alter sequence "public"."controls_inline_otm_multiple_id_seq" restart with 1; -alter sequence "controls_inline_id_seq" restart with 1; +alter sequence "public"."controls_inline_id_seq" restart with 1; -alter sequence "controls_inline_mtm_single_id_seq" restart with 1; -alter sequence "controls_inline_mtm_multiple_id_seq" restart with 1; +alter sequence "public"."controls_inline_mtm_single_id_seq" restart with 1; +alter sequence "public"."controls_inline_mtm_multiple_id_seq" restart with 1; -- otm -insert into "controls_otm_single" ("name") values ('one'); -insert into "controls_otm_single" ("name") values ('two'); -insert into "controls_otm_single" ("name") values ('three'); +insert into "public"."controls_otm_single" ("name") values ('one'); +insert into "public"."controls_otm_single" ("name") values ('two'); +insert into "public"."controls_otm_single" ("name") values ('three'); -insert into "controls_otm_multiple" ("first","last") values ('one','two'); -insert into "controls_otm_multiple" ("first") values ('three'); -insert into "controls_otm_multiple" ("first","last") values ('four','five'); +insert into "public"."controls_otm_multiple" ("first","last") values ('one','two'); +insert into "public"."controls_otm_multiple" ("first") values ('three'); +insert into "public"."controls_otm_multiple" ("first","last") values ('four','five'); -insert into "controls_inline_otm_single" ("name") values ('one'); -insert into "controls_inline_otm_single" ("name") values ('two'); -insert into "controls_inline_otm_single" ("name") values ('three'); +insert into "public"."controls_inline_otm_single" ("name") values ('one'); +insert into "public"."controls_inline_otm_single" ("name") values ('two'); +insert into "public"."controls_inline_otm_single" ("name") values ('three'); -insert into "controls_inline_otm_multiple" ("first","last") values ('one','two'); -insert into "controls_inline_otm_multiple" ("first") values ('three'); -insert into "controls_inline_otm_multiple" ("first","last") values ('four','five'); +insert into "public"."controls_inline_otm_multiple" ("first","last") values ('one','two'); +insert into "public"."controls_inline_otm_multiple" ("first") values ('three'); +insert into "public"."controls_inline_otm_multiple" ("first","last") values ('four','five'); -- mtm -insert into "controls_mtm_single" ("name") values ('one'); -insert into "controls_mtm_single" ("name") values ('two'); -insert into "controls_mtm_single" ("name") values ('three'); +insert into "public"."controls_mtm_single" ("name") values ('one'); +insert into "public"."controls_mtm_single" ("name") values ('two'); +insert into "public"."controls_mtm_single" ("name") values ('three'); -insert into "controls_mtm_multiple" ("first","last") values ('one','two'); -insert into "controls_mtm_multiple" ("first") values ('three'); -insert into "controls_mtm_multiple" ("first","last") values ('four','five'); +insert into "public"."controls_mtm_multiple" ("first","last") values ('one','two'); +insert into "public"."controls_mtm_multiple" ("first") values ('three'); +insert into "public"."controls_mtm_multiple" ("first","last") values ('four','five'); -insert into "controls_inline_mtm_single" ("name") values ('one'); -insert into "controls_inline_mtm_single" ("name") values ('two'); -insert into "controls_inline_mtm_single" ("name") values ('three'); +insert into "public"."controls_inline_mtm_single" ("name") values ('one'); +insert into "public"."controls_inline_mtm_single" ("name") values ('two'); +insert into "public"."controls_inline_mtm_single" ("name") values ('three'); -insert into "controls_inline_mtm_multiple" ("first","last") values ('one','two'); -insert into "controls_inline_mtm_multiple" ("first") values ('three'); -insert into "controls_inline_mtm_multiple" ("first","last") values ('four','five'); +insert into "public"."controls_inline_mtm_multiple" ("first","last") values ('one','two'); +insert into "public"."controls_inline_mtm_multiple" ("first") values ('three'); +insert into "public"."controls_inline_mtm_multiple" ("first","last") values ('four','five'); -- controls -insert into "controls" +insert into "public"."controls" ("controls_otm_single_id","controls_otm_multiple_id","static","text","boolean","upload","binary","date","time","datetime","textarea") values (1,1,'two','text','1','file','','2013-12-10','20:36','2014-12-10 7:50','text'); -insert into "controls" +insert into "public"."controls" ("text") values ('all other empty'); -- controls inline -insert into "controls_inline" +insert into "public"."controls_inline" ("controls_id","controls_inline_otm_single_id","controls_inline_otm_multiple_id","static","text","boolean","bigint","double","upload","binary","date","time","datetime","textarea") values (1,2,2,'three','text','1',1000000,15.50,'file','','2013-12-10','20:36','2014-12-10 7:50','text'); -insert into "controls_inline" +insert into "public"."controls_inline" ("controls_id","controls_inline_otm_single_id","controls_inline_otm_multiple_id","static","text","boolean","bigint","double","upload","binary","date","time","datetime","textarea") values (2,3,3,'one','text','0',900,16.67,'file','','2013-12-10','20:36','2014-12-10 7:50','text'); -- link -insert into "controls_has_controls_mtm_single" ("controls_id","controls_mtm_single_id") values (1,1); -insert into "controls_has_controls_mtm_multiple" ("controls_id","controls_mtm_multiple_id") values (1,1); -insert into "controls_has_controls_mtm_multiple" ("controls_id","controls_mtm_multiple_id") values (1,2); -insert into "controls_has_controls_mtm_multiple" ("controls_id","controls_mtm_multiple_id") values (1,3); -insert into "controls_has_controls_mtm_single" ("controls_id","controls_mtm_single_id") values (2,1); -insert into "controls_has_controls_mtm_multiple" ("controls_id","controls_mtm_multiple_id") values (2,1); -insert into "controls_has_controls_mtm_multiple" ("controls_id","controls_mtm_multiple_id") values (2,2); -insert into "controls_has_controls_mtm_multiple" ("controls_id","controls_mtm_multiple_id") values (2,3); +insert into "public"."controls_has_controls_mtm_single" ("controls_id","controls_mtm_single_id") values (1,1); +insert into "public"."controls_has_controls_mtm_multiple" ("controls_id","controls_mtm_multiple_id") values (1,1); +insert into "public"."controls_has_controls_mtm_multiple" ("controls_id","controls_mtm_multiple_id") values (1,2); +insert into "public"."controls_has_controls_mtm_multiple" ("controls_id","controls_mtm_multiple_id") values (1,3); +insert into "public"."controls_has_controls_mtm_single" ("controls_id","controls_mtm_single_id") values (2,1); +insert into "public"."controls_has_controls_mtm_multiple" ("controls_id","controls_mtm_multiple_id") values (2,1); +insert into "public"."controls_has_controls_mtm_multiple" ("controls_id","controls_mtm_multiple_id") values (2,2); +insert into "public"."controls_has_controls_mtm_multiple" ("controls_id","controls_mtm_multiple_id") values (2,3); -- link inline -insert into "controls_inline_has_controls_inline_mtm_single" ("controls_inline_id","controls_inline_mtm_single_id") values (1,1); -insert into "controls_inline_has_controls_inline_mtm_multiple" ("controls_inline_id","controls_inline_mtm_multiple_id") values (1,1); -insert into "controls_inline_has_controls_inline_mtm_multiple" ("controls_inline_id","controls_inline_mtm_multiple_id") values (1,2); -insert into "controls_inline_has_controls_inline_mtm_multiple" ("controls_inline_id","controls_inline_mtm_multiple_id") values (1,3); -insert into "controls_inline_has_controls_inline_mtm_single" ("controls_inline_id","controls_inline_mtm_single_id") values (2,1); -insert into "controls_inline_has_controls_inline_mtm_multiple" ("controls_inline_id","controls_inline_mtm_multiple_id") values (2,1); -insert into "controls_inline_has_controls_inline_mtm_multiple" ("controls_inline_id","controls_inline_mtm_multiple_id") values (2,2); -insert into "controls_inline_has_controls_inline_mtm_multiple" ("controls_inline_id","controls_inline_mtm_multiple_id") values (2,3); +insert into "public"."controls_inline_has_controls_inline_mtm_single" ("controls_inline_id","controls_inline_mtm_single_id") values (1,1); +insert into "public"."controls_inline_has_controls_inline_mtm_multiple" ("controls_inline_id","controls_inline_mtm_multiple_id") values (1,1); +insert into "public"."controls_inline_has_controls_inline_mtm_multiple" ("controls_inline_id","controls_inline_mtm_multiple_id") values (1,2); +insert into "public"."controls_inline_has_controls_inline_mtm_multiple" ("controls_inline_id","controls_inline_mtm_multiple_id") values (1,3); +insert into "public"."controls_inline_has_controls_inline_mtm_single" ("controls_inline_id","controls_inline_mtm_single_id") values (2,1); +insert into "public"."controls_inline_has_controls_inline_mtm_multiple" ("controls_inline_id","controls_inline_mtm_multiple_id") values (2,1); +insert into "public"."controls_inline_has_controls_inline_mtm_multiple" ("controls_inline_id","controls_inline_mtm_multiple_id") values (2,2); +insert into "public"."controls_inline_has_controls_inline_mtm_multiple" ("controls_inline_id","controls_inline_mtm_multiple_id") values (2,3); -- END Controls diff --git a/fixtures/pg/schema.sql b/fixtures/pg/schema.sql index 8f3ece9..d35e73b 100644 --- a/fixtures/pg/schema.sql +++ b/fixtures/pg/schema.sql @@ -1,88 +1,100 @@ -DROP SCHEMA IF EXISTS "express-admin-examples" ; -CREATE SCHEMA IF NOT EXISTS "express-admin-examples"; +DROP SCHEMA IF EXISTS "public" ; +CREATE SCHEMA "public"; +GRANT ALL ON SCHEMA "public" to liolio; +GRANT ALL ON ALL TABLES IN SCHEMA "public" to liolio; +GRANT ALL ON ALL sequences IN SCHEMA "public" to liolio; -ALTER TABLE "purchase" DROP CONSTRAINT "item_id"; -ALTER TABLE "purchase" DROP CONSTRAINT "user_id"; -ALTER TABLE "recipe_has_recipe_types" DROP CONSTRAINT "recipe_id"; -ALTER TABLE "recipe_has_recipe_types" DROP CONSTRAINT "recipe_type_id"; -ALTER TABLE "recipe_has_recipe_methods" DROP CONSTRAINT "recipe_id"; -ALTER TABLE "recipe_has_recipe_methods" DROP CONSTRAINT "recipe_method_id"; -ALTER TABLE "address" DROP CONSTRAINT "user_id"; -ALTER TABLE "phone" DROP CONSTRAINT "user_id"; -ALTER TABLE "repair" DROP CONSTRAINT "car_id"; -ALTER TABLE "driver" DROP CONSTRAINT "car_id"; +ALTER TABLE "public"."purchase" DROP CONSTRAINT "item_id"; +ALTER TABLE "public"."purchase" DROP CONSTRAINT "user_id"; +ALTER TABLE "public"."recipe_has_recipe_types" DROP CONSTRAINT "recipe_id"; +ALTER TABLE "public"."recipe_has_recipe_types" DROP CONSTRAINT "recipe_type_id"; +ALTER TABLE "public"."recipe_has_recipe_methods" DROP CONSTRAINT "recipe_id"; +ALTER TABLE "public"."recipe_has_recipe_methods" DROP CONSTRAINT "recipe_method_id"; +ALTER TABLE "public"."address" DROP CONSTRAINT "user_id"; +ALTER TABLE "public"."phone" DROP CONSTRAINT "user_id"; +ALTER TABLE "public"."repair" DROP CONSTRAINT "car_id"; +ALTER TABLE "public"."driver" DROP CONSTRAINT "car_id"; -ALTER TABLE "controls" DROP CONSTRAINT "controls_otm_single_id"; -ALTER TABLE "controls" DROP CONSTRAINT "controls_otm_multiple_id"; +ALTER TABLE "public"."controls" DROP CONSTRAINT "controls_otm_single_id"; +ALTER TABLE "public"."controls" DROP CONSTRAINT "controls_otm_multiple_id"; -ALTER TABLE "controls_has_controls_mtm_single" DROP CONSTRAINT "controls_id"; -ALTER TABLE "controls_has_controls_mtm_single" DROP CONSTRAINT "controls_mtm_single_id"; -ALTER TABLE "controls_has_controls_mtm_multiple" DROP CONSTRAINT "controls_id"; -ALTER TABLE "controls_has_controls_mtm_multiple" DROP CONSTRAINT "controls_mtm_multiple_id"; +ALTER TABLE "public"."controls_has_controls_mtm_single" DROP CONSTRAINT "controls_id"; +ALTER TABLE "public"."controls_has_controls_mtm_single" DROP CONSTRAINT "controls_mtm_single_id"; +ALTER TABLE "public"."controls_has_controls_mtm_multiple" DROP CONSTRAINT "controls_id"; +ALTER TABLE "public"."controls_has_controls_mtm_multiple" DROP CONSTRAINT "controls_mtm_multiple_id"; -ALTER TABLE "controls_inline" DROP CONSTRAINT "controls_inline_otm_single_id"; -ALTER TABLE "controls_inline" DROP CONSTRAINT "controls_inline_otm_multiple_id"; -ALTER TABLE "controls_inline" DROP CONSTRAINT "controls_id"; +ALTER TABLE "public"."controls_inline" DROP CONSTRAINT "controls_inline_otm_single_id"; +ALTER TABLE "public"."controls_inline" DROP CONSTRAINT "controls_inline_otm_multiple_id"; +ALTER TABLE "public"."controls_inline" DROP CONSTRAINT "controls_id"; -ALTER TABLE "controls_inline_has_controls_inline_mtm_single" DROP CONSTRAINT "controls_inline_id"; -ALTER TABLE "controls_inline_has_controls_inline_mtm_single" DROP CONSTRAINT "controls_inline_mtm_single_id"; -ALTER TABLE "controls_inline_has_controls_inline_mtm_multiple" DROP CONSTRAINT "controls_inline_id"; -ALTER TABLE "controls_inline_has_controls_inline_mtm_multiple" DROP CONSTRAINT "controls_inline_mtm_multiple_id"; +ALTER TABLE "public"."controls_inline_has_controls_inline_mtm_single" DROP CONSTRAINT "controls_inline_id"; +ALTER TABLE "public"."controls_inline_has_controls_inline_mtm_single" DROP CONSTRAINT "controls_inline_mtm_single_id"; +ALTER TABLE "public"."controls_inline_has_controls_inline_mtm_multiple" DROP CONSTRAINT "controls_inline_id"; +ALTER TABLE "public"."controls_inline_has_controls_inline_mtm_multiple" DROP CONSTRAINT "controls_inline_mtm_multiple_id"; -- ----------------------------------------------------- -- Table "notes" -- ----------------------------------------------------- -DROP TABLE IF EXISTS "notes" ; -CREATE SEQUENCE notes_id_seq; +DROP TABLE IF EXISTS "public"."notes" ; +CREATE SEQUENCE "public".notes_id_seq; +ALTER SEQUENCE "public".notes_id_seq OWNER TO liolio; -CREATE TABLE IF NOT EXISTS "notes" ( +CREATE TABLE IF NOT EXISTS "public"."notes" ( "id" INT NOT NULL DEFAULT nextval('notes_id_seq') , "notes1" TEXT NULL , "notes2" TEXT NOT NULL , "notes3" TEXT NULL , "notes4" TEXT NOT NULL , PRIMARY KEY ("id") ); +ALTER TABLE "public"."notes" OWNER TO liolio; + + -- ----------------------------------------------------- -- Table "item" -- ----------------------------------------------------- -DROP TABLE IF EXISTS "item" ; -CREATE SEQUENCE item_id_seq; +DROP TABLE IF EXISTS "public"."item" ; +CREATE SEQUENCE "public".item_id_seq; +ALTER SEQUENCE "public".item_id_seq OWNER TO liolio; -CREATE TABLE IF NOT EXISTS "item" ( +CREATE TABLE IF NOT EXISTS "public"."item" ( "id" INT NOT NULL DEFAULT nextval('item_id_seq') , "name" VARCHAR(45) NOT NULL , "description" TEXT NULL , "image" VARCHAR(255) NULL , PRIMARY KEY ("id") ); +ALTER TABLE "public"."item" OWNER TO liolio; -- ----------------------------------------------------- -- Table "user" -- ----------------------------------------------------- -DROP TABLE IF EXISTS "user" ; -CREATE SEQUENCE user_id_seq; +DROP TABLE IF EXISTS "public"."user" ; +CREATE SEQUENCE "public".user_id_seq; +ALTER SEQUENCE "public".user_id_seq OWNER TO liolio; -CREATE TABLE IF NOT EXISTS "user" ( +CREATE TABLE IF NOT EXISTS "public"."user" ( "id" INT NOT NULL DEFAULT nextval('user_id_seq') , "firstname" VARCHAR(45) NOT NULL , "lastname" VARCHAR(45) NULL , "created_at" TIMESTAMP NOT NULL , "updated_at" TIMESTAMP NOT NULL , PRIMARY KEY ("id") ); +ALTER TABLE "public"."user" OWNER TO liolio; -- ----------------------------------------------------- -- Table "purchase" -- ----------------------------------------------------- -DROP TABLE IF EXISTS "purchase" ; -CREATE SEQUENCE purchase_id_seq; +DROP TABLE IF EXISTS "public"."purchase" ; +CREATE SEQUENCE "public".purchase_id_seq; +ALTER SEQUENCE "public".purchase_id_seq OWNER TO liolio; -CREATE TABLE IF NOT EXISTS "purchase" ( +CREATE TABLE IF NOT EXISTS "public"."purchase" ( "id" INT NOT NULL DEFAULT nextval('purchase_id_seq') , "item_id" INT NOT NULL , "user_id" INT NULL , @@ -94,103 +106,113 @@ CREATE TABLE IF NOT EXISTS "purchase" ( CONSTRAINT "item_id" FOREIGN KEY ("item_id" ) - REFERENCES "item" ("id" ) + REFERENCES "public"."item" ("id" ) ON DELETE NO ACTION ON UPDATE NO ACTION, CONSTRAINT "user_id" FOREIGN KEY ("user_id" ) - REFERENCES "user" ("id" ) + REFERENCES "public"."user" ("id" ) ON DELETE NO ACTION ON UPDATE NO ACTION); +ALTER TABLE "public"."purchase" OWNER TO liolio; -- ----------------------------------------------------- -- Table "recipe" -- ----------------------------------------------------- -DROP TABLE IF EXISTS "recipe" ; -CREATE SEQUENCE recipe_id_seq; +DROP TABLE IF EXISTS "public"."recipe" ; +CREATE SEQUENCE "public".recipe_id_seq; +ALTER SEQUENCE "public".recipe_id_seq OWNER TO liolio; -CREATE TABLE IF NOT EXISTS "recipe" ( +CREATE TABLE IF NOT EXISTS "public"."recipe" ( "id" INT NOT NULL DEFAULT nextval('recipe_id_seq') , "name" VARCHAR(45) NOT NULL , PRIMARY KEY ("id") ); +ALTER TABLE "public"."recipe" OWNER TO liolio; -- ----------------------------------------------------- -- Table "recipe_type" -- ----------------------------------------------------- -DROP TABLE IF EXISTS "recipe_type" ; -CREATE SEQUENCE recipe_type_id_seq; +DROP TABLE IF EXISTS "public"."recipe_type" ; +CREATE SEQUENCE "public".recipe_type_id_seq; +ALTER SEQUENCE "public".recipe_type_id_seq OWNER TO liolio; -CREATE TABLE IF NOT EXISTS "recipe_type" ( +CREATE TABLE IF NOT EXISTS "public"."recipe_type" ( "id" INT NOT NULL DEFAULT nextval('recipe_type_id_seq') , "title" VARCHAR(45) NOT NULL , PRIMARY KEY ("id") ); +ALTER TABLE "public"."recipe_type" OWNER TO liolio; -- ----------------------------------------------------- -- Table "recipe_method" -- ----------------------------------------------------- -DROP TABLE IF EXISTS "recipe_method" ; -CREATE SEQUENCE recipe_method_id_seq; +DROP TABLE IF EXISTS "public"."recipe_method" ; +CREATE SEQUENCE "public".recipe_method_id_seq; +ALTER SEQUENCE "public".recipe_method_id_seq OWNER TO liolio; -CREATE TABLE IF NOT EXISTS "recipe_method" ( +CREATE TABLE IF NOT EXISTS "public"."recipe_method" ( "id" INT NOT NULL DEFAULT nextval('recipe_method_id_seq') , "title" VARCHAR(45) NOT NULL , PRIMARY KEY ("id") ); +ALTER TABLE "public"."recipe_method" OWNER TO liolio; -- ----------------------------------------------------- -- Table "recipe_has_recipe_types" -- ----------------------------------------------------- -DROP TABLE IF EXISTS "recipe_has_recipe_types" ; +DROP TABLE IF EXISTS "public"."recipe_has_recipe_types" ; -CREATE TABLE IF NOT EXISTS "recipe_has_recipe_types" ( +CREATE TABLE IF NOT EXISTS "public"."recipe_has_recipe_types" ( "recipe_id" INT NOT NULL , "recipe_type_id" INT NOT NULL , PRIMARY KEY ("recipe_id", "recipe_type_id") , CONSTRAINT "recipe_type_id" FOREIGN KEY ("recipe_id" ) - REFERENCES "recipe" ("id" ) + REFERENCES "public"."recipe" ("id" ) ON DELETE NO ACTION ON UPDATE NO ACTION, CONSTRAINT "recipe_id" FOREIGN KEY ("recipe_type_id" ) - REFERENCES "recipe_type" ("id" ) + REFERENCES "public"."recipe_type" ("id" ) ON DELETE NO ACTION ON UPDATE NO ACTION); +ALTER TABLE "public"."recipe_has_recipe_types" OWNER TO liolio; -- ----------------------------------------------------- -- Table "recipe_has_recipe_methods" -- ----------------------------------------------------- -DROP TABLE IF EXISTS "recipe_has_recipe_methods" ; +DROP TABLE IF EXISTS "public"."recipe_has_recipe_methods" ; -CREATE TABLE IF NOT EXISTS "recipe_has_recipe_methods" ( +CREATE TABLE IF NOT EXISTS "public"."recipe_has_recipe_methods" ( "recipe_id" INT NOT NULL , "recipe_method_id" INT NOT NULL , PRIMARY KEY ("recipe_id", "recipe_method_id") , CONSTRAINT "recipe_method_id" FOREIGN KEY ("recipe_id" ) - REFERENCES "recipe" ("id" ) + REFERENCES "public"."recipe" ("id" ) ON DELETE NO ACTION ON UPDATE NO ACTION, CONSTRAINT "recipe_id" FOREIGN KEY ("recipe_method_id" ) - REFERENCES "recipe_method" ("id" ) + REFERENCES "public"."recipe_method" ("id" ) ON DELETE NO ACTION ON UPDATE NO ACTION); +ALTER TABLE "public"."recipe_has_recipe_methods" OWNER TO liolio; -- ----------------------------------------------------- -- Table "address" -- ----------------------------------------------------- -DROP TABLE IF EXISTS "address" ; -CREATE SEQUENCE address_id_seq; +DROP TABLE IF EXISTS "public"."address" ; +CREATE SEQUENCE "public".address_id_seq; +ALTER SEQUENCE "public".address_id_seq OWNER TO liolio; -CREATE TABLE IF NOT EXISTS "address" ( +CREATE TABLE IF NOT EXISTS "public"."address" ( "id" INT NOT NULL DEFAULT nextval('address_id_seq') , "user_id" INT NOT NULL , "street" VARCHAR(45) NOT NULL , @@ -198,18 +220,20 @@ CREATE TABLE IF NOT EXISTS "address" ( CONSTRAINT "user_id" FOREIGN KEY ("user_id" ) - REFERENCES "user" ("id" ) + REFERENCES "public"."user" ("id" ) ON DELETE NO ACTION ON UPDATE NO ACTION); +ALTER TABLE "public"."address" OWNER TO liolio; -- ----------------------------------------------------- -- Table "phone" -- ----------------------------------------------------- -DROP TABLE IF EXISTS "phone" ; -CREATE SEQUENCE phone_id_seq; +DROP TABLE IF EXISTS "public"."phone" ; +CREATE SEQUENCE "public".phone_id_seq; +ALTER SEQUENCE "public".phone_id_seq OWNER TO liolio; -CREATE TABLE IF NOT EXISTS "phone" ( +CREATE TABLE IF NOT EXISTS "public"."phone" ( "id" INT NOT NULL DEFAULT nextval('phone_id_seq') , "user_id" INT NOT NULL , "mobile" VARCHAR(45) NOT NULL , @@ -217,91 +241,103 @@ CREATE TABLE IF NOT EXISTS "phone" ( CONSTRAINT "user_id" FOREIGN KEY ("user_id" ) - REFERENCES "user" ("id" ) + REFERENCES "public"."user" ("id" ) ON DELETE NO ACTION ON UPDATE NO ACTION); +ALTER TABLE "public"."phone" OWNER TO liolio; -- ----------------------------------------------------- -- Table "car" -- ----------------------------------------------------- -DROP TABLE IF EXISTS "car" ; -CREATE SEQUENCE car_id_seq; +DROP TABLE IF EXISTS "public"."car" ; +CREATE SEQUENCE "public".car_id_seq; +ALTER SEQUENCE "public".car_id_seq OWNER TO liolio; -CREATE TABLE IF NOT EXISTS "car" ( +CREATE TABLE IF NOT EXISTS "public"."car" ( "id" INT NOT NULL DEFAULT nextval('car_id_seq') , "model" VARCHAR(45) NOT NULL , PRIMARY KEY ("id") ); +ALTER TABLE "public"."car" OWNER TO liolio; -- ----------------------------------------------------- -- Table "repair" -- ----------------------------------------------------- -DROP TABLE IF EXISTS "repair" ; -CREATE SEQUENCE repair_id_seq; +DROP TABLE IF EXISTS "public"."repair" ; +CREATE SEQUENCE "public".repair_id_seq; +ALTER SEQUENCE "public".repair_id_seq OWNER TO liolio; -CREATE TABLE IF NOT EXISTS "repair" ( +CREATE TABLE IF NOT EXISTS "public"."repair" ( "id" INT NOT NULL DEFAULT nextval('repair_id_seq') , "car_id" INT NOT NULL , "date" DATE NOT NULL , PRIMARY KEY ("id") , CONSTRAINT "car_id" FOREIGN KEY ("car_id" ) - REFERENCES "car" ("id" ) + REFERENCES "public"."car" ("id" ) ON DELETE NO ACTION ON UPDATE NO ACTION); +ALTER TABLE "public"."repair" OWNER TO liolio; -- ----------------------------------------------------- -- Table "driver" -- ----------------------------------------------------- -DROP TABLE IF EXISTS "driver" ; -CREATE SEQUENCE driver_id_seq; +DROP TABLE IF EXISTS "public"."driver" ; +CREATE SEQUENCE "public".driver_id_seq; +ALTER SEQUENCE "public".driver_id_seq OWNER TO liolio; -CREATE TABLE IF NOT EXISTS "driver" ( +CREATE TABLE IF NOT EXISTS "public"."driver" ( "id" INT NOT NULL DEFAULT nextval('driver_id_seq') , "car_id" INT NOT NULL , "name" VARCHAR(45) NOT NULL , PRIMARY KEY ("id") , CONSTRAINT "car_id" FOREIGN KEY ("car_id" ) - REFERENCES "car" ("id" ) + REFERENCES "public"."car" ("id" ) ON DELETE NO ACTION ON UPDATE NO ACTION); +ALTER TABLE "public"."driver" OWNER TO liolio; -- ----------------------------------------------------- -- Table "controls_otm_single" -- ----------------------------------------------------- -DROP TABLE IF EXISTS "controls_otm_single" ; -CREATE SEQUENCE controls_otm_single_id_seq; +DROP TABLE IF EXISTS "public"."controls_otm_single" ; +CREATE SEQUENCE "public".controls_otm_single_id_seq; +ALTER SEQUENCE "public".controls_otm_single_id_seq OWNER TO liolio; -CREATE TABLE IF NOT EXISTS "controls_otm_single" ( +CREATE TABLE IF NOT EXISTS "public"."controls_otm_single" ( "id" INT NOT NULL DEFAULT nextval('controls_otm_single_id_seq'), "name" VARCHAR(45) NOT NULL, PRIMARY KEY ("id")); +ALTER TABLE "public"."controls_otm_single" OWNER TO liolio; -- ----------------------------------------------------- -- Table "controls_otm_multiple" -- ----------------------------------------------------- -DROP TABLE IF EXISTS "controls_otm_multiple" ; -CREATE SEQUENCE controls_otm_multiple_id_seq; +DROP TABLE IF EXISTS "public"."controls_otm_multiple" ; +CREATE SEQUENCE "public".controls_otm_multiple_id_seq; +ALTER SEQUENCE "public".controls_otm_multiple_id_seq OWNER TO liolio; -CREATE TABLE IF NOT EXISTS "controls_otm_multiple" ( +CREATE TABLE IF NOT EXISTS "public"."controls_otm_multiple" ( "id" INT NOT NULL DEFAULT nextval('controls_otm_multiple_id_seq'), "first" VARCHAR(45) NOT NULL, "last" VARCHAR(45) NULL, PRIMARY KEY ("id")); +ALTER TABLE "public"."controls_otm_multiple" OWNER TO liolio; -- ----------------------------------------------------- -- Table "controls" -- ----------------------------------------------------- -DROP TABLE IF EXISTS "controls" ; -CREATE SEQUENCE controls_id_seq; +DROP TABLE IF EXISTS "public"."controls" ; +CREATE SEQUENCE "public".controls_id_seq; +ALTER SEQUENCE "public".controls_id_seq OWNER TO liolio; -CREATE TABLE IF NOT EXISTS "controls" ( +CREATE TABLE IF NOT EXISTS "public"."controls" ( "id" INT NOT NULL DEFAULT nextval('controls_id_seq'), "controls_otm_single_id" INT NULL, "controls_otm_multiple_id" INT NULL, @@ -319,115 +355,128 @@ CREATE TABLE IF NOT EXISTS "controls" ( PRIMARY KEY ("id"), CONSTRAINT "controls_otm_single_id" FOREIGN KEY ("controls_otm_single_id") - REFERENCES "controls_otm_single" ("id") + REFERENCES "public"."controls_otm_single" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION, CONSTRAINT "controls_otm_multiple_id" FOREIGN KEY ("controls_otm_multiple_id") - REFERENCES "controls_otm_multiple" ("id") + REFERENCES "public"."controls_otm_multiple" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION); +ALTER TABLE "public"."controls" OWNER TO liolio; -- ----------------------------------------------------- -- Table "controls_mtm_single" -- ----------------------------------------------------- -DROP TABLE IF EXISTS "controls_mtm_single" ; -CREATE SEQUENCE controls_mtm_single_id_seq; +DROP TABLE IF EXISTS "public"."controls_mtm_single" ; +CREATE SEQUENCE "public".controls_mtm_single_id_seq; +ALTER SEQUENCE "public".controls_mtm_single_id_seq OWNER TO liolio; -CREATE TABLE IF NOT EXISTS "controls_mtm_single" ( +CREATE TABLE IF NOT EXISTS "public"."controls_mtm_single" ( "id" INT NOT NULL DEFAULT nextval('controls_mtm_single_id_seq'), "name" VARCHAR(45) NOT NULL, PRIMARY KEY ("id")); +ALTER TABLE "public"."controls_mtm_single" OWNER TO liolio; -- ----------------------------------------------------- -- Table "controls_mtm_multiple" -- ----------------------------------------------------- -DROP TABLE IF EXISTS "controls_mtm_multiple" ; -CREATE SEQUENCE controls_mtm_multiple_id_seq; +DROP TABLE IF EXISTS "public"."controls_mtm_multiple" ; +CREATE SEQUENCE "public".controls_mtm_multiple_id_seq; +ALTER SEQUENCE "public".controls_mtm_multiple_id_seq OWNER TO liolio; -CREATE TABLE IF NOT EXISTS "controls_mtm_multiple" ( +CREATE TABLE IF NOT EXISTS "public"."controls_mtm_multiple" ( "id" INT NOT NULL DEFAULT nextval('controls_mtm_multiple_id_seq'), "first" VARCHAR(45) NOT NULL, "last" VARCHAR(45) NULL, PRIMARY KEY ("id")); +ALTER TABLE "public"."controls_mtm_multiple" OWNER TO liolio; -- ----------------------------------------------------- -- Table "controls_has_controls_mtm_single" -- ----------------------------------------------------- -DROP TABLE IF EXISTS "controls_has_controls_mtm_single" ; +DROP TABLE IF EXISTS "public"."controls_has_controls_mtm_single" ; +ALTER SEQUENCE "public"."controls_has_controls_mtm_single" OWNER TO liolio; -CREATE TABLE IF NOT EXISTS "controls_has_controls_mtm_single" ( +CREATE TABLE IF NOT EXISTS "public"."controls_has_controls_mtm_single" ( "controls_id" INT NOT NULL, "controls_mtm_single_id" INT NOT NULL, PRIMARY KEY ("controls_id", "controls_mtm_single_id"), CONSTRAINT "controls_id" FOREIGN KEY ("controls_id") - REFERENCES "controls" ("id") + REFERENCES "public"."controls" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION, CONSTRAINT "controls_mtm_single_id" FOREIGN KEY ("controls_mtm_single_id") - REFERENCES "controls_mtm_single" ("id") + REFERENCES "public"."controls_mtm_single" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION); +ALTER TABLE "public"."controls_has_controls_mtm_single" OWNER TO liolio; -- ----------------------------------------------------- -- Table "controls_has_controls_mtm_multiple" -- ----------------------------------------------------- -DROP TABLE IF EXISTS "controls_has_controls_mtm_multiple" ; +DROP TABLE IF EXISTS "public"."controls_has_controls_mtm_multiple" ; -CREATE TABLE IF NOT EXISTS "controls_has_controls_mtm_multiple" ( +CREATE TABLE IF NOT EXISTS "public"."controls_has_controls_mtm_multiple" ( "controls_id" INT NOT NULL, "controls_mtm_multiple_id" INT NOT NULL, PRIMARY KEY ("controls_id", "controls_mtm_multiple_id"), CONSTRAINT "controls_id" FOREIGN KEY ("controls_id") - REFERENCES "controls" ("id") + REFERENCES "public"."controls" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION, CONSTRAINT "controls_mtm_multiple_id" FOREIGN KEY ("controls_mtm_multiple_id") - REFERENCES "controls_mtm_multiple" ("id") + REFERENCES "public"."controls_mtm_multiple" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION); +ALTER TABLE "public"."controls_has_controls_mtm_multiple" OWNER TO liolio; -- ----------------------------------------------------- -- Table "controls_inline_otm_single" -- ----------------------------------------------------- -DROP TABLE IF EXISTS "controls_inline_otm_single" ; -CREATE SEQUENCE controls_inline_otm_single_id_seq; +DROP TABLE IF EXISTS "public"."controls_inline_otm_single" ; +CREATE SEQUENCE "public".controls_inline_otm_single_id_seq; +ALTER SEQUENCE "public".controls_inline_otm_single_id_seq OWNER TO liolio; -CREATE TABLE IF NOT EXISTS "controls_inline_otm_single" ( +CREATE TABLE IF NOT EXISTS "public"."controls_inline_otm_single" ( "id" INT NOT NULL DEFAULT nextval('controls_inline_otm_single_id_seq'), "name" VARCHAR(45) NOT NULL, PRIMARY KEY ("id")); +ALTER TABLE "public"."controls_inline_otm_single" OWNER TO liolio; -- ----------------------------------------------------- -- Table "controls_inline_otm_multiple" -- ----------------------------------------------------- -DROP TABLE IF EXISTS "controls_inline_otm_multiple" ; -CREATE SEQUENCE controls_inline_otm_multiple_id_seq; +DROP TABLE IF EXISTS "public"."controls_inline_otm_multiple" ; +CREATE SEQUENCE "public".controls_inline_otm_multiple_id_seq; +ALTER SEQUENCE "public"."controls_inline_otm_multiple" OWNER TO liolio; -CREATE TABLE IF NOT EXISTS "controls_inline_otm_multiple" ( +CREATE TABLE IF NOT EXISTS "public"."controls_inline_otm_multiple" ( "id" INT NOT NULL DEFAULT nextval('controls_inline_otm_multiple_id_seq'), "first" VARCHAR(45) NOT NULL, "last" VARCHAR(45) NULL, PRIMARY KEY ("id")); +ALTER TABLE "public"."controls_inline_otm_multiple" OWNER TO liolio; -- ----------------------------------------------------- -- Table "controls_inline" -- ----------------------------------------------------- -DROP TABLE IF EXISTS "controls_inline" ; -CREATE SEQUENCE controls_inline_id_seq; +DROP TABLE IF EXISTS "public"."controls_inline" ; +CREATE SEQUENCE "public".controls_inline_id_seq; +ALTER SEQUENCE "public".controls_inline_id_seq OWNER TO liolio; -CREATE TABLE IF NOT EXISTS "controls_inline" ( +CREATE TABLE IF NOT EXISTS "public"."controls_inline" ( "id" INT NOT NULL DEFAULT nextval('controls_inline_id_seq'), "controls_id" INT NOT NULL, "controls_inline_otm_single_id" INT NOT NULL, @@ -446,83 +495,90 @@ CREATE TABLE IF NOT EXISTS "controls_inline" ( PRIMARY KEY ("id"), CONSTRAINT "controls_inline_otm_single_id" FOREIGN KEY ("controls_inline_otm_single_id") - REFERENCES "controls_inline_otm_single" ("id") + REFERENCES "public"."controls_inline_otm_single" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION, CONSTRAINT "controls_inline_otm_multiple_id" FOREIGN KEY ("controls_inline_otm_multiple_id") - REFERENCES "controls_inline_otm_multiple" ("id") + REFERENCES "public"."controls_inline_otm_multiple" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION, CONSTRAINT "controls_id" FOREIGN KEY ("controls_id") - REFERENCES "controls" ("id") + REFERENCES "public"."controls" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION); +ALTER TABLE "public"."controls_inline" OWNER TO liolio; -- ----------------------------------------------------- -- Table "controls_inline_mtm_single" -- ----------------------------------------------------- -DROP TABLE IF EXISTS "controls_inline_mtm_single" ; -CREATE SEQUENCE controls_inline_mtm_single_id_seq; +DROP TABLE IF EXISTS "public"."controls_inline_mtm_single" ; +CREATE SEQUENCE "public".controls_inline_mtm_single_id_seq; +ALTER SEQUENCE "public".controls_inline_mtm_single_id_seq OWNER TO liolio; -CREATE TABLE IF NOT EXISTS "controls_inline_mtm_single" ( +CREATE TABLE IF NOT EXISTS "public"."controls_inline_mtm_single" ( "id" INT NOT NULL DEFAULT nextval('controls_inline_mtm_single_id_seq'), "name" VARCHAR(45) NOT NULL, PRIMARY KEY ("id")); +ALTER TABLE "public"."controls_inline_mtm_single" OWNER TO liolio; -- ----------------------------------------------------- -- Table "controls_inline_mtm_multiple" -- ----------------------------------------------------- -DROP TABLE IF EXISTS "controls_inline_mtm_multiple" ; -CREATE SEQUENCE controls_inline_mtm_multiple_id_seq; +DROP TABLE IF EXISTS "public"."controls_inline_mtm_multiple" ; +CREATE SEQUENCE "public".controls_inline_mtm_multiple_id_seq; +ALTER SEQUENCE "public".controls_inline_mtm_multiple_id_seq OWNER TO liolio; -CREATE TABLE IF NOT EXISTS "controls_inline_mtm_multiple" ( +CREATE TABLE IF NOT EXISTS "public"."controls_inline_mtm_multiple" ( "id" INT NOT NULL DEFAULT nextval('controls_inline_mtm_multiple_id_seq'), "first" VARCHAR(45) NOT NULL, "last" VARCHAR(45) NULL, PRIMARY KEY ("id")); +ALTER TABLE "public"."controls_inline_mtm_multiple" OWNER TO liolio; -- ----------------------------------------------------- -- Table "controls_inline_has_controls_inline_mtm_single" -- ----------------------------------------------------- -DROP TABLE IF EXISTS "controls_inline_has_controls_inline_mtm_single" ; +DROP TABLE IF EXISTS "public"."controls_inline_has_controls_inline_mtm_single" ; -CREATE TABLE IF NOT EXISTS "controls_inline_has_controls_inline_mtm_single" ( +CREATE TABLE IF NOT EXISTS "public"."controls_inline_has_controls_inline_mtm_single" ( "controls_inline_id" INT NOT NULL, "controls_inline_mtm_single_id" INT NOT NULL, PRIMARY KEY ("controls_inline_id", "controls_inline_mtm_single_id"), CONSTRAINT "controls_inline_id" FOREIGN KEY ("controls_inline_id") - REFERENCES "controls_inline" ("id") + REFERENCES "public"."controls_inline" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION, CONSTRAINT "controls_inline_mtm_single_id" FOREIGN KEY ("controls_inline_mtm_single_id") - REFERENCES "controls_inline_mtm_single" ("id") + REFERENCES "public"."controls_inline_mtm_single" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION); +ALTER TABLE "public"."controls_inline_has_controls_inline_mtm_single" OWNER TO liolio; -- ----------------------------------------------------- -- Table "controls_inline_has_controls_inline_mtm_multiple" -- ----------------------------------------------------- -DROP TABLE IF EXISTS "controls_inline_has_controls_inline_mtm_multiple" ; +DROP TABLE IF EXISTS "public"."controls_inline_has_controls_inline_mtm_multiple" ; -CREATE TABLE IF NOT EXISTS "controls_inline_has_controls_inline_mtm_multiple" ( +CREATE TABLE IF NOT EXISTS "public"."controls_inline_has_controls_inline_mtm_multiple" ( "controls_inline_id" INT NOT NULL, "controls_inline_mtm_multiple_id" INT NOT NULL, PRIMARY KEY ("controls_inline_id", "controls_inline_mtm_multiple_id"), CONSTRAINT "controls_inline_id" FOREIGN KEY ("controls_inline_id") - REFERENCES "controls_inline" ("id") + REFERENCES "public"."controls_inline" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION, CONSTRAINT "controls_inline_mtm_multiple_id" FOREIGN KEY ("controls_inline_mtm_multiple_id") - REFERENCES "controls_inline_mtm_multiple" ("id") + REFERENCES "public"."controls_inline_mtm_multiple" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION); +ALTER TABLE "public"."controls_inline_has_controls_inline_mtm_multiple" OWNER TO liolio; diff --git a/package.json b/package.json index f28b59d..2126505 100644 --- a/package.json +++ b/package.json @@ -1,23 +1,26 @@ { - "name": "express-admin-examples", - "version": "1.0.0", - "description": "Examples for Express Admin.", - "license" : "MIT", - "homepage" : "https://github.com/simov/express-admin-examples", - "author": { - "name" : "simo", - "email" : "simeonvelichkov@gmail.com" - }, - "repository": { - "type" : "git", - "url" : "git://github.com/simov/express-admin-examples.git" - }, - "dependencies": { - "express" : "3.4.4", - "moment" : "*", - "cloudinary" : "*" - }, - "scripts": { - "postinstall": "node path.js" - } -} \ No newline at end of file + "name": "express-admin-examples", + "version": "1.0.0", + "description": "Examples for Express Admin.", + "license": "MIT", + "homepage": "https://github.com/simov/express-admin-examples", + "author": { + "name": "simo", + "email": "simeonvelichkov@gmail.com" + }, + "repository": { + "type": "git", + "url": "git://github.com/simov/express-admin-examples.git" + }, + "dependencies": { + "express": "~3.4.4", + "express-admin": "~1.2.6", + "moment": "*", + "cloudinary": "*", + "pg": "*", + "util": "^0.10.3" + }, + "scripts": { + "postinstall": "node path.js" + } +} diff --git a/path.js b/path.js index 32753d2..54f264e 100644 --- a/path.js +++ b/path.js @@ -1,10 +1,19 @@ #!/usr/bin/env node var fs = require('fs'), - path = require('path'); + path = require('path'), + util = require('util'); ['mysql', 'pg', 'sqlite'].forEach(function (engine) { - var fpath = path.join(__dirname, './config/', engine, '/custom.json'); + console.error( util.inspect(process.env) +"\n" ); + + var cwd = (process.env.OS.match(/Windows/) !== null)? + __dirname.replace(/\\/g, "/"): + __dirname; + + console.error( "CWD: "+ cwd +"\n" ); + + var fpath = path.join(cwd, './config/', engine, '/custom.json'); var data = fs.readFileSync(fpath, 'utf8'); fs.writeFileSync(fpath, From 91da7761030019c7fa0ab6509b6f823e7bf856a6 Mon Sep 17 00:00:00 2001 From: John Hall Date: Tue, 9 Jun 2015 16:08:16 -0700 Subject: [PATCH 2/8] update readme for running examples with pg database on windows --- README.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/README.md b/README.md index 2258fa4..0049cbe 100644 --- a/README.md +++ b/README.md @@ -41,9 +41,14 @@ grant all on all sequences in schema "public" to liolio; # MySQL $ mysql -p --user=root 'express-admin-examples' < fixtures/mysql/schema.sql $ mysql -p --user=root 'express-admin-examples' < fixtures/mysql/insert.sql + # PostgreSQL $ sudo -u postgres psql 'express-admin-examples' < fixtures/pg/schema.sql $ sudo -u postgres psql 'express-admin-examples' < fixtures/pg/insert.sql +#... on Windows +psql -U postgres express-admin-examples < fixtures/pg/schema.sql +psql -U postgres express-admin-examples < fixtures/pg/insert.sql + # SQLite $ node fixtures/sqlite/import.js ``` @@ -53,8 +58,12 @@ For SQLite you need to change the path to the database inside `config/sqlite/con ```bash # MySQL $ admin config/mysql/ + # PostgreSQL $ admin config/pg/ +# ... locally installed, on windows +node_modules\.bin\admin config/pg + # SQLite $ admin config/sqlite/ ``` From 67aec157250a10ca4ecbb10e8f2e0702391d71f5 Mon Sep 17 00:00:00 2001 From: John Hall Date: Wed, 10 Jun 2015 09:12:34 -0700 Subject: [PATCH 3/8] revert example config files --- README.md | 8 ++------ config/mysql/custom.json | 22 +++++++++++----------- config/pg/custom.json | 22 +++++++++++----------- config/sqlite/custom.json | 22 +++++++++++----------- package.json | 2 +- path.js | 3 ++- 6 files changed, 38 insertions(+), 41 deletions(-) diff --git a/README.md b/README.md index 0049cbe..94db61b 100644 --- a/README.md +++ b/README.md @@ -28,10 +28,6 @@ create database "express-admin-examples"; -- create schema 'name'; (default: 'public') create user liolio with password 'karamba'; grant all on database "express-admin-examples" to liolio; --- public schema by default -grant all on schema "public" to liolio; -grant all on all tables in schema "public" to liolio; -grant all on all sequences in schema "public" to liolio; ``` @@ -45,7 +41,7 @@ $ mysql -p --user=root 'express-admin-examples' < fixtures/mysql/insert.sql # PostgreSQL $ sudo -u postgres psql 'express-admin-examples' < fixtures/pg/schema.sql $ sudo -u postgres psql 'express-admin-examples' < fixtures/pg/insert.sql -#... on Windows +# ... on Windows psql -U postgres express-admin-examples < fixtures/pg/schema.sql psql -U postgres express-admin-examples < fixtures/pg/insert.sql @@ -61,7 +57,7 @@ $ admin config/mysql/ # PostgreSQL $ admin config/pg/ -# ... locally installed, on windows +# ... locally installed, on Windows node_modules\.bin\admin config/pg # SQLite diff --git a/config/mysql/custom.json b/config/mysql/custom.json index ce6d21a..fa0e46c 100644 --- a/config/mysql/custom.json +++ b/config/mysql/custom.json @@ -1,7 +1,7 @@ { "editors": { "app": { - "path": "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/editors/app.js", + "path": "/home/mighty/node/modules/express-admin-examples/config/custom/editors/app.js", "slug": "upload" }, "public": { @@ -11,7 +11,7 @@ ] }, "local": { - "path": "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/editors", + "path": "/home/mighty/node/modules/express-admin-examples/config/custom/editors", "js": [ "/jslib/tinymce/js/tinymce/tinymce.min.js", "/jslib/tinymce/js/tinymce/jquery.tinymce.min.js", @@ -22,7 +22,7 @@ }, "view1": { "app": { - "path": "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/app1/app.js", + "path": "/home/mighty/node/modules/express-admin-examples/config/custom/app1/app.js", "slug": "view1", "verbose": "Simple", "mainview": { @@ -32,7 +32,7 @@ }, "view2": { "app": { - "path" : "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/app2/app.js", + "path" : "/home/mighty/node/modules/express-admin-examples/config/custom/app2/app.js", "slug": "view2", "verbose": "Custom global static files", "mainview": { @@ -41,7 +41,7 @@ }, "public": { "local": { - "path": "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/app2/public", + "path": "/home/mighty/node/modules/express-admin-examples/config/custom/app2/public", "css": [ "/css/global.css" ], @@ -53,7 +53,7 @@ }, "view3": { "app": { - "path" : "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/app3/app.js", + "path" : "/home/mighty/node/modules/express-admin-examples/config/custom/app3/app.js", "slug": "view3", "verbose": "Custom local static files", "mainview": { @@ -62,13 +62,13 @@ }, "public": { "local": { - "path": "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/app3/public" + "path": "/home/mighty/node/modules/express-admin-examples/config/custom/app3/public" } } }, "view4": { "app": { - "path" : "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/app4/app.js", + "path" : "/home/mighty/node/modules/express-admin-examples/config/custom/app4/app.js", "slug": "view4", "verbose": "Breadcrumbs", "mainview": { @@ -78,7 +78,7 @@ }, "stats": { "app": { - "path" : "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/highcharts/app.js", + "path" : "/home/mighty/node/modules/express-admin-examples/config/custom/highcharts/app.js", "slug": "stats", "verbose": "Highcharts Statistics", "mainview": { @@ -89,7 +89,7 @@ "static": { "public": { "local": { - "path": "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/static", + "path": "/home/mighty/node/modules/express-admin-examples/config/custom/static", "js": [ "/mtm-tags.js", "/theme.js", @@ -100,6 +100,6 @@ } }, "events": { - "events": "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/events/events.js" + "events": "/home/mighty/node/modules/express-admin-examples/config/custom/events/events.js" } } \ No newline at end of file diff --git a/config/pg/custom.json b/config/pg/custom.json index 77cfb27..cf999bd 100644 --- a/config/pg/custom.json +++ b/config/pg/custom.json @@ -1,7 +1,7 @@ { "editors": { "app": { - "path": "C:/Users/revlin/Projects/maponics-source/express-admin-examples/config/custom/editors/app.js", + "path": "/home/mighty/node/modules/express-admin-examples/config/custom/editors/app.js", "slug": "upload" }, "public": { @@ -11,7 +11,7 @@ ] }, "local": { - "path": "C:/Users/revlin/Projects/maponics-source/express-admin-examples/config/custom/editors", + "path": "/home/mighty/node/modules/express-admin-examples/config/custom/editors", "js": [ "/jslib/tinymce/js/tinymce/tinymce.min.js", "/jslib/tinymce/js/tinymce/jquery.tinymce.min.js", @@ -22,7 +22,7 @@ }, "view1": { "app": { - "path": "C:/Users/revlin/Projects/maponics-source/express-admin-examples/config/custom/app1/app.js", + "path": "/home/mighty/node/modules/express-admin-examples/config/custom/app1/app.js", "slug": "view1", "verbose": "Simple", "mainview": { @@ -32,7 +32,7 @@ }, "view2": { "app": { - "path" : "C:/Users/revlin/Projects/maponics-source/express-admin-examples/config/custom/app2/app.js", + "path" : "/home/mighty/node/modules/express-admin-examples/config/custom/app2/app.js", "slug": "view2", "verbose": "Custom global static files", "mainview": { @@ -40,7 +40,7 @@ } }, "public": { - "path": "C:/Users/revlin/Projects/maponics-source/express-admin-examples/config/custom/app2/public", + "path": "/home/mighty/node/modules/express-admin-examples/config/custom/app2/public", "css": [ "/css/global.css" ], @@ -51,7 +51,7 @@ }, "view3": { "app": { - "path" : "C:/Users/revlin/Projects/maponics-source/express-admin-examples/config/custom/app3/app.js", + "path" : "/home/mighty/node/modules/express-admin-examples/config/custom/app3/app.js", "slug": "view3", "verbose": "Custom local static files", "mainview": { @@ -59,12 +59,12 @@ } }, "public": { - "path": "C:/Users/revlin/Projects/maponics-source/express-admin-examples/config/custom/app3/public" + "path": "/home/mighty/node/modules/express-admin-examples/config/custom/app3/public" } }, "view4": { "app": { - "path" : "C:/Users/revlin/Projects/maponics-source/express-admin-examples/config/custom/app4/app.js", + "path" : "/home/mighty/node/modules/express-admin-examples/config/custom/app4/app.js", "slug": "view4", "verbose": "Breadcrumbs", "mainview": { @@ -74,7 +74,7 @@ }, "stats": { "app": { - "path" : "C:/Users/revlin/Projects/maponics-source/express-admin-examples/config/custom/highcharts/app.js", + "path" : "/home/mighty/node/modules/express-admin-examples/config/custom/highcharts/app.js", "slug": "stats", "verbose": "Highcharts Statistics", "mainview": { @@ -85,7 +85,7 @@ "static": { "public": { "local": { - "path": "C:/Users/revlin/Projects/maponics-source/express-admin-examples/config/custom/static", + "path": "/home/mighty/node/modules/express-admin-examples/config/custom/static", "js": [ "/mtm-tags.js", "/theme.js", @@ -96,6 +96,6 @@ } }, "events": { - "events": "C:/Users/revlin/Projects/maponics-source/express-admin-examples/config/custom/events/events.js" + "events": "/home/mighty/node/modules/express-admin-examples/config/custom/events/events.js" } } \ No newline at end of file diff --git a/config/sqlite/custom.json b/config/sqlite/custom.json index ce6d21a..fa0e46c 100644 --- a/config/sqlite/custom.json +++ b/config/sqlite/custom.json @@ -1,7 +1,7 @@ { "editors": { "app": { - "path": "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/editors/app.js", + "path": "/home/mighty/node/modules/express-admin-examples/config/custom/editors/app.js", "slug": "upload" }, "public": { @@ -11,7 +11,7 @@ ] }, "local": { - "path": "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/editors", + "path": "/home/mighty/node/modules/express-admin-examples/config/custom/editors", "js": [ "/jslib/tinymce/js/tinymce/tinymce.min.js", "/jslib/tinymce/js/tinymce/jquery.tinymce.min.js", @@ -22,7 +22,7 @@ }, "view1": { "app": { - "path": "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/app1/app.js", + "path": "/home/mighty/node/modules/express-admin-examples/config/custom/app1/app.js", "slug": "view1", "verbose": "Simple", "mainview": { @@ -32,7 +32,7 @@ }, "view2": { "app": { - "path" : "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/app2/app.js", + "path" : "/home/mighty/node/modules/express-admin-examples/config/custom/app2/app.js", "slug": "view2", "verbose": "Custom global static files", "mainview": { @@ -41,7 +41,7 @@ }, "public": { "local": { - "path": "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/app2/public", + "path": "/home/mighty/node/modules/express-admin-examples/config/custom/app2/public", "css": [ "/css/global.css" ], @@ -53,7 +53,7 @@ }, "view3": { "app": { - "path" : "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/app3/app.js", + "path" : "/home/mighty/node/modules/express-admin-examples/config/custom/app3/app.js", "slug": "view3", "verbose": "Custom local static files", "mainview": { @@ -62,13 +62,13 @@ }, "public": { "local": { - "path": "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/app3/public" + "path": "/home/mighty/node/modules/express-admin-examples/config/custom/app3/public" } } }, "view4": { "app": { - "path" : "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/app4/app.js", + "path" : "/home/mighty/node/modules/express-admin-examples/config/custom/app4/app.js", "slug": "view4", "verbose": "Breadcrumbs", "mainview": { @@ -78,7 +78,7 @@ }, "stats": { "app": { - "path" : "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/highcharts/app.js", + "path" : "/home/mighty/node/modules/express-admin-examples/config/custom/highcharts/app.js", "slug": "stats", "verbose": "Highcharts Statistics", "mainview": { @@ -89,7 +89,7 @@ "static": { "public": { "local": { - "path": "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/static", + "path": "/home/mighty/node/modules/express-admin-examples/config/custom/static", "js": [ "/mtm-tags.js", "/theme.js", @@ -100,6 +100,6 @@ } }, "events": { - "events": "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/events/events.js" + "events": "/home/mighty/node/modules/express-admin-examples/config/custom/events/events.js" } } \ No newline at end of file diff --git a/package.json b/package.json index 2126505..ee224b0 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "moment": "*", "cloudinary": "*", "pg": "*", - "util": "^0.10.3" + "util": "*" }, "scripts": { "postinstall": "node path.js" diff --git a/path.js b/path.js index 54f264e..cabc8eb 100644 --- a/path.js +++ b/path.js @@ -1,8 +1,9 @@ #!/usr/bin/env node +'use strict'; var fs = require('fs'), path = require('path'), - util = require('util'); + util = require('util'); ['mysql', 'pg', 'sqlite'].forEach(function (engine) { console.error( util.inspect(process.env) +"\n" ); From ea194965812f26917ca95bc53a5d5e4e3d24d2c5 Mon Sep 17 00:00:00 2001 From: John Hall Date: Wed, 10 Jun 2015 09:43:12 -0700 Subject: [PATCH 4/8] fix some refs in pg insert sql and fix path setings for windows --- config/mysql/custom.json | 22 +++++++++++----------- config/pg/custom.json | 22 +++++++++++----------- config/sqlite/custom.json | 22 +++++++++++----------- fixtures/pg/insert.sql | 6 +++--- path.js | 2 +- 5 files changed, 37 insertions(+), 37 deletions(-) diff --git a/config/mysql/custom.json b/config/mysql/custom.json index fa0e46c..ce6d21a 100644 --- a/config/mysql/custom.json +++ b/config/mysql/custom.json @@ -1,7 +1,7 @@ { "editors": { "app": { - "path": "/home/mighty/node/modules/express-admin-examples/config/custom/editors/app.js", + "path": "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/editors/app.js", "slug": "upload" }, "public": { @@ -11,7 +11,7 @@ ] }, "local": { - "path": "/home/mighty/node/modules/express-admin-examples/config/custom/editors", + "path": "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/editors", "js": [ "/jslib/tinymce/js/tinymce/tinymce.min.js", "/jslib/tinymce/js/tinymce/jquery.tinymce.min.js", @@ -22,7 +22,7 @@ }, "view1": { "app": { - "path": "/home/mighty/node/modules/express-admin-examples/config/custom/app1/app.js", + "path": "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/app1/app.js", "slug": "view1", "verbose": "Simple", "mainview": { @@ -32,7 +32,7 @@ }, "view2": { "app": { - "path" : "/home/mighty/node/modules/express-admin-examples/config/custom/app2/app.js", + "path" : "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/app2/app.js", "slug": "view2", "verbose": "Custom global static files", "mainview": { @@ -41,7 +41,7 @@ }, "public": { "local": { - "path": "/home/mighty/node/modules/express-admin-examples/config/custom/app2/public", + "path": "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/app2/public", "css": [ "/css/global.css" ], @@ -53,7 +53,7 @@ }, "view3": { "app": { - "path" : "/home/mighty/node/modules/express-admin-examples/config/custom/app3/app.js", + "path" : "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/app3/app.js", "slug": "view3", "verbose": "Custom local static files", "mainview": { @@ -62,13 +62,13 @@ }, "public": { "local": { - "path": "/home/mighty/node/modules/express-admin-examples/config/custom/app3/public" + "path": "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/app3/public" } } }, "view4": { "app": { - "path" : "/home/mighty/node/modules/express-admin-examples/config/custom/app4/app.js", + "path" : "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/app4/app.js", "slug": "view4", "verbose": "Breadcrumbs", "mainview": { @@ -78,7 +78,7 @@ }, "stats": { "app": { - "path" : "/home/mighty/node/modules/express-admin-examples/config/custom/highcharts/app.js", + "path" : "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/highcharts/app.js", "slug": "stats", "verbose": "Highcharts Statistics", "mainview": { @@ -89,7 +89,7 @@ "static": { "public": { "local": { - "path": "/home/mighty/node/modules/express-admin-examples/config/custom/static", + "path": "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/static", "js": [ "/mtm-tags.js", "/theme.js", @@ -100,6 +100,6 @@ } }, "events": { - "events": "/home/mighty/node/modules/express-admin-examples/config/custom/events/events.js" + "events": "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/events/events.js" } } \ No newline at end of file diff --git a/config/pg/custom.json b/config/pg/custom.json index cf999bd..3751a59 100644 --- a/config/pg/custom.json +++ b/config/pg/custom.json @@ -1,7 +1,7 @@ { "editors": { "app": { - "path": "/home/mighty/node/modules/express-admin-examples/config/custom/editors/app.js", + "path": "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/editors/app.js", "slug": "upload" }, "public": { @@ -11,7 +11,7 @@ ] }, "local": { - "path": "/home/mighty/node/modules/express-admin-examples/config/custom/editors", + "path": "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/editors", "js": [ "/jslib/tinymce/js/tinymce/tinymce.min.js", "/jslib/tinymce/js/tinymce/jquery.tinymce.min.js", @@ -22,7 +22,7 @@ }, "view1": { "app": { - "path": "/home/mighty/node/modules/express-admin-examples/config/custom/app1/app.js", + "path": "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/app1/app.js", "slug": "view1", "verbose": "Simple", "mainview": { @@ -32,7 +32,7 @@ }, "view2": { "app": { - "path" : "/home/mighty/node/modules/express-admin-examples/config/custom/app2/app.js", + "path" : "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/app2/app.js", "slug": "view2", "verbose": "Custom global static files", "mainview": { @@ -40,7 +40,7 @@ } }, "public": { - "path": "/home/mighty/node/modules/express-admin-examples/config/custom/app2/public", + "path": "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/app2/public", "css": [ "/css/global.css" ], @@ -51,7 +51,7 @@ }, "view3": { "app": { - "path" : "/home/mighty/node/modules/express-admin-examples/config/custom/app3/app.js", + "path" : "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/app3/app.js", "slug": "view3", "verbose": "Custom local static files", "mainview": { @@ -59,12 +59,12 @@ } }, "public": { - "path": "/home/mighty/node/modules/express-admin-examples/config/custom/app3/public" + "path": "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/app3/public" } }, "view4": { "app": { - "path" : "/home/mighty/node/modules/express-admin-examples/config/custom/app4/app.js", + "path" : "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/app4/app.js", "slug": "view4", "verbose": "Breadcrumbs", "mainview": { @@ -74,7 +74,7 @@ }, "stats": { "app": { - "path" : "/home/mighty/node/modules/express-admin-examples/config/custom/highcharts/app.js", + "path" : "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/highcharts/app.js", "slug": "stats", "verbose": "Highcharts Statistics", "mainview": { @@ -85,7 +85,7 @@ "static": { "public": { "local": { - "path": "/home/mighty/node/modules/express-admin-examples/config/custom/static", + "path": "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/static", "js": [ "/mtm-tags.js", "/theme.js", @@ -96,6 +96,6 @@ } }, "events": { - "events": "/home/mighty/node/modules/express-admin-examples/config/custom/events/events.js" + "events": "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/events/events.js" } } \ No newline at end of file diff --git a/config/sqlite/custom.json b/config/sqlite/custom.json index fa0e46c..ce6d21a 100644 --- a/config/sqlite/custom.json +++ b/config/sqlite/custom.json @@ -1,7 +1,7 @@ { "editors": { "app": { - "path": "/home/mighty/node/modules/express-admin-examples/config/custom/editors/app.js", + "path": "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/editors/app.js", "slug": "upload" }, "public": { @@ -11,7 +11,7 @@ ] }, "local": { - "path": "/home/mighty/node/modules/express-admin-examples/config/custom/editors", + "path": "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/editors", "js": [ "/jslib/tinymce/js/tinymce/tinymce.min.js", "/jslib/tinymce/js/tinymce/jquery.tinymce.min.js", @@ -22,7 +22,7 @@ }, "view1": { "app": { - "path": "/home/mighty/node/modules/express-admin-examples/config/custom/app1/app.js", + "path": "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/app1/app.js", "slug": "view1", "verbose": "Simple", "mainview": { @@ -32,7 +32,7 @@ }, "view2": { "app": { - "path" : "/home/mighty/node/modules/express-admin-examples/config/custom/app2/app.js", + "path" : "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/app2/app.js", "slug": "view2", "verbose": "Custom global static files", "mainview": { @@ -41,7 +41,7 @@ }, "public": { "local": { - "path": "/home/mighty/node/modules/express-admin-examples/config/custom/app2/public", + "path": "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/app2/public", "css": [ "/css/global.css" ], @@ -53,7 +53,7 @@ }, "view3": { "app": { - "path" : "/home/mighty/node/modules/express-admin-examples/config/custom/app3/app.js", + "path" : "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/app3/app.js", "slug": "view3", "verbose": "Custom local static files", "mainview": { @@ -62,13 +62,13 @@ }, "public": { "local": { - "path": "/home/mighty/node/modules/express-admin-examples/config/custom/app3/public" + "path": "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/app3/public" } } }, "view4": { "app": { - "path" : "/home/mighty/node/modules/express-admin-examples/config/custom/app4/app.js", + "path" : "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/app4/app.js", "slug": "view4", "verbose": "Breadcrumbs", "mainview": { @@ -78,7 +78,7 @@ }, "stats": { "app": { - "path" : "/home/mighty/node/modules/express-admin-examples/config/custom/highcharts/app.js", + "path" : "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/highcharts/app.js", "slug": "stats", "verbose": "Highcharts Statistics", "mainview": { @@ -89,7 +89,7 @@ "static": { "public": { "local": { - "path": "/home/mighty/node/modules/express-admin-examples/config/custom/static", + "path": "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/static", "js": [ "/mtm-tags.js", "/theme.js", @@ -100,6 +100,6 @@ } }, "events": { - "events": "/home/mighty/node/modules/express-admin-examples/config/custom/events/events.js" + "events": "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/events/events.js" } } \ No newline at end of file diff --git a/fixtures/pg/insert.sql b/fixtures/pg/insert.sql index 8370ac9..6e5d68a 100644 --- a/fixtures/pg/insert.sql +++ b/fixtures/pg/insert.sql @@ -3,9 +3,9 @@ truncate table "public"."user" restart identity cascade; truncate table "public"."item" restart identity cascade; truncate table "public"."purchase" restart identity cascade; -alter sequence "public"."public"."item_id_seq" restart with 1; -alter sequence "public"."public"."user_id_seq" restart with 1; -alter sequence "public"."public"."purchase_id_seq" restart with 1; +alter sequence "public"."item_id_seq" restart with 1; +alter sequence "public"."user_id_seq" restart with 1; +alter sequence "public"."purchase_id_seq" restart with 1; insert into "public"."user" ("firstname","lastname","created_at","updated_at") VALUES ('Jeff','Cox','2014-01-10 22:17:13','2014-01-10 22:17:13'); insert into "public"."user" ("firstname","lastname","created_at","updated_at") VALUES ('Ann','Hart','2014-01-15 14:57:00','2014-01-15 14:57:00'); diff --git a/path.js b/path.js index cabc8eb..3b6b1d6 100644 --- a/path.js +++ b/path.js @@ -18,6 +18,6 @@ var fs = require('fs'), var data = fs.readFileSync(fpath, 'utf8'); fs.writeFileSync(fpath, - data.replace(/\/home\/mighty\/node\/modules\/express-admin-examples/g, __dirname) + data.replace(/\/home\/mighty\/node\/modules\/express-admin-examples/g, cwd) ); }); From 97e9cf8a8fa76dc20f6ae3e5d01d3f86adb2e61e Mon Sep 17 00:00:00 2001 From: John Hall Date: Wed, 10 Jun 2015 10:00:49 -0700 Subject: [PATCH 5/8] another fix for windows paths --- path.js | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/path.js b/path.js index 3b6b1d6..1a8358c 100644 --- a/path.js +++ b/path.js @@ -5,19 +5,17 @@ var fs = require('fs'), path = require('path'), util = require('util'); -['mysql', 'pg', 'sqlite'].forEach(function (engine) { - console.error( util.inspect(process.env) +"\n" ); - +['mysql', 'pg', 'sqlite'].forEach(function (engine) { var cwd = (process.env.OS.match(/Windows/) !== null)? __dirname.replace(/\\/g, "/"): __dirname; - console.error( "CWD: "+ cwd +"\n" ); - var fpath = path.join(cwd, './config/', engine, '/custom.json'); var data = fs.readFileSync(fpath, 'utf8'); fs.writeFileSync(fpath, - data.replace(/\/home\/mighty\/node\/modules\/express-admin-examples/g, cwd) + data.replace(/\/home\/mighty\/node\/modules\/express-admin-examples/g, function(m){ + return cwd; + }) ); }); From 916fd5adb6ec62d532905df9a0b7acc574de2bea Mon Sep 17 00:00:00 2001 From: John Hall Date: Wed, 10 Jun 2015 10:33:06 -0700 Subject: [PATCH 6/8] revert and assume unchanged for config ... custom.json --- config/mysql/custom.json | 22 +++++++++++----------- config/pg/custom.json | 22 +++++++++++----------- config/sqlite/custom.json | 22 +++++++++++----------- 3 files changed, 33 insertions(+), 33 deletions(-) diff --git a/config/mysql/custom.json b/config/mysql/custom.json index ce6d21a..fa0e46c 100644 --- a/config/mysql/custom.json +++ b/config/mysql/custom.json @@ -1,7 +1,7 @@ { "editors": { "app": { - "path": "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/editors/app.js", + "path": "/home/mighty/node/modules/express-admin-examples/config/custom/editors/app.js", "slug": "upload" }, "public": { @@ -11,7 +11,7 @@ ] }, "local": { - "path": "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/editors", + "path": "/home/mighty/node/modules/express-admin-examples/config/custom/editors", "js": [ "/jslib/tinymce/js/tinymce/tinymce.min.js", "/jslib/tinymce/js/tinymce/jquery.tinymce.min.js", @@ -22,7 +22,7 @@ }, "view1": { "app": { - "path": "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/app1/app.js", + "path": "/home/mighty/node/modules/express-admin-examples/config/custom/app1/app.js", "slug": "view1", "verbose": "Simple", "mainview": { @@ -32,7 +32,7 @@ }, "view2": { "app": { - "path" : "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/app2/app.js", + "path" : "/home/mighty/node/modules/express-admin-examples/config/custom/app2/app.js", "slug": "view2", "verbose": "Custom global static files", "mainview": { @@ -41,7 +41,7 @@ }, "public": { "local": { - "path": "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/app2/public", + "path": "/home/mighty/node/modules/express-admin-examples/config/custom/app2/public", "css": [ "/css/global.css" ], @@ -53,7 +53,7 @@ }, "view3": { "app": { - "path" : "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/app3/app.js", + "path" : "/home/mighty/node/modules/express-admin-examples/config/custom/app3/app.js", "slug": "view3", "verbose": "Custom local static files", "mainview": { @@ -62,13 +62,13 @@ }, "public": { "local": { - "path": "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/app3/public" + "path": "/home/mighty/node/modules/express-admin-examples/config/custom/app3/public" } } }, "view4": { "app": { - "path" : "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/app4/app.js", + "path" : "/home/mighty/node/modules/express-admin-examples/config/custom/app4/app.js", "slug": "view4", "verbose": "Breadcrumbs", "mainview": { @@ -78,7 +78,7 @@ }, "stats": { "app": { - "path" : "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/highcharts/app.js", + "path" : "/home/mighty/node/modules/express-admin-examples/config/custom/highcharts/app.js", "slug": "stats", "verbose": "Highcharts Statistics", "mainview": { @@ -89,7 +89,7 @@ "static": { "public": { "local": { - "path": "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/static", + "path": "/home/mighty/node/modules/express-admin-examples/config/custom/static", "js": [ "/mtm-tags.js", "/theme.js", @@ -100,6 +100,6 @@ } }, "events": { - "events": "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/events/events.js" + "events": "/home/mighty/node/modules/express-admin-examples/config/custom/events/events.js" } } \ No newline at end of file diff --git a/config/pg/custom.json b/config/pg/custom.json index 3751a59..cf999bd 100644 --- a/config/pg/custom.json +++ b/config/pg/custom.json @@ -1,7 +1,7 @@ { "editors": { "app": { - "path": "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/editors/app.js", + "path": "/home/mighty/node/modules/express-admin-examples/config/custom/editors/app.js", "slug": "upload" }, "public": { @@ -11,7 +11,7 @@ ] }, "local": { - "path": "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/editors", + "path": "/home/mighty/node/modules/express-admin-examples/config/custom/editors", "js": [ "/jslib/tinymce/js/tinymce/tinymce.min.js", "/jslib/tinymce/js/tinymce/jquery.tinymce.min.js", @@ -22,7 +22,7 @@ }, "view1": { "app": { - "path": "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/app1/app.js", + "path": "/home/mighty/node/modules/express-admin-examples/config/custom/app1/app.js", "slug": "view1", "verbose": "Simple", "mainview": { @@ -32,7 +32,7 @@ }, "view2": { "app": { - "path" : "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/app2/app.js", + "path" : "/home/mighty/node/modules/express-admin-examples/config/custom/app2/app.js", "slug": "view2", "verbose": "Custom global static files", "mainview": { @@ -40,7 +40,7 @@ } }, "public": { - "path": "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/app2/public", + "path": "/home/mighty/node/modules/express-admin-examples/config/custom/app2/public", "css": [ "/css/global.css" ], @@ -51,7 +51,7 @@ }, "view3": { "app": { - "path" : "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/app3/app.js", + "path" : "/home/mighty/node/modules/express-admin-examples/config/custom/app3/app.js", "slug": "view3", "verbose": "Custom local static files", "mainview": { @@ -59,12 +59,12 @@ } }, "public": { - "path": "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/app3/public" + "path": "/home/mighty/node/modules/express-admin-examples/config/custom/app3/public" } }, "view4": { "app": { - "path" : "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/app4/app.js", + "path" : "/home/mighty/node/modules/express-admin-examples/config/custom/app4/app.js", "slug": "view4", "verbose": "Breadcrumbs", "mainview": { @@ -74,7 +74,7 @@ }, "stats": { "app": { - "path" : "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/highcharts/app.js", + "path" : "/home/mighty/node/modules/express-admin-examples/config/custom/highcharts/app.js", "slug": "stats", "verbose": "Highcharts Statistics", "mainview": { @@ -85,7 +85,7 @@ "static": { "public": { "local": { - "path": "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/static", + "path": "/home/mighty/node/modules/express-admin-examples/config/custom/static", "js": [ "/mtm-tags.js", "/theme.js", @@ -96,6 +96,6 @@ } }, "events": { - "events": "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/events/events.js" + "events": "/home/mighty/node/modules/express-admin-examples/config/custom/events/events.js" } } \ No newline at end of file diff --git a/config/sqlite/custom.json b/config/sqlite/custom.json index ce6d21a..fa0e46c 100644 --- a/config/sqlite/custom.json +++ b/config/sqlite/custom.json @@ -1,7 +1,7 @@ { "editors": { "app": { - "path": "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/editors/app.js", + "path": "/home/mighty/node/modules/express-admin-examples/config/custom/editors/app.js", "slug": "upload" }, "public": { @@ -11,7 +11,7 @@ ] }, "local": { - "path": "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/editors", + "path": "/home/mighty/node/modules/express-admin-examples/config/custom/editors", "js": [ "/jslib/tinymce/js/tinymce/tinymce.min.js", "/jslib/tinymce/js/tinymce/jquery.tinymce.min.js", @@ -22,7 +22,7 @@ }, "view1": { "app": { - "path": "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/app1/app.js", + "path": "/home/mighty/node/modules/express-admin-examples/config/custom/app1/app.js", "slug": "view1", "verbose": "Simple", "mainview": { @@ -32,7 +32,7 @@ }, "view2": { "app": { - "path" : "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/app2/app.js", + "path" : "/home/mighty/node/modules/express-admin-examples/config/custom/app2/app.js", "slug": "view2", "verbose": "Custom global static files", "mainview": { @@ -41,7 +41,7 @@ }, "public": { "local": { - "path": "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/app2/public", + "path": "/home/mighty/node/modules/express-admin-examples/config/custom/app2/public", "css": [ "/css/global.css" ], @@ -53,7 +53,7 @@ }, "view3": { "app": { - "path" : "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/app3/app.js", + "path" : "/home/mighty/node/modules/express-admin-examples/config/custom/app3/app.js", "slug": "view3", "verbose": "Custom local static files", "mainview": { @@ -62,13 +62,13 @@ }, "public": { "local": { - "path": "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/app3/public" + "path": "/home/mighty/node/modules/express-admin-examples/config/custom/app3/public" } } }, "view4": { "app": { - "path" : "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/app4/app.js", + "path" : "/home/mighty/node/modules/express-admin-examples/config/custom/app4/app.js", "slug": "view4", "verbose": "Breadcrumbs", "mainview": { @@ -78,7 +78,7 @@ }, "stats": { "app": { - "path" : "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/highcharts/app.js", + "path" : "/home/mighty/node/modules/express-admin-examples/config/custom/highcharts/app.js", "slug": "stats", "verbose": "Highcharts Statistics", "mainview": { @@ -89,7 +89,7 @@ "static": { "public": { "local": { - "path": "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/static", + "path": "/home/mighty/node/modules/express-admin-examples/config/custom/static", "js": [ "/mtm-tags.js", "/theme.js", @@ -100,6 +100,6 @@ } }, "events": { - "events": "C:\Users\revlin\Projects\maponics-source\express-admin-examples/config/custom/events/events.js" + "events": "/home/mighty/node/modules/express-admin-examples/config/custom/events/events.js" } } \ No newline at end of file From 793d8fb8b4d0ec7812c84120a85dd781fc48f2af Mon Sep 17 00:00:00 2001 From: John Date: Tue, 7 Jul 2015 06:40:58 -0700 Subject: [PATCH 7/8] works on ubuntu too --- README.md | 8 +- config/mysql/custom.json | 22 +- config/pg/config.json | 3 +- config/pg/custom.json | 102 +-- config/pg/settings.json | 1546 +++++++++++++++---------------------- config/sqlite/custom.json | 22 +- fixtures/pg/schema.sql | 121 ++- path.js | 2 +- 8 files changed, 726 insertions(+), 1100 deletions(-) diff --git a/README.md b/README.md index 94db61b..57465f3 100644 --- a/README.md +++ b/README.md @@ -42,8 +42,8 @@ $ mysql -p --user=root 'express-admin-examples' < fixtures/mysql/insert.sql $ sudo -u postgres psql 'express-admin-examples' < fixtures/pg/schema.sql $ sudo -u postgres psql 'express-admin-examples' < fixtures/pg/insert.sql # ... on Windows -psql -U postgres express-admin-examples < fixtures/pg/schema.sql -psql -U postgres express-admin-examples < fixtures/pg/insert.sql +> psql -U postgres express-admin-examples < fixtures/pg/schema.sql +> psql -U postgres express-admin-examples < fixtures/pg/insert.sql # SQLite $ node fixtures/sqlite/import.js @@ -57,8 +57,10 @@ $ admin config/mysql/ # PostgreSQL $ admin config/pg/ +# ... locally installed, on Linux +$ ./node_modules/.bin/admin config/pg # ... locally installed, on Windows -node_modules\.bin\admin config/pg +> node_modules\.bin\admin config/pg # SQLite $ admin config/sqlite/ diff --git a/config/mysql/custom.json b/config/mysql/custom.json index fa0e46c..1b14e1f 100644 --- a/config/mysql/custom.json +++ b/config/mysql/custom.json @@ -1,7 +1,7 @@ { "editors": { "app": { - "path": "/home/mighty/node/modules/express-admin-examples/config/custom/editors/app.js", + "path": "/home/revlin/Projects/maponics-source/express-admin-examples/config/custom/editors/app.js", "slug": "upload" }, "public": { @@ -11,7 +11,7 @@ ] }, "local": { - "path": "/home/mighty/node/modules/express-admin-examples/config/custom/editors", + "path": "/home/revlin/Projects/maponics-source/express-admin-examples/config/custom/editors", "js": [ "/jslib/tinymce/js/tinymce/tinymce.min.js", "/jslib/tinymce/js/tinymce/jquery.tinymce.min.js", @@ -22,7 +22,7 @@ }, "view1": { "app": { - "path": "/home/mighty/node/modules/express-admin-examples/config/custom/app1/app.js", + "path": "/home/revlin/Projects/maponics-source/express-admin-examples/config/custom/app1/app.js", "slug": "view1", "verbose": "Simple", "mainview": { @@ -32,7 +32,7 @@ }, "view2": { "app": { - "path" : "/home/mighty/node/modules/express-admin-examples/config/custom/app2/app.js", + "path" : "/home/revlin/Projects/maponics-source/express-admin-examples/config/custom/app2/app.js", "slug": "view2", "verbose": "Custom global static files", "mainview": { @@ -41,7 +41,7 @@ }, "public": { "local": { - "path": "/home/mighty/node/modules/express-admin-examples/config/custom/app2/public", + "path": "/home/revlin/Projects/maponics-source/express-admin-examples/config/custom/app2/public", "css": [ "/css/global.css" ], @@ -53,7 +53,7 @@ }, "view3": { "app": { - "path" : "/home/mighty/node/modules/express-admin-examples/config/custom/app3/app.js", + "path" : "/home/revlin/Projects/maponics-source/express-admin-examples/config/custom/app3/app.js", "slug": "view3", "verbose": "Custom local static files", "mainview": { @@ -62,13 +62,13 @@ }, "public": { "local": { - "path": "/home/mighty/node/modules/express-admin-examples/config/custom/app3/public" + "path": "/home/revlin/Projects/maponics-source/express-admin-examples/config/custom/app3/public" } } }, "view4": { "app": { - "path" : "/home/mighty/node/modules/express-admin-examples/config/custom/app4/app.js", + "path" : "/home/revlin/Projects/maponics-source/express-admin-examples/config/custom/app4/app.js", "slug": "view4", "verbose": "Breadcrumbs", "mainview": { @@ -78,7 +78,7 @@ }, "stats": { "app": { - "path" : "/home/mighty/node/modules/express-admin-examples/config/custom/highcharts/app.js", + "path" : "/home/revlin/Projects/maponics-source/express-admin-examples/config/custom/highcharts/app.js", "slug": "stats", "verbose": "Highcharts Statistics", "mainview": { @@ -89,7 +89,7 @@ "static": { "public": { "local": { - "path": "/home/mighty/node/modules/express-admin-examples/config/custom/static", + "path": "/home/revlin/Projects/maponics-source/express-admin-examples/config/custom/static", "js": [ "/mtm-tags.js", "/theme.js", @@ -100,6 +100,6 @@ } }, "events": { - "events": "/home/mighty/node/modules/express-admin-examples/config/custom/events/events.js" + "events": "/home/revlin/Projects/maponics-source/express-admin-examples/config/custom/events/events.js" } } \ No newline at end of file diff --git a/config/pg/config.json b/config/pg/config.json index b54a6b1..cbeb2c7 100644 --- a/config/pg/config.json +++ b/config/pg/config.json @@ -2,7 +2,8 @@ "pg": { "database": "express-admin-examples", "user": "liolio", - "password": "karamba" + "password": "karamba", + "schema": "public" }, "server": { "port": 3000 diff --git a/config/pg/custom.json b/config/pg/custom.json index cf999bd..9e26dfe 100644 --- a/config/pg/custom.json +++ b/config/pg/custom.json @@ -1,101 +1 @@ -{ - "editors": { - "app": { - "path": "/home/mighty/node/modules/express-admin-examples/config/custom/editors/app.js", - "slug": "upload" - }, - "public": { - "external": { - "js": [ - "//cdn.ckeditor.com/4.4.2/standard/ckeditor.js" - ] - }, - "local": { - "path": "/home/mighty/node/modules/express-admin-examples/config/custom/editors", - "js": [ - "/jslib/tinymce/js/tinymce/tinymce.min.js", - "/jslib/tinymce/js/tinymce/jquery.tinymce.min.js", - "/editors.js" - ] - } - } - }, - "view1": { - "app": { - "path": "/home/mighty/node/modules/express-admin-examples/config/custom/app1/app.js", - "slug": "view1", - "verbose": "Simple", - "mainview": { - "show": true - } - } - }, - "view2": { - "app": { - "path" : "/home/mighty/node/modules/express-admin-examples/config/custom/app2/app.js", - "slug": "view2", - "verbose": "Custom global static files", - "mainview": { - "show": true - } - }, - "public": { - "path": "/home/mighty/node/modules/express-admin-examples/config/custom/app2/public", - "css": [ - "/css/global.css" - ], - "js": [ - "/js/global.js" - ] - } - }, - "view3": { - "app": { - "path" : "/home/mighty/node/modules/express-admin-examples/config/custom/app3/app.js", - "slug": "view3", - "verbose": "Custom local static files", - "mainview": { - "show": true - } - }, - "public": { - "path": "/home/mighty/node/modules/express-admin-examples/config/custom/app3/public" - } - }, - "view4": { - "app": { - "path" : "/home/mighty/node/modules/express-admin-examples/config/custom/app4/app.js", - "slug": "view4", - "verbose": "Breadcrumbs", - "mainview": { - "show": true - } - } - }, - "stats": { - "app": { - "path" : "/home/mighty/node/modules/express-admin-examples/config/custom/highcharts/app.js", - "slug": "stats", - "verbose": "Highcharts Statistics", - "mainview": { - "show": true - } - } - }, - "static": { - "public": { - "local": { - "path": "/home/mighty/node/modules/express-admin-examples/config/custom/static", - "js": [ - "/mtm-tags.js", - "/theme.js", - "/images.js", - "/binary.js" - ] - } - } - }, - "events": { - "events": "/home/mighty/node/modules/express-admin-examples/config/custom/events/events.js" - } -} \ No newline at end of file +{} \ No newline at end of file diff --git a/config/pg/settings.json b/config/pg/settings.json index ebeb5a5..3b3d529 100644 --- a/config/pg/settings.json +++ b/config/pg/settings.json @@ -1,35 +1,19 @@ { - "purchase": { - "slug": "purchase", + "notes": { + "slug": "notes", "table": { - "name": "purchase", + "name": "notes", "pk": "id", - "verbose": "Purchase (One to Many)" + "verbose": "notes" }, "columns": [ { - "verbose": "id", "name": "id", + "verbose": "id", "control": { "text": true }, - "type": "int(11)", - "allowNull": false, - "defaultValue": null, - "listview": { - "show": false - }, - "editview": { - "show": false - } - }, - { - "verbose": "Item", - "name": "item_id", - "control": { - "select": true - }, - "type": "int(11)", + "type": "integer", "allowNull": false, "defaultValue": null, "listview": { @@ -37,22 +21,15 @@ }, "editview": { "show": true - }, - "oneToMany": { - "table": "item", - "pk": "id", - "columns": [ - "name" - ] } }, { - "verbose": "User", - "name": "user_id", + "name": "notes1", + "verbose": "notes1", "control": { - "select": true + "text": true }, - "type": "int(11)", + "type": "text", "allowNull": true, "defaultValue": null, "listview": { @@ -60,23 +37,15 @@ }, "editview": { "show": true - }, - "oneToMany": { - "table": "user", - "pk": "id", - "columns": [ - "firstname", - "lastname" - ] } }, { - "verbose": "Cache", - "name": "cache", + "name": "notes2", + "verbose": "notes2", "control": { "text": true }, - "type": "decimal(6,2)", + "type": "text", "allowNull": false, "defaultValue": null, "listview": { @@ -87,12 +56,12 @@ } }, { - "verbose": "Date", - "name": "date", + "name": "notes3", + "verbose": "notes3", "control": { - "date": true + "text": true }, - "type": "date", + "type": "text", "allowNull": true, "defaultValue": null, "listview": { @@ -103,39 +72,19 @@ } }, { - "name": "deleted", - "verbose": "Deleted", - "control": { - "radio": true, - "options": [ - "Yes", - "No" - ] - }, - "type": "boolean", - "allowNull": true, - "defaultValue": null, - "listview": { - "show": false - }, - "editview": { - "show": false - } - }, - { - "name": "deleted_at", - "verbose": "Deleted At", + "name": "notes4", + "verbose": "notes4", "control": { - "datetime": true + "text": true }, - "type": "datetime", - "allowNull": true, + "type": "text", + "allowNull": false, "defaultValue": null, "listview": { - "show": false + "show": true }, "editview": { - "show": false + "show": true } } ], @@ -144,15 +93,7 @@ }, "listview": { "order": {}, - "page": 5, - "filter": [ - "item_id", - "user_id", - "cache", - "date", - "deleted", - "deleted_at" - ] + "page": 25 }, "editview": { "readonly": false @@ -163,28 +104,28 @@ "table": { "name": "item", "pk": "id", - "verbose": "Item" + "verbose": "item" }, "columns": [ { - "verbose": "id", "name": "id", + "verbose": "id", "control": { "text": true }, - "type": "int(11)", + "type": "integer", "allowNull": false, "defaultValue": null, "listview": { - "show": false + "show": true }, "editview": { - "show": false + "show": true } }, { - "verbose": "name", "name": "name", + "verbose": "name", "control": { "text": true }, @@ -199,16 +140,16 @@ } }, { - "verbose": "description", "name": "description", + "verbose": "description", "control": { - "textarea": true + "text": true }, "type": "text", "allowNull": true, "defaultValue": null, "listview": { - "show": false + "show": true }, "editview": { "show": true @@ -218,7 +159,7 @@ "name": "image", "verbose": "image", "control": { - "file": true + "text": true }, "type": "varchar(255)", "allowNull": true, @@ -242,37 +183,37 @@ "readonly": false } }, - "recipe": { - "slug": "recipe", + "purchase": { + "slug": "purchase", "table": { - "name": "recipe", + "name": "purchase", "pk": "id", - "verbose": "Recipe (Many to Many)" + "verbose": "purchase" }, "columns": [ { - "verbose": "id", "name": "id", + "verbose": "id", "control": { "text": true }, - "type": "int(11)", + "type": "integer", "allowNull": false, "defaultValue": null, "listview": { "show": true }, "editview": { - "show": false + "show": true } }, { - "verbose": "Name", - "name": "name", + "name": "item_id", + "verbose": "item_id", "control": { "text": true }, - "type": "varchar(45)", + "type": "integer", "allowNull": false, "defaultValue": null, "listview": { @@ -283,93 +224,61 @@ } }, { - "verbose": "Recipe Types", - "name": "recipe_type", + "name": "user_id", + "verbose": "user_id", "control": { - "select": true, - "multiple": true + "text": true }, - "type": "int(11)", - "allowNull": false, + "type": "integer", + "allowNull": true, + "defaultValue": null, "listview": { - "show": false + "show": true }, "editview": { "show": true + } + }, + { + "name": "cache", + "verbose": "cache", + "control": { + "text": true + }, + "type": "decimal(6,2)", + "allowNull": false, + "defaultValue": null, + "listview": { + "show": true }, - "manyToMany": { - "link": { - "table": "recipe_has_recipe_types", - "parentPk": "recipe_id", - "childPk": "recipe_type_id" - }, - "ref": { - "table": "recipe_type", - "pk": "id", - "columns": [ - "title" - ] - } + "editview": { + "show": true } }, { - "verbose": "Recipe Methods", - "name": "recipe_method", + "name": "date", + "verbose": "date", "control": { - "select": true, - "multiple": true + "text": true }, - "type": "int(11)", + "type": "date", "allowNull": true, + "defaultValue": null, "listview": { - "show": false + "show": true }, "editview": { "show": true - }, - "manyToMany": { - "link": { - "table": "recipe_has_recipe_methods", - "parentPk": "recipe_id", - "childPk": "recipe_method_id" - }, - "ref": { - "table": "recipe_method", - "pk": "id", - "columns": [ - "title" - ] - } } - } - ], - "mainview": { - "show": true - }, - "listview": { - "order": {}, - "page": 25 - }, - "editview": { - "readonly": false - } - }, - "recipe_has_recipe_methods": { - "slug": "recipe_has_recipe_methods", - "table": { - "name": "recipe_has_recipe_methods", - "pk": "recipe_id", - "verbose": "recipe_has_recipe_methods" - }, - "columns": [ + }, { - "verbose": "recipe_id", - "name": "recipe_id", + "name": "deleted", + "verbose": "deleted", "control": { "text": true }, - "type": "int(11)", - "allowNull": false, + "type": "char", + "allowNull": true, "defaultValue": null, "listview": { "show": true @@ -379,13 +288,13 @@ } }, { - "verbose": "recipe_method_id", - "name": "recipe_method_id", + "name": "deleted_at", + "verbose": "deleted_at", "control": { "text": true }, - "type": "int(11)", - "allowNull": false, + "type": "timestamp", + "allowNull": true, "defaultValue": null, "listview": { "show": true @@ -396,7 +305,7 @@ } ], "mainview": { - "show": false + "show": true }, "listview": { "order": {}, @@ -406,21 +315,21 @@ "readonly": false } }, - "recipe_has_recipe_types": { - "slug": "recipe_has_recipe_types", + "recipe_type": { + "slug": "recipe_type", "table": { - "name": "recipe_has_recipe_types", - "pk": "recipe_id", - "verbose": "recipe_has_recipe_types" + "name": "recipe_type", + "pk": "id", + "verbose": "recipe_type" }, "columns": [ { - "verbose": "recipe_id", - "name": "recipe_id", + "name": "id", + "verbose": "id", "control": { "text": true }, - "type": "int(11)", + "type": "integer", "allowNull": false, "defaultValue": null, "listview": { @@ -431,12 +340,12 @@ } }, { - "verbose": "recipe_type_id", - "name": "recipe_type_id", + "name": "title", + "verbose": "title", "control": { "text": true }, - "type": "int(11)", + "type": "varchar(45)", "allowNull": false, "defaultValue": null, "listview": { @@ -448,7 +357,7 @@ } ], "mainview": { - "show": false + "show": true }, "listview": { "order": {}, @@ -463,28 +372,28 @@ "table": { "name": "recipe_method", "pk": "id", - "verbose": "Recipe Method" + "verbose": "recipe_method" }, "columns": [ { - "verbose": "id", "name": "id", + "verbose": "id", "control": { "text": true }, - "type": "int(11)", + "type": "integer", "allowNull": false, "defaultValue": null, "listview": { - "show": false + "show": true }, "editview": { - "show": false + "show": true } }, { - "verbose": "title", "name": "title", + "verbose": "title", "control": { "text": true }, @@ -510,33 +419,33 @@ "readonly": false } }, - "recipe_type": { - "slug": "recipe_type", + "recipe": { + "slug": "recipe", "table": { - "name": "recipe_type", + "name": "recipe", "pk": "id", - "verbose": "Recipe Type" + "verbose": "recipe" }, "columns": [ { - "verbose": "id", "name": "id", + "verbose": "id", "control": { "text": true }, - "type": "int(11)", + "type": "integer", "allowNull": false, "defaultValue": null, "listview": { - "show": false + "show": true }, "editview": { - "show": false + "show": true } }, { - "verbose": "title", - "name": "title", + "name": "name", + "verbose": "name", "control": { "text": true }, @@ -562,37 +471,24 @@ "readonly": false } }, - "user": { - "slug": "user", + "recipe_has_recipe_types": { + "slug": "recipe_has_recipe_types", "table": { - "name": "user", - "pk": "id", - "verbose": "User (One to One)" + "name": "recipe_has_recipe_types", + "pk": [ + "recipe_id", + "recipe_type_id" + ], + "verbose": "recipe_has_recipe_types" }, "columns": [ { - "verbose": "id", - "name": "id", - "control": { - "text": true - }, - "type": "int(11)", - "allowNull": false, - "defaultValue": null, - "listview": { - "show": false - }, - "editview": { - "show": false - } - }, - { - "verbose": "firstname", - "name": "firstname", + "name": "recipe_id", + "verbose": "recipe_id", "control": { "text": true }, - "type": "varchar(45)", + "type": "integer", "allowNull": false, "defaultValue": null, "listview": { @@ -603,13 +499,13 @@ } }, { - "verbose": "lastname", - "name": "lastname", + "name": "recipe_type_id", + "verbose": "recipe_type_id", "control": { "text": true }, - "type": "varchar(45)", - "allowNull": true, + "type": "integer", + "allowNull": false, "defaultValue": null, "listview": { "show": true @@ -617,37 +513,60 @@ "editview": { "show": true } - }, + } + ], + "mainview": { + "show": true + }, + "listview": { + "order": {}, + "page": 25 + }, + "editview": { + "readonly": false + } + }, + "recipe_has_recipe_methods": { + "slug": "recipe_has_recipe_methods", + "table": { + "name": "recipe_has_recipe_methods", + "pk": [ + "recipe_id", + "recipe_method_id" + ], + "verbose": "recipe_has_recipe_methods" + }, + "columns": [ { - "name": "created_at", - "verbose": "created_at", + "name": "recipe_id", + "verbose": "recipe_id", "control": { "text": true }, - "type": "datetime", + "type": "integer", "allowNull": false, "defaultValue": null, "listview": { "show": true }, "editview": { - "show": false + "show": true } }, { - "name": "updated_at", - "verbose": "updated_at", + "name": "recipe_method_id", + "verbose": "recipe_method_id", "control": { "text": true }, - "type": "datetime", + "type": "integer", "allowNull": false, "defaultValue": null, "listview": { "show": true }, "editview": { - "show": false + "show": true } } ], @@ -659,60 +578,88 @@ "page": 25 }, "editview": { - "readonly": false, - "oneToOne": { - "address": "user_id", - "phone": "user_id" - } + "readonly": false } }, - "address": { - "slug": "address", + "user": { + "slug": "user", "table": { - "name": "address", + "name": "user", "pk": "id", - "verbose": "Address" + "verbose": "user" }, "columns": [ { - "verbose": "id", "name": "id", + "verbose": "id", "control": { "text": true }, - "type": "int(11)", + "type": "integer", "allowNull": false, "defaultValue": null, "listview": { "show": true }, "editview": { - "show": false + "show": true } }, { - "verbose": "user_id", - "name": "user_id", + "name": "firstname", + "verbose": "firstname", "control": { "text": true }, - "type": "int(11)", + "type": "varchar(45)", "allowNull": false, "defaultValue": null, "listview": { "show": true }, "editview": { - "show": false + "show": true } }, { - "verbose": "street", - "name": "street", + "name": "lastname", + "verbose": "lastname", "control": { "text": true }, "type": "varchar(45)", + "allowNull": true, + "defaultValue": null, + "listview": { + "show": true + }, + "editview": { + "show": true + } + }, + { + "name": "created_at", + "verbose": "created_at", + "control": { + "text": true + }, + "type": "timestamp", + "allowNull": false, + "defaultValue": null, + "listview": { + "show": true + }, + "editview": { + "show": true + } + }, + { + "name": "updated_at", + "verbose": "updated_at", + "control": { + "text": true + }, + "type": "timestamp", "allowNull": false, "defaultValue": null, "listview": { @@ -724,7 +671,7 @@ } ], "mainview": { - "show": false + "show": true }, "listview": { "order": {}, @@ -734,49 +681,49 @@ "readonly": false } }, - "phone": { - "slug": "phone", + "address": { + "slug": "address", "table": { - "name": "phone", + "name": "address", "pk": "id", - "verbose": "Phone" + "verbose": "address" }, "columns": [ { - "verbose": "id", "name": "id", + "verbose": "id", "control": { "text": true }, - "type": "int(11)", + "type": "integer", "allowNull": false, "defaultValue": null, "listview": { "show": true }, "editview": { - "show": false + "show": true } }, { - "verbose": "user_id", "name": "user_id", + "verbose": "user_id", "control": { "text": true }, - "type": "int(11)", + "type": "integer", "allowNull": false, "defaultValue": null, "listview": { "show": true }, "editview": { - "show": false + "show": true } }, { - "verbose": "mobile", - "name": "mobile", + "name": "street", + "verbose": "street", "control": { "text": true }, @@ -792,7 +739,7 @@ } ], "mainview": { - "show": false + "show": true }, "listview": { "order": {}, @@ -802,33 +749,49 @@ "readonly": false } }, - "car": { - "slug": "car", + "phone": { + "slug": "phone", "table": { - "name": "car", + "name": "phone", "pk": "id", - "verbose": "Car (Many to One)" + "verbose": "phone" }, "columns": [ { - "verbose": "id", "name": "id", + "verbose": "id", "control": { "text": true }, - "type": "int(11)", + "type": "integer", "allowNull": false, "defaultValue": null, "listview": { - "show": false + "show": true }, "editview": { - "show": false + "show": true } }, { - "verbose": "model", - "name": "model", + "name": "user_id", + "verbose": "user_id", + "control": { + "text": true + }, + "type": "integer", + "allowNull": false, + "defaultValue": null, + "listview": { + "show": true + }, + "editview": { + "show": true + } + }, + { + "name": "mobile", + "verbose": "mobile", "control": { "text": true }, @@ -851,56 +814,36 @@ "page": 25 }, "editview": { - "readonly": false, - "manyToOne": { - "repair": "car_id", - "driver": "car_id" - } + "readonly": false } }, - "driver": { - "slug": "driver", + "car": { + "slug": "car", "table": { - "name": "driver", + "name": "car", "pk": "id", - "verbose": "driver" + "verbose": "car" }, "columns": [ { - "verbose": "id", "name": "id", + "verbose": "id", "control": { "text": true }, - "type": "int(11)", + "type": "integer", "allowNull": false, "defaultValue": null, "listview": { "show": true }, "editview": { - "show": false - } - }, - { - "verbose": "car_id", - "name": "car_id", - "control": { - "text": true - }, - "type": "int(11)", - "allowNull": false, - "defaultValue": null, - "listview": { "show": true - }, - "editview": { - "show": false } }, { - "verbose": "name", - "name": "name", + "name": "model", + "verbose": "model", "control": { "text": true }, @@ -916,7 +859,7 @@ } ], "mainview": { - "show": false + "show": true }, "listview": { "order": {}, @@ -935,42 +878,42 @@ }, "columns": [ { - "verbose": "id", "name": "id", + "verbose": "id", "control": { "text": true }, - "type": "int(11)", + "type": "integer", "allowNull": false, "defaultValue": null, "listview": { "show": true }, "editview": { - "show": false + "show": true } }, { - "verbose": "car_id", "name": "car_id", + "verbose": "car_id", "control": { "text": true }, - "type": "int(11)", + "type": "integer", "allowNull": false, "defaultValue": null, "listview": { "show": true }, "editview": { - "show": false + "show": true } }, { - "verbose": "date", "name": "date", + "verbose": "date", "control": { - "date": true + "text": true }, "type": "date", "allowNull": false, @@ -984,7 +927,7 @@ } ], "mainview": { - "show": false + "show": true }, "listview": { "order": {}, @@ -994,12 +937,12 @@ "readonly": false } }, - "controls": { - "slug": "controls", + "driver": { + "slug": "driver", "table": { - "name": "controls", + "name": "driver", "pk": "id", - "verbose": "Controls" + "verbose": "driver" }, "columns": [ { @@ -1008,137 +951,24 @@ "control": { "text": true }, - "type": "int(11)", + "type": "integer", "allowNull": false, "defaultValue": null, "listview": { "show": true }, - "editview": { - "show": false - } - }, - { - "name": "controls_otm_single_id", - "verbose": "one to many single", - "control": { - "select": true - }, - "oneToMany": { - "table": "controls_otm_single", - "pk": "id", - "columns": [ - "name" - ] - }, - "type": "int(11)", - "allowNull": true, - "defaultValue": null, - "listview": { - "show": true - }, "editview": { "show": true } }, { - "name": "controls_otm_multiple_id", - "verbose": "one to many multiple", - "control": { - "select": true - }, - "oneToMany": { - "table": "controls_otm_multiple", - "pk": "id", - "columns": [ - "first", - "last" - ] - }, - "type": "int(11)", - "allowNull": true, - "defaultValue": null, - "listview": { - "show": true - }, - "editview": { - "show": true - } - }, - { - "verbose": "many to many single", - "name": "controls_mtm_single", - "control": { - "select": true, - "multiple": true - }, - "type": "int(11)", - "allowNull": true, - "listview": { - "show": true - }, - "editview": { - "show": true - }, - "manyToMany": { - "link": { - "table": "controls_has_controls_mtm_single", - "parentPk": "controls_id", - "childPk": "controls_mtm_single_id" - }, - "ref": { - "table": "controls_mtm_single", - "pk": "id", - "columns": [ - "name" - ] - } - } - }, - { - "verbose": "many to many multiple", - "name": "controls_mtm_multiple", - "control": { - "select": true, - "multiple": true - }, - "type": "int(11)", - "allowNull": true, - "listview": { - "show": true - }, - "editview": { - "show": true - }, - "manyToMany": { - "link": { - "table": "controls_has_controls_mtm_multiple", - "parentPk": "controls_id", - "childPk": "controls_mtm_multiple_id" - }, - "ref": { - "table": "controls_mtm_multiple", - "pk": "id", - "columns": [ - "first", - "last" - ] - } - } - }, - { - "name": "static", - "verbose": "static", + "name": "car_id", + "verbose": "car_id", "control": { - "select": true, - "options": [ - "one", - "two", - "three" - ] + "text": true }, - "type": "varchar(45)", - "allowNull": true, + "type": "integer", + "allowNull": false, "defaultValue": null, "listview": { "show": true @@ -1148,49 +978,13 @@ } }, { - "name": "text", - "verbose": "text", + "name": "name", + "verbose": "name", "control": { "text": true }, "type": "varchar(45)", - "allowNull": true, - "defaultValue": null, - "listview": { - "show": true - }, - "editview": { - "show": true - } - }, - { - "name": "boolean", - "verbose": "boolean", - "control": { - "radio": true, - "options": [ - "Yes", - "No" - ] - }, - "type": "char", - "allowNull": true, - "defaultValue": null, - "listview": { - "show": true - }, - "editview": { - "show": true - } - }, - { - "name": "bigint", - "verbose": "bigint", - "control": { - "number": true - }, - "type": "bigint", - "allowNull": true, + "allowNull": false, "defaultValue": null, "listview": { "show": true @@ -1198,15 +992,35 @@ "editview": { "show": true } - }, + } + ], + "mainview": { + "show": true + }, + "listview": { + "order": {}, + "page": 25 + }, + "editview": { + "readonly": false + } + }, + "controls_mtm_single": { + "slug": "controls_mtm_single", + "table": { + "name": "controls_mtm_single", + "pk": "id", + "verbose": "controls_mtm_single" + }, + "columns": [ { - "name": "double", - "verbose": "double", + "name": "id", + "verbose": "id", "control": { - "number": true + "text": true }, - "type": "double", - "allowNull": true, + "type": "integer", + "allowNull": false, "defaultValue": null, "listview": { "show": true @@ -1216,13 +1030,13 @@ } }, { - "name": "upload", - "verbose": "upload", + "name": "name", + "verbose": "name", "control": { - "file": true + "text": true }, "type": "varchar(45)", - "allowNull": true, + "allowNull": false, "defaultValue": null, "listview": { "show": true @@ -1230,16 +1044,35 @@ "editview": { "show": true } - }, + } + ], + "mainview": { + "show": true + }, + "listview": { + "order": {}, + "page": 25 + }, + "editview": { + "readonly": false + } + }, + "controls_otm_single": { + "slug": "controls_otm_single", + "table": { + "name": "controls_otm_single", + "pk": "id", + "verbose": "controls_otm_single" + }, + "columns": [ { - "name": "binary", - "verbose": "binary", + "name": "id", + "verbose": "id", "control": { - "file": true, - "binary": true + "text": true }, - "type": "bytea", - "allowNull": true, + "type": "integer", + "allowNull": false, "defaultValue": null, "listview": { "show": true @@ -1249,13 +1082,13 @@ } }, { - "name": "date", - "verbose": "date", + "name": "name", + "verbose": "name", "control": { - "date": true + "text": true }, - "type": "date", - "allowNull": true, + "type": "varchar(45)", + "allowNull": false, "defaultValue": null, "listview": { "show": true @@ -1263,15 +1096,35 @@ "editview": { "show": true } - }, + } + ], + "mainview": { + "show": true + }, + "listview": { + "order": {}, + "page": 25 + }, + "editview": { + "readonly": false + } + }, + "controls_otm_multiple": { + "slug": "controls_otm_multiple", + "table": { + "name": "controls_otm_multiple", + "pk": "id", + "verbose": "controls_otm_multiple" + }, + "columns": [ { - "name": "time", - "verbose": "time", + "name": "id", + "verbose": "id", "control": { - "time": true + "text": true }, - "type": "time", - "allowNull": true, + "type": "integer", + "allowNull": false, "defaultValue": null, "listview": { "show": true @@ -1281,13 +1134,13 @@ } }, { - "name": "datetime", - "verbose": "datetime", + "name": "first", + "verbose": "first", "control": { - "datetime": true + "text": true }, - "type": "datetime", - "allowNull": true, + "type": "varchar(45)", + "allowNull": false, "defaultValue": null, "listview": { "show": true @@ -1297,13 +1150,12 @@ } }, { - "name": "textarea", - "verbose": "textarea", + "name": "last", + "verbose": "last", "control": { - "textarea": true, - "editor": "ck-compact" + "text": true }, - "type": "text", + "type": "varchar(45)", "allowNull": true, "defaultValue": null, "listview": { @@ -1319,47 +1171,27 @@ }, "listview": { "order": {}, - "page": 25, - "filter": [ - "controls_otm_single_id", - "controls_otm_multiple_id", - "controls_mtm_single", - "controls_mtm_multiple", - "static", - "text", - "boolean", - "bigint", - "double", - "upload", - "date", - "time", - "datetime", - "year", - "textarea" - ] + "page": 25 }, "editview": { - "readonly": false, - "manyToOne": { - "controls_inline": "controls_id" - } + "readonly": false } }, - "controls_has_controls_mtm_multiple": { - "slug": "controls_has_controls_mtm_multiple", + "controls_mtm_multiple": { + "slug": "controls_mtm_multiple", "table": { - "name": "controls_has_controls_mtm_multiple", - "pk": "controls_id", - "verbose": "controls_has_controls_mtm_multiple" + "name": "controls_mtm_multiple", + "pk": "id", + "verbose": "controls_mtm_multiple" }, "columns": [ { - "name": "controls_id", - "verbose": "controls_id", + "name": "id", + "verbose": "id", "control": { "text": true }, - "type": "int(11)", + "type": "integer", "allowNull": false, "defaultValue": null, "listview": { @@ -1370,12 +1202,12 @@ } }, { - "name": "controls_mtm_multiple_id", - "verbose": "controls_mtm_multiple_id", + "name": "first", + "verbose": "first", "control": { "text": true }, - "type": "int(11)", + "type": "varchar(45)", "allowNull": false, "defaultValue": null, "listview": { @@ -1384,10 +1216,26 @@ "editview": { "show": true } + }, + { + "name": "last", + "verbose": "last", + "control": { + "text": true + }, + "type": "varchar(45)", + "allowNull": true, + "defaultValue": null, + "listview": { + "show": true + }, + "editview": { + "show": true + } } ], "mainview": { - "show": false + "show": true }, "listview": { "order": {}, @@ -1401,7 +1249,10 @@ "slug": "controls_has_controls_mtm_single", "table": { "name": "controls_has_controls_mtm_single", - "pk": "controls_id", + "pk": [ + "controls_id", + "controls_mtm_single_id" + ], "verbose": "controls_has_controls_mtm_single" }, "columns": [ @@ -1411,7 +1262,7 @@ "control": { "text": true }, - "type": "int(11)", + "type": "integer", "allowNull": false, "defaultValue": null, "listview": { @@ -1427,7 +1278,7 @@ "control": { "text": true }, - "type": "int(11)", + "type": "integer", "allowNull": false, "defaultValue": null, "listview": { @@ -1439,7 +1290,7 @@ } ], "mainview": { - "show": false + "show": true }, "listview": { "order": {}, @@ -1449,60 +1300,40 @@ "readonly": false } }, - "controls_inline": { - "slug": "controls_inline", + "controls_has_controls_mtm_multiple": { + "slug": "controls_has_controls_mtm_multiple", "table": { - "name": "controls_inline", - "pk": "id", - "verbose": "inline controls" + "name": "controls_has_controls_mtm_multiple", + "pk": [ + "controls_id", + "controls_mtm_multiple_id" + ], + "verbose": "controls_has_controls_mtm_multiple" }, "columns": [ - { - "name": "id", - "verbose": "id", - "control": { - "text": true - }, - "type": "int(11)", - "allowNull": false, - "defaultValue": null, - "listview": { - "show": true - }, - "editview": { - "show": false - } - }, { "name": "controls_id", "verbose": "controls_id", "control": { "text": true }, - "type": "int(11)", + "type": "integer", "allowNull": false, "defaultValue": null, "listview": { "show": true }, "editview": { - "show": false + "show": true } }, { - "name": "controls_inline_otm_single_id", - "verbose": "one to many single", + "name": "controls_mtm_multiple_id", + "verbose": "controls_mtm_multiple_id", "control": { - "select": true - }, - "oneToMany": { - "table": "controls_inline_otm_single", - "pk": "id", - "columns": [ - "name" - ] + "text": true }, - "type": "int(11)", + "type": "integer", "allowNull": false, "defaultValue": null, "listview": { @@ -1511,22 +1342,34 @@ "editview": { "show": true } - }, + } + ], + "mainview": { + "show": true + }, + "listview": { + "order": {}, + "page": 25 + }, + "editview": { + "readonly": false + } + }, + "controls": { + "slug": "controls", + "table": { + "name": "controls", + "pk": "id", + "verbose": "controls" + }, + "columns": [ { - "name": "controls_inline_otm_multiple_id", - "verbose": "one to many multiple", + "name": "id", + "verbose": "id", "control": { - "select": true - }, - "oneToMany": { - "table": "controls_inline_otm_multiple", - "pk": "id", - "columns": [ - "first", - "last" - ] + "text": true }, - "type": "int(11)", + "type": "integer", "allowNull": false, "defaultValue": null, "listview": { @@ -1537,79 +1380,45 @@ } }, { - "verbose": "many to many single", - "name": "controls_inline_mtm_single", + "name": "controls_otm_single_id", + "verbose": "controls_otm_single_id", "control": { - "select": true, - "multiple": true + "text": true }, - "type": "int(11)", - "allowNull": false, + "type": "integer", + "allowNull": true, + "defaultValue": null, "listview": { "show": true }, "editview": { "show": true - }, - "manyToMany": { - "link": { - "table": "controls_inline_has_controls_inline_mtm_single", - "parentPk": "controls_inline_id", - "childPk": "controls_inline_mtm_single_id" - }, - "ref": { - "table": "controls_inline_mtm_single", - "pk": "id", - "columns": [ - "name" - ] - } } }, { - "verbose": "many to many multiple", - "name": "controls_inline_mtm_multiple", + "name": "controls_otm_multiple_id", + "verbose": "controls_otm_multiple_id", "control": { - "select": true, - "multiple": true + "text": true }, - "type": "int(11)", - "allowNull": false, + "type": "integer", + "allowNull": true, + "defaultValue": null, "listview": { "show": true }, "editview": { "show": true - }, - "manyToMany": { - "link": { - "table": "controls_inline_has_controls_inline_mtm_multiple", - "parentPk": "controls_inline_id", - "childPk": "controls_inline_mtm_multiple_id" - }, - "ref": { - "table": "controls_inline_mtm_multiple", - "pk": "id", - "columns": [ - "first", - "last" - ] - } } }, { "name": "static", "verbose": "static", "control": { - "select": true, - "options": [ - "one", - "two", - "three" - ] + "text": true }, "type": "varchar(45)", - "allowNull": false, + "allowNull": true, "defaultValue": null, "listview": { "show": true @@ -1625,7 +1434,7 @@ "text": true }, "type": "varchar(45)", - "allowNull": false, + "allowNull": true, "defaultValue": null, "listview": { "show": true @@ -1638,14 +1447,10 @@ "name": "boolean", "verbose": "boolean", "control": { - "radio": true, - "options": [ - "Yes", - "No" - ] + "text": true }, "type": "char", - "allowNull": false, + "allowNull": true, "defaultValue": null, "listview": { "show": true @@ -1658,10 +1463,10 @@ "name": "bigint", "verbose": "bigint", "control": { - "number": true + "text": true }, "type": "bigint", - "allowNull": false, + "allowNull": true, "defaultValue": null, "listview": { "show": true @@ -1674,10 +1479,10 @@ "name": "double", "verbose": "double", "control": { - "number": true + "text": true }, "type": "double", - "allowNull": false, + "allowNull": true, "defaultValue": null, "listview": { "show": true @@ -1690,10 +1495,10 @@ "name": "upload", "verbose": "upload", "control": { - "file": true + "text": true }, "type": "varchar(45)", - "allowNull": false, + "allowNull": true, "defaultValue": null, "listview": { "show": true @@ -1706,11 +1511,10 @@ "name": "binary", "verbose": "binary", "control": { - "file": true, - "binary": true + "text": true }, "type": "bytea", - "allowNull": false, + "allowNull": true, "defaultValue": null, "listview": { "show": true @@ -1723,10 +1527,10 @@ "name": "date", "verbose": "date", "control": { - "date": true + "text": true }, "type": "date", - "allowNull": false, + "allowNull": true, "defaultValue": null, "listview": { "show": true @@ -1739,10 +1543,10 @@ "name": "time", "verbose": "time", "control": { - "time": true + "text": true }, "type": "time", - "allowNull": false, + "allowNull": true, "defaultValue": null, "listview": { "show": true @@ -1755,10 +1559,10 @@ "name": "datetime", "verbose": "datetime", "control": { - "datetime": true + "text": true }, - "type": "datetime", - "allowNull": false, + "type": "timestamp", + "allowNull": true, "defaultValue": null, "listview": { "show": true @@ -1770,64 +1574,11 @@ { "name": "textarea", "verbose": "textarea", - "control": { - "textarea": true, - "editor": "ck-compact" - }, - "type": "text", - "allowNull": false, - "defaultValue": null, - "listview": { - "show": true - }, - "editview": { - "show": true - } - } - ], - "mainview": { - "show": false - }, - "listview": { - "order": {}, - "page": 25 - }, - "editview": { - "readonly": false - } - }, - "controls_inline_has_controls_inline_mtm_multiple": { - "slug": "controls_inline_has_controls_inline_mtm_multiple", - "table": { - "name": "controls_inline_has_controls_inline_mtm_multiple", - "pk": "controls_inline_id", - "verbose": "controls_inline_has_controls_inline_mtm_multiple" - }, - "columns": [ - { - "name": "controls_inline_id", - "verbose": "controls_inline_id", "control": { "text": true }, - "type": "int(11)", - "allowNull": false, - "defaultValue": null, - "listview": { - "show": true - }, - "editview": { - "show": true - } - }, - { - "name": "controls_inline_mtm_multiple_id", - "verbose": "controls_inline_mtm_multiple_id", - "control": { - "text": true - }, - "type": "int(11)", - "allowNull": false, + "type": "text", + "allowNull": true, "defaultValue": null, "listview": { "show": true @@ -1838,7 +1589,7 @@ } ], "mainview": { - "show": false + "show": true }, "listview": { "order": {}, @@ -1848,21 +1599,21 @@ "readonly": false } }, - "controls_inline_has_controls_inline_mtm_single": { - "slug": "controls_inline_has_controls_inline_mtm_single", + "controls_inline_otm_single": { + "slug": "controls_inline_otm_single", "table": { - "name": "controls_inline_has_controls_inline_mtm_single", - "pk": "controls_inline_id", - "verbose": "controls_inline_has_controls_inline_mtm_single" + "name": "controls_inline_otm_single", + "pk": "id", + "verbose": "controls_inline_otm_single" }, "columns": [ { - "name": "controls_inline_id", - "verbose": "controls_inline_id", + "name": "id", + "verbose": "id", "control": { "text": true }, - "type": "int(11)", + "type": "integer", "allowNull": false, "defaultValue": null, "listview": { @@ -1873,12 +1624,12 @@ } }, { - "name": "controls_inline_mtm_single_id", - "verbose": "controls_inline_mtm_single_id", + "name": "name", + "verbose": "name", "control": { "text": true }, - "type": "int(11)", + "type": "varchar(45)", "allowNull": false, "defaultValue": null, "listview": { @@ -1890,7 +1641,7 @@ } ], "mainview": { - "show": false + "show": true }, "listview": { "order": {}, @@ -1900,12 +1651,12 @@ "readonly": false } }, - "controls_inline_mtm_multiple": { - "slug": "controls_inline_mtm_multiple", + "controls_inline_otm_multiple": { + "slug": "controls_inline_otm_multiple", "table": { - "name": "controls_inline_mtm_multiple", + "name": "controls_inline_otm_multiple", "pk": "id", - "verbose": "controls_inline_mtm_multiple" + "verbose": "controls_inline_otm_multiple" }, "columns": [ { @@ -1914,7 +1665,7 @@ "control": { "text": true }, - "type": "int(11)", + "type": "integer", "allowNull": false, "defaultValue": null, "listview": { @@ -1958,7 +1709,7 @@ } ], "mainview": { - "show": false + "show": true }, "listview": { "order": {}, @@ -1982,7 +1733,7 @@ "control": { "text": true }, - "type": "int(11)", + "type": "integer", "allowNull": false, "defaultValue": null, "listview": { @@ -2010,7 +1761,7 @@ } ], "mainview": { - "show": false + "show": true }, "listview": { "order": {}, @@ -2020,12 +1771,12 @@ "readonly": false } }, - "controls_inline_otm_multiple": { - "slug": "controls_inline_otm_multiple", + "controls_inline_mtm_multiple": { + "slug": "controls_inline_mtm_multiple", "table": { - "name": "controls_inline_otm_multiple", + "name": "controls_inline_mtm_multiple", "pk": "id", - "verbose": "controls_inline_otm_multiple" + "verbose": "controls_inline_mtm_multiple" }, "columns": [ { @@ -2034,7 +1785,7 @@ "control": { "text": true }, - "type": "int(11)", + "type": "integer", "allowNull": false, "defaultValue": null, "listview": { @@ -2078,7 +1829,7 @@ } ], "mainview": { - "show": false + "show": true }, "listview": { "order": {}, @@ -2088,21 +1839,24 @@ "readonly": false } }, - "controls_inline_otm_single": { - "slug": "controls_inline_otm_single", + "controls_inline_has_controls_inline_mtm_single": { + "slug": "controls_inline_has_controls_inline_mtm_single", "table": { - "name": "controls_inline_otm_single", - "pk": "id", - "verbose": "controls_inline_otm_single" + "name": "controls_inline_has_controls_inline_mtm_single", + "pk": [ + "controls_inline_id", + "controls_inline_mtm_single_id" + ], + "verbose": "controls_inline_has_controls_inline_mtm_single" }, "columns": [ { - "name": "id", - "verbose": "id", + "name": "controls_inline_id", + "verbose": "controls_inline_id", "control": { "text": true }, - "type": "int(11)", + "type": "integer", "allowNull": false, "defaultValue": null, "listview": { @@ -2113,12 +1867,12 @@ } }, { - "name": "name", - "verbose": "name", + "name": "controls_inline_mtm_single_id", + "verbose": "controls_inline_mtm_single_id", "control": { "text": true }, - "type": "varchar(45)", + "type": "integer", "allowNull": false, "defaultValue": null, "listview": { @@ -2130,7 +1884,7 @@ } ], "mainview": { - "show": false + "show": true }, "listview": { "order": {}, @@ -2140,21 +1894,24 @@ "readonly": false } }, - "controls_mtm_multiple": { - "slug": "controls_mtm_multiple", + "controls_inline_has_controls_inline_mtm_multiple": { + "slug": "controls_inline_has_controls_inline_mtm_multiple", "table": { - "name": "controls_mtm_multiple", - "pk": "id", - "verbose": "controls_mtm_multiple" + "name": "controls_inline_has_controls_inline_mtm_multiple", + "pk": [ + "controls_inline_id", + "controls_inline_mtm_multiple_id" + ], + "verbose": "controls_inline_has_controls_inline_mtm_multiple" }, "columns": [ { - "name": "id", - "verbose": "id", + "name": "controls_inline_id", + "verbose": "controls_inline_id", "control": { "text": true }, - "type": "int(11)", + "type": "integer", "allowNull": false, "defaultValue": null, "listview": { @@ -2165,12 +1922,12 @@ } }, { - "name": "first", - "verbose": "first", + "name": "controls_inline_mtm_multiple_id", + "verbose": "controls_inline_mtm_multiple_id", "control": { "text": true }, - "type": "varchar(45)", + "type": "integer", "allowNull": false, "defaultValue": null, "listview": { @@ -2179,26 +1936,10 @@ "editview": { "show": true } - }, - { - "name": "last", - "verbose": "last", - "control": { - "text": true - }, - "type": "varchar(45)", - "allowNull": true, - "defaultValue": null, - "listview": { - "show": true - }, - "editview": { - "show": true - } } ], "mainview": { - "show": false + "show": true }, "listview": { "order": {}, @@ -2208,12 +1949,12 @@ "readonly": false } }, - "controls_mtm_single": { - "slug": "controls_mtm_single", + "controls_inline": { + "slug": "controls_inline", "table": { - "name": "controls_mtm_single", + "name": "controls_inline", "pk": "id", - "verbose": "controls_mtm_single" + "verbose": "controls_inline" }, "columns": [ { @@ -2222,7 +1963,7 @@ "control": { "text": true }, - "type": "int(11)", + "type": "integer", "allowNull": false, "defaultValue": null, "listview": { @@ -2233,12 +1974,12 @@ } }, { - "name": "name", - "verbose": "name", + "name": "controls_id", + "verbose": "controls_id", "control": { "text": true }, - "type": "varchar(45)", + "type": "integer", "allowNull": false, "defaultValue": null, "listview": { @@ -2247,34 +1988,14 @@ "editview": { "show": true } - } - ], - "mainview": { - "show": false - }, - "listview": { - "order": {}, - "page": 25 - }, - "editview": { - "readonly": false - } - }, - "controls_otm_multiple": { - "slug": "controls_otm_multiple", - "table": { - "name": "controls_otm_multiple", - "pk": "id", - "verbose": "controls_otm_multiple" - }, - "columns": [ + }, { - "name": "id", - "verbose": "id", + "name": "controls_inline_otm_single_id", + "verbose": "controls_inline_otm_single_id", "control": { "text": true }, - "type": "int(11)", + "type": "integer", "allowNull": false, "defaultValue": null, "listview": { @@ -2285,8 +2006,24 @@ } }, { - "name": "first", - "verbose": "first", + "name": "controls_inline_otm_multiple_id", + "verbose": "controls_inline_otm_multiple_id", + "control": { + "text": true + }, + "type": "integer", + "allowNull": false, + "defaultValue": null, + "listview": { + "show": true + }, + "editview": { + "show": true + } + }, + { + "name": "static", + "verbose": "static", "control": { "text": true }, @@ -2301,13 +2038,13 @@ } }, { - "name": "last", - "verbose": "last", + "name": "text", + "verbose": "text", "control": { "text": true }, "type": "varchar(45)", - "allowNull": true, + "allowNull": false, "defaultValue": null, "listview": { "show": true @@ -2315,34 +2052,14 @@ "editview": { "show": true } - } - ], - "mainview": { - "show": false - }, - "listview": { - "order": {}, - "page": 25 - }, - "editview": { - "readonly": false - } - }, - "controls_otm_single": { - "slug": "controls_otm_single", - "table": { - "name": "controls_otm_single", - "pk": "id", - "verbose": "controls_otm_single" - }, - "columns": [ + }, { - "name": "id", - "verbose": "id", + "name": "boolean", + "verbose": "boolean", "control": { "text": true }, - "type": "int(11)", + "type": "char", "allowNull": false, "defaultValue": null, "listview": { @@ -2353,8 +2070,40 @@ } }, { - "name": "name", - "verbose": "name", + "name": "bigint", + "verbose": "bigint", + "control": { + "text": true + }, + "type": "bigint", + "allowNull": false, + "defaultValue": null, + "listview": { + "show": true + }, + "editview": { + "show": true + } + }, + { + "name": "double", + "verbose": "double", + "control": { + "text": true + }, + "type": "double", + "allowNull": false, + "defaultValue": null, + "listview": { + "show": true + }, + "editview": { + "show": true + } + }, + { + "name": "upload", + "verbose": "upload", "control": { "text": true }, @@ -2367,105 +2116,82 @@ "editview": { "show": true } - } - ], - "mainview": { - "show": false - }, - "listview": { - "order": {}, - "page": 25 - }, - "editview": { - "readonly": false - } - }, - "notes": { - "slug": "notes", - "table": { - "name": "notes", - "pk": "id", - "verbose": "Notes (Editors)" - }, - "columns": [ + }, { - "verbose": "id", - "name": "id", + "name": "binary", + "verbose": "binary", "control": { "text": true }, - "type": "int(11)", + "type": "bytea", "allowNull": false, "defaultValue": null, "listview": { "show": true }, "editview": { - "show": false + "show": true } }, { - "verbose": "Textarea", - "name": "notes1", + "name": "date", + "verbose": "date", "control": { - "textarea": true + "text": true }, - "type": "text", - "allowNull": true, + "type": "date", + "allowNull": false, "defaultValue": null, "listview": { - "show": false + "show": true }, "editview": { "show": true } }, { - "verbose": "CKEditor Full", - "name": "notes2", + "name": "time", + "verbose": "time", "control": { - "textarea": true, - "editor": "ck-full" + "text": true }, - "type": "text", + "type": "time", "allowNull": false, "defaultValue": null, "listview": { - "show": false + "show": true }, "editview": { "show": true } }, { - "verbose": "CKEditor Compact", - "name": "notes3", + "name": "datetime", + "verbose": "datetime", "control": { - "textarea": true, - "editor": "ck-compact" + "text": true }, - "type": "text", - "allowNull": true, + "type": "timestamp", + "allowNull": false, "defaultValue": null, "listview": { - "show": false + "show": true }, "editview": { "show": true } }, { - "verbose": "TinyMCE", - "name": "notes4", + "name": "textarea", + "verbose": "textarea", "control": { - "textarea": true, - "editor": "tinymce" + "text": true }, "type": "text", "allowNull": false, "defaultValue": null, "listview": { - "show": false + "show": true }, "editview": { "show": true diff --git a/config/sqlite/custom.json b/config/sqlite/custom.json index fa0e46c..1b14e1f 100644 --- a/config/sqlite/custom.json +++ b/config/sqlite/custom.json @@ -1,7 +1,7 @@ { "editors": { "app": { - "path": "/home/mighty/node/modules/express-admin-examples/config/custom/editors/app.js", + "path": "/home/revlin/Projects/maponics-source/express-admin-examples/config/custom/editors/app.js", "slug": "upload" }, "public": { @@ -11,7 +11,7 @@ ] }, "local": { - "path": "/home/mighty/node/modules/express-admin-examples/config/custom/editors", + "path": "/home/revlin/Projects/maponics-source/express-admin-examples/config/custom/editors", "js": [ "/jslib/tinymce/js/tinymce/tinymce.min.js", "/jslib/tinymce/js/tinymce/jquery.tinymce.min.js", @@ -22,7 +22,7 @@ }, "view1": { "app": { - "path": "/home/mighty/node/modules/express-admin-examples/config/custom/app1/app.js", + "path": "/home/revlin/Projects/maponics-source/express-admin-examples/config/custom/app1/app.js", "slug": "view1", "verbose": "Simple", "mainview": { @@ -32,7 +32,7 @@ }, "view2": { "app": { - "path" : "/home/mighty/node/modules/express-admin-examples/config/custom/app2/app.js", + "path" : "/home/revlin/Projects/maponics-source/express-admin-examples/config/custom/app2/app.js", "slug": "view2", "verbose": "Custom global static files", "mainview": { @@ -41,7 +41,7 @@ }, "public": { "local": { - "path": "/home/mighty/node/modules/express-admin-examples/config/custom/app2/public", + "path": "/home/revlin/Projects/maponics-source/express-admin-examples/config/custom/app2/public", "css": [ "/css/global.css" ], @@ -53,7 +53,7 @@ }, "view3": { "app": { - "path" : "/home/mighty/node/modules/express-admin-examples/config/custom/app3/app.js", + "path" : "/home/revlin/Projects/maponics-source/express-admin-examples/config/custom/app3/app.js", "slug": "view3", "verbose": "Custom local static files", "mainview": { @@ -62,13 +62,13 @@ }, "public": { "local": { - "path": "/home/mighty/node/modules/express-admin-examples/config/custom/app3/public" + "path": "/home/revlin/Projects/maponics-source/express-admin-examples/config/custom/app3/public" } } }, "view4": { "app": { - "path" : "/home/mighty/node/modules/express-admin-examples/config/custom/app4/app.js", + "path" : "/home/revlin/Projects/maponics-source/express-admin-examples/config/custom/app4/app.js", "slug": "view4", "verbose": "Breadcrumbs", "mainview": { @@ -78,7 +78,7 @@ }, "stats": { "app": { - "path" : "/home/mighty/node/modules/express-admin-examples/config/custom/highcharts/app.js", + "path" : "/home/revlin/Projects/maponics-source/express-admin-examples/config/custom/highcharts/app.js", "slug": "stats", "verbose": "Highcharts Statistics", "mainview": { @@ -89,7 +89,7 @@ "static": { "public": { "local": { - "path": "/home/mighty/node/modules/express-admin-examples/config/custom/static", + "path": "/home/revlin/Projects/maponics-source/express-admin-examples/config/custom/static", "js": [ "/mtm-tags.js", "/theme.js", @@ -100,6 +100,6 @@ } }, "events": { - "events": "/home/mighty/node/modules/express-admin-examples/config/custom/events/events.js" + "events": "/home/revlin/Projects/maponics-source/express-admin-examples/config/custom/events/events.js" } } \ No newline at end of file diff --git a/fixtures/pg/schema.sql b/fixtures/pg/schema.sql index d35e73b..d1c843e 100644 --- a/fixtures/pg/schema.sql +++ b/fixtures/pg/schema.sql @@ -1,44 +1,15 @@ -DROP SCHEMA IF EXISTS "public" ; +--DROP SCHEMA IF EXISTS "public" ; CREATE SCHEMA "public"; GRANT ALL ON SCHEMA "public" to liolio; GRANT ALL ON ALL TABLES IN SCHEMA "public" to liolio; GRANT ALL ON ALL sequences IN SCHEMA "public" to liolio; -ALTER TABLE "public"."purchase" DROP CONSTRAINT "item_id"; -ALTER TABLE "public"."purchase" DROP CONSTRAINT "user_id"; -ALTER TABLE "public"."recipe_has_recipe_types" DROP CONSTRAINT "recipe_id"; -ALTER TABLE "public"."recipe_has_recipe_types" DROP CONSTRAINT "recipe_type_id"; -ALTER TABLE "public"."recipe_has_recipe_methods" DROP CONSTRAINT "recipe_id"; -ALTER TABLE "public"."recipe_has_recipe_methods" DROP CONSTRAINT "recipe_method_id"; -ALTER TABLE "public"."address" DROP CONSTRAINT "user_id"; -ALTER TABLE "public"."phone" DROP CONSTRAINT "user_id"; -ALTER TABLE "public"."repair" DROP CONSTRAINT "car_id"; -ALTER TABLE "public"."driver" DROP CONSTRAINT "car_id"; - -ALTER TABLE "public"."controls" DROP CONSTRAINT "controls_otm_single_id"; -ALTER TABLE "public"."controls" DROP CONSTRAINT "controls_otm_multiple_id"; - -ALTER TABLE "public"."controls_has_controls_mtm_single" DROP CONSTRAINT "controls_id"; -ALTER TABLE "public"."controls_has_controls_mtm_single" DROP CONSTRAINT "controls_mtm_single_id"; -ALTER TABLE "public"."controls_has_controls_mtm_multiple" DROP CONSTRAINT "controls_id"; -ALTER TABLE "public"."controls_has_controls_mtm_multiple" DROP CONSTRAINT "controls_mtm_multiple_id"; - -ALTER TABLE "public"."controls_inline" DROP CONSTRAINT "controls_inline_otm_single_id"; -ALTER TABLE "public"."controls_inline" DROP CONSTRAINT "controls_inline_otm_multiple_id"; -ALTER TABLE "public"."controls_inline" DROP CONSTRAINT "controls_id"; - -ALTER TABLE "public"."controls_inline_has_controls_inline_mtm_single" DROP CONSTRAINT "controls_inline_id"; -ALTER TABLE "public"."controls_inline_has_controls_inline_mtm_single" DROP CONSTRAINT "controls_inline_mtm_single_id"; -ALTER TABLE "public"."controls_inline_has_controls_inline_mtm_multiple" DROP CONSTRAINT "controls_inline_id"; -ALTER TABLE "public"."controls_inline_has_controls_inline_mtm_multiple" DROP CONSTRAINT "controls_inline_mtm_multiple_id"; - - -- ----------------------------------------------------- -- Table "notes" -- ----------------------------------------------------- -DROP TABLE IF EXISTS "public"."notes" ; +--DROP TABLE IF EXISTS "public"."notes" ; CREATE SEQUENCE "public".notes_id_seq; ALTER SEQUENCE "public".notes_id_seq OWNER TO liolio; @@ -52,12 +23,10 @@ CREATE TABLE IF NOT EXISTS "public"."notes" ( ALTER TABLE "public"."notes" OWNER TO liolio; - - -- ----------------------------------------------------- -- Table "item" -- ----------------------------------------------------- -DROP TABLE IF EXISTS "public"."item" ; +--DROP TABLE IF EXISTS "public"."item" ; CREATE SEQUENCE "public".item_id_seq; ALTER SEQUENCE "public".item_id_seq OWNER TO liolio; @@ -73,7 +42,7 @@ ALTER TABLE "public"."item" OWNER TO liolio; -- ----------------------------------------------------- -- Table "user" -- ----------------------------------------------------- -DROP TABLE IF EXISTS "public"."user" ; +--DROP TABLE IF EXISTS "public"."user" ; CREATE SEQUENCE "public".user_id_seq; ALTER SEQUENCE "public".user_id_seq OWNER TO liolio; @@ -90,7 +59,7 @@ ALTER TABLE "public"."user" OWNER TO liolio; -- ----------------------------------------------------- -- Table "purchase" -- ----------------------------------------------------- -DROP TABLE IF EXISTS "public"."purchase" ; +--DROP TABLE IF EXISTS "public"."purchase" ; CREATE SEQUENCE "public".purchase_id_seq; ALTER SEQUENCE "public".purchase_id_seq OWNER TO liolio; @@ -120,7 +89,7 @@ ALTER TABLE "public"."purchase" OWNER TO liolio; -- ----------------------------------------------------- -- Table "recipe" -- ----------------------------------------------------- -DROP TABLE IF EXISTS "public"."recipe" ; +--DROP TABLE IF EXISTS "public"."recipe" ; CREATE SEQUENCE "public".recipe_id_seq; ALTER SEQUENCE "public".recipe_id_seq OWNER TO liolio; @@ -134,7 +103,7 @@ ALTER TABLE "public"."recipe" OWNER TO liolio; -- ----------------------------------------------------- -- Table "recipe_type" -- ----------------------------------------------------- -DROP TABLE IF EXISTS "public"."recipe_type" ; +--DROP TABLE IF EXISTS "public"."recipe_type" ; CREATE SEQUENCE "public".recipe_type_id_seq; ALTER SEQUENCE "public".recipe_type_id_seq OWNER TO liolio; @@ -148,7 +117,7 @@ ALTER TABLE "public"."recipe_type" OWNER TO liolio; -- ----------------------------------------------------- -- Table "recipe_method" -- ----------------------------------------------------- -DROP TABLE IF EXISTS "public"."recipe_method" ; +--DROP TABLE IF EXISTS "public"."recipe_method" ; CREATE SEQUENCE "public".recipe_method_id_seq; ALTER SEQUENCE "public".recipe_method_id_seq OWNER TO liolio; @@ -162,7 +131,7 @@ ALTER TABLE "public"."recipe_method" OWNER TO liolio; -- ----------------------------------------------------- -- Table "recipe_has_recipe_types" -- ----------------------------------------------------- -DROP TABLE IF EXISTS "public"."recipe_has_recipe_types" ; +--DROP TABLE IF EXISTS "public"."recipe_has_recipe_types" ; CREATE TABLE IF NOT EXISTS "public"."recipe_has_recipe_types" ( "recipe_id" INT NOT NULL , @@ -185,7 +154,7 @@ ALTER TABLE "public"."recipe_has_recipe_types" OWNER TO liolio; -- ----------------------------------------------------- -- Table "recipe_has_recipe_methods" -- ----------------------------------------------------- -DROP TABLE IF EXISTS "public"."recipe_has_recipe_methods" ; +--DROP TABLE IF EXISTS "public"."recipe_has_recipe_methods" ; CREATE TABLE IF NOT EXISTS "public"."recipe_has_recipe_methods" ( "recipe_id" INT NOT NULL , @@ -208,7 +177,7 @@ ALTER TABLE "public"."recipe_has_recipe_methods" OWNER TO liolio; -- ----------------------------------------------------- -- Table "address" -- ----------------------------------------------------- -DROP TABLE IF EXISTS "public"."address" ; +--DROP TABLE IF EXISTS "public"."address" ; CREATE SEQUENCE "public".address_id_seq; ALTER SEQUENCE "public".address_id_seq OWNER TO liolio; @@ -229,7 +198,7 @@ ALTER TABLE "public"."address" OWNER TO liolio; -- ----------------------------------------------------- -- Table "phone" -- ----------------------------------------------------- -DROP TABLE IF EXISTS "public"."phone" ; +--DROP TABLE IF EXISTS "public"."phone" ; CREATE SEQUENCE "public".phone_id_seq; ALTER SEQUENCE "public".phone_id_seq OWNER TO liolio; @@ -250,7 +219,7 @@ ALTER TABLE "public"."phone" OWNER TO liolio; -- ----------------------------------------------------- -- Table "car" -- ----------------------------------------------------- -DROP TABLE IF EXISTS "public"."car" ; +--DROP TABLE IF EXISTS "public"."car" ; CREATE SEQUENCE "public".car_id_seq; ALTER SEQUENCE "public".car_id_seq OWNER TO liolio; @@ -264,7 +233,7 @@ ALTER TABLE "public"."car" OWNER TO liolio; -- ----------------------------------------------------- -- Table "repair" -- ----------------------------------------------------- -DROP TABLE IF EXISTS "public"."repair" ; +--DROP TABLE IF EXISTS "public"."repair" ; CREATE SEQUENCE "public".repair_id_seq; ALTER SEQUENCE "public".repair_id_seq OWNER TO liolio; @@ -284,7 +253,7 @@ ALTER TABLE "public"."repair" OWNER TO liolio; -- ----------------------------------------------------- -- Table "driver" -- ----------------------------------------------------- -DROP TABLE IF EXISTS "public"."driver" ; +--DROP TABLE IF EXISTS "public"."driver" ; CREATE SEQUENCE "public".driver_id_seq; ALTER SEQUENCE "public".driver_id_seq OWNER TO liolio; @@ -304,7 +273,7 @@ ALTER TABLE "public"."driver" OWNER TO liolio; -- ----------------------------------------------------- -- Table "controls_otm_single" -- ----------------------------------------------------- -DROP TABLE IF EXISTS "public"."controls_otm_single" ; +--DROP TABLE IF EXISTS "public"."controls_otm_single" ; CREATE SEQUENCE "public".controls_otm_single_id_seq; ALTER SEQUENCE "public".controls_otm_single_id_seq OWNER TO liolio; @@ -318,7 +287,7 @@ ALTER TABLE "public"."controls_otm_single" OWNER TO liolio; -- ----------------------------------------------------- -- Table "controls_otm_multiple" -- ----------------------------------------------------- -DROP TABLE IF EXISTS "public"."controls_otm_multiple" ; +--DROP TABLE IF EXISTS "public"."controls_otm_multiple" ; CREATE SEQUENCE "public".controls_otm_multiple_id_seq; ALTER SEQUENCE "public".controls_otm_multiple_id_seq OWNER TO liolio; @@ -333,7 +302,7 @@ ALTER TABLE "public"."controls_otm_multiple" OWNER TO liolio; -- ----------------------------------------------------- -- Table "controls" -- ----------------------------------------------------- -DROP TABLE IF EXISTS "public"."controls" ; +--DROP TABLE IF EXISTS "public"."controls" ; CREATE SEQUENCE "public".controls_id_seq; ALTER SEQUENCE "public".controls_id_seq OWNER TO liolio; @@ -369,7 +338,7 @@ ALTER TABLE "public"."controls" OWNER TO liolio; -- ----------------------------------------------------- -- Table "controls_mtm_single" -- ----------------------------------------------------- -DROP TABLE IF EXISTS "public"."controls_mtm_single" ; +--DROP TABLE IF EXISTS "public"."controls_mtm_single" ; CREATE SEQUENCE "public".controls_mtm_single_id_seq; ALTER SEQUENCE "public".controls_mtm_single_id_seq OWNER TO liolio; @@ -383,7 +352,7 @@ ALTER TABLE "public"."controls_mtm_single" OWNER TO liolio; -- ----------------------------------------------------- -- Table "controls_mtm_multiple" -- ----------------------------------------------------- -DROP TABLE IF EXISTS "public"."controls_mtm_multiple" ; +--DROP TABLE IF EXISTS "public"."controls_mtm_multiple" ; CREATE SEQUENCE "public".controls_mtm_multiple_id_seq; ALTER SEQUENCE "public".controls_mtm_multiple_id_seq OWNER TO liolio; @@ -398,8 +367,7 @@ ALTER TABLE "public"."controls_mtm_multiple" OWNER TO liolio; -- ----------------------------------------------------- -- Table "controls_has_controls_mtm_single" -- ----------------------------------------------------- -DROP TABLE IF EXISTS "public"."controls_has_controls_mtm_single" ; -ALTER SEQUENCE "public"."controls_has_controls_mtm_single" OWNER TO liolio; +--DROP TABLE IF EXISTS "public"."controls_has_controls_mtm_single" ; CREATE TABLE IF NOT EXISTS "public"."controls_has_controls_mtm_single" ( "controls_id" INT NOT NULL, @@ -421,7 +389,7 @@ ALTER TABLE "public"."controls_has_controls_mtm_single" OWNER TO liolio; -- ----------------------------------------------------- -- Table "controls_has_controls_mtm_multiple" -- ----------------------------------------------------- -DROP TABLE IF EXISTS "public"."controls_has_controls_mtm_multiple" ; +--DROP TABLE IF EXISTS "public"."controls_has_controls_mtm_multiple" ; CREATE TABLE IF NOT EXISTS "public"."controls_has_controls_mtm_multiple" ( "controls_id" INT NOT NULL, @@ -443,7 +411,7 @@ ALTER TABLE "public"."controls_has_controls_mtm_multiple" OWNER TO liolio; -- ----------------------------------------------------- -- Table "controls_inline_otm_single" -- ----------------------------------------------------- -DROP TABLE IF EXISTS "public"."controls_inline_otm_single" ; +--DROP TABLE IF EXISTS "public"."controls_inline_otm_single" ; CREATE SEQUENCE "public".controls_inline_otm_single_id_seq; ALTER SEQUENCE "public".controls_inline_otm_single_id_seq OWNER TO liolio; @@ -457,9 +425,9 @@ ALTER TABLE "public"."controls_inline_otm_single" OWNER TO liolio; -- ----------------------------------------------------- -- Table "controls_inline_otm_multiple" -- ----------------------------------------------------- -DROP TABLE IF EXISTS "public"."controls_inline_otm_multiple" ; +--DROP TABLE IF EXISTS "public"."controls_inline_otm_multiple" ; CREATE SEQUENCE "public".controls_inline_otm_multiple_id_seq; -ALTER SEQUENCE "public"."controls_inline_otm_multiple" OWNER TO liolio; +ALTER SEQUENCE "public".controls_inline_otm_multiple_id_seq OWNER TO liolio; CREATE TABLE IF NOT EXISTS "public"."controls_inline_otm_multiple" ( "id" INT NOT NULL DEFAULT nextval('controls_inline_otm_multiple_id_seq'), @@ -472,7 +440,7 @@ ALTER TABLE "public"."controls_inline_otm_multiple" OWNER TO liolio; -- ----------------------------------------------------- -- Table "controls_inline" -- ----------------------------------------------------- -DROP TABLE IF EXISTS "public"."controls_inline" ; +--DROP TABLE IF EXISTS "public"."controls_inline" ; CREATE SEQUENCE "public".controls_inline_id_seq; ALTER SEQUENCE "public".controls_inline_id_seq OWNER TO liolio; @@ -514,7 +482,7 @@ ALTER TABLE "public"."controls_inline" OWNER TO liolio; -- ----------------------------------------------------- -- Table "controls_inline_mtm_single" -- ----------------------------------------------------- -DROP TABLE IF EXISTS "public"."controls_inline_mtm_single" ; +--DROP TABLE IF EXISTS "public"."controls_inline_mtm_single" ; CREATE SEQUENCE "public".controls_inline_mtm_single_id_seq; ALTER SEQUENCE "public".controls_inline_mtm_single_id_seq OWNER TO liolio; @@ -528,7 +496,7 @@ ALTER TABLE "public"."controls_inline_mtm_single" OWNER TO liolio; -- ----------------------------------------------------- -- Table "controls_inline_mtm_multiple" -- ----------------------------------------------------- -DROP TABLE IF EXISTS "public"."controls_inline_mtm_multiple" ; +--DROP TABLE IF EXISTS "public"."controls_inline_mtm_multiple" ; CREATE SEQUENCE "public".controls_inline_mtm_multiple_id_seq; ALTER SEQUENCE "public".controls_inline_mtm_multiple_id_seq OWNER TO liolio; @@ -543,7 +511,7 @@ ALTER TABLE "public"."controls_inline_mtm_multiple" OWNER TO liolio; -- ----------------------------------------------------- -- Table "controls_inline_has_controls_inline_mtm_single" -- ----------------------------------------------------- -DROP TABLE IF EXISTS "public"."controls_inline_has_controls_inline_mtm_single" ; +--DROP TABLE IF EXISTS "public"."controls_inline_has_controls_inline_mtm_single" ; CREATE TABLE IF NOT EXISTS "public"."controls_inline_has_controls_inline_mtm_single" ( "controls_inline_id" INT NOT NULL, @@ -565,7 +533,7 @@ ALTER TABLE "public"."controls_inline_has_controls_inline_mtm_single" OWNER TO l -- ----------------------------------------------------- -- Table "controls_inline_has_controls_inline_mtm_multiple" -- ----------------------------------------------------- -DROP TABLE IF EXISTS "public"."controls_inline_has_controls_inline_mtm_multiple" ; +--DROP TABLE IF EXISTS "public"."controls_inline_has_controls_inline_mtm_multiple" ; CREATE TABLE IF NOT EXISTS "public"."controls_inline_has_controls_inline_mtm_multiple" ( "controls_inline_id" INT NOT NULL, @@ -582,3 +550,32 @@ CREATE TABLE IF NOT EXISTS "public"."controls_inline_has_controls_inline_mtm_mul ON DELETE NO ACTION ON UPDATE NO ACTION); ALTER TABLE "public"."controls_inline_has_controls_inline_mtm_multiple" OWNER TO liolio; + + +ALTER TABLE "public"."purchase" DROP CONSTRAINT "item_id"; +ALTER TABLE "public"."purchase" DROP CONSTRAINT "user_id"; +ALTER TABLE "public"."recipe_has_recipe_types" DROP CONSTRAINT "recipe_id"; +ALTER TABLE "public"."recipe_has_recipe_types" DROP CONSTRAINT "recipe_type_id"; +ALTER TABLE "public"."recipe_has_recipe_methods" DROP CONSTRAINT "recipe_id"; +ALTER TABLE "public"."recipe_has_recipe_methods" DROP CONSTRAINT "recipe_method_id"; +ALTER TABLE "public"."address" DROP CONSTRAINT "user_id"; +ALTER TABLE "public"."phone" DROP CONSTRAINT "user_id"; +ALTER TABLE "public"."repair" DROP CONSTRAINT "car_id"; +ALTER TABLE "public"."driver" DROP CONSTRAINT "car_id"; + +ALTER TABLE "public"."controls" DROP CONSTRAINT "controls_otm_single_id"; +ALTER TABLE "public"."controls" DROP CONSTRAINT "controls_otm_multiple_id"; + +ALTER TABLE "public"."controls_has_controls_mtm_single" DROP CONSTRAINT "controls_id"; +ALTER TABLE "public"."controls_has_controls_mtm_single" DROP CONSTRAINT "controls_mtm_single_id"; +ALTER TABLE "public"."controls_has_controls_mtm_multiple" DROP CONSTRAINT "controls_id"; +ALTER TABLE "public"."controls_has_controls_mtm_multiple" DROP CONSTRAINT "controls_mtm_multiple_id"; + +ALTER TABLE "public"."controls_inline" DROP CONSTRAINT "controls_inline_otm_single_id"; +ALTER TABLE "public"."controls_inline" DROP CONSTRAINT "controls_inline_otm_multiple_id"; +ALTER TABLE "public"."controls_inline" DROP CONSTRAINT "controls_id"; + +ALTER TABLE "public"."controls_inline_has_controls_inline_mtm_single" DROP CONSTRAINT "controls_inline_id"; +ALTER TABLE "public"."controls_inline_has_controls_inline_mtm_single" DROP CONSTRAINT "controls_inline_mtm_single_id"; +ALTER TABLE "public"."controls_inline_has_controls_inline_mtm_multiple" DROP CONSTRAINT "controls_inline_id"; +ALTER TABLE "public"."controls_inline_has_controls_inline_mtm_multiple" DROP CONSTRAINT "controls_inline_mtm_multiple_id"; diff --git a/path.js b/path.js index 1a8358c..b0481f6 100644 --- a/path.js +++ b/path.js @@ -6,7 +6,7 @@ var fs = require('fs'), util = require('util'); ['mysql', 'pg', 'sqlite'].forEach(function (engine) { - var cwd = (process.env.OS.match(/Windows/) !== null)? + var cwd = (process.env.OS && process.env.OS.match(/Windows/) !== null)? __dirname.replace(/\\/g, "/"): __dirname; From 3f1dde553e5944a135b050e257b81f95b5cb8e17 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 7 Jul 2015 06:52:23 -0700 Subject: [PATCH 8/8] revert config... again --- config/pg/custom.json | 102 ++- config/pg/settings.json | 1546 +++++++++++++++++++++++---------------- 2 files changed, 1011 insertions(+), 637 deletions(-) diff --git a/config/pg/custom.json b/config/pg/custom.json index 9e26dfe..cf999bd 100644 --- a/config/pg/custom.json +++ b/config/pg/custom.json @@ -1 +1,101 @@ -{} \ No newline at end of file +{ + "editors": { + "app": { + "path": "/home/mighty/node/modules/express-admin-examples/config/custom/editors/app.js", + "slug": "upload" + }, + "public": { + "external": { + "js": [ + "//cdn.ckeditor.com/4.4.2/standard/ckeditor.js" + ] + }, + "local": { + "path": "/home/mighty/node/modules/express-admin-examples/config/custom/editors", + "js": [ + "/jslib/tinymce/js/tinymce/tinymce.min.js", + "/jslib/tinymce/js/tinymce/jquery.tinymce.min.js", + "/editors.js" + ] + } + } + }, + "view1": { + "app": { + "path": "/home/mighty/node/modules/express-admin-examples/config/custom/app1/app.js", + "slug": "view1", + "verbose": "Simple", + "mainview": { + "show": true + } + } + }, + "view2": { + "app": { + "path" : "/home/mighty/node/modules/express-admin-examples/config/custom/app2/app.js", + "slug": "view2", + "verbose": "Custom global static files", + "mainview": { + "show": true + } + }, + "public": { + "path": "/home/mighty/node/modules/express-admin-examples/config/custom/app2/public", + "css": [ + "/css/global.css" + ], + "js": [ + "/js/global.js" + ] + } + }, + "view3": { + "app": { + "path" : "/home/mighty/node/modules/express-admin-examples/config/custom/app3/app.js", + "slug": "view3", + "verbose": "Custom local static files", + "mainview": { + "show": true + } + }, + "public": { + "path": "/home/mighty/node/modules/express-admin-examples/config/custom/app3/public" + } + }, + "view4": { + "app": { + "path" : "/home/mighty/node/modules/express-admin-examples/config/custom/app4/app.js", + "slug": "view4", + "verbose": "Breadcrumbs", + "mainview": { + "show": true + } + } + }, + "stats": { + "app": { + "path" : "/home/mighty/node/modules/express-admin-examples/config/custom/highcharts/app.js", + "slug": "stats", + "verbose": "Highcharts Statistics", + "mainview": { + "show": true + } + } + }, + "static": { + "public": { + "local": { + "path": "/home/mighty/node/modules/express-admin-examples/config/custom/static", + "js": [ + "/mtm-tags.js", + "/theme.js", + "/images.js", + "/binary.js" + ] + } + } + }, + "events": { + "events": "/home/mighty/node/modules/express-admin-examples/config/custom/events/events.js" + } +} \ No newline at end of file diff --git a/config/pg/settings.json b/config/pg/settings.json index 3b3d529..ebeb5a5 100644 --- a/config/pg/settings.json +++ b/config/pg/settings.json @@ -1,19 +1,35 @@ { - "notes": { - "slug": "notes", + "purchase": { + "slug": "purchase", "table": { - "name": "notes", + "name": "purchase", "pk": "id", - "verbose": "notes" + "verbose": "Purchase (One to Many)" }, "columns": [ { - "name": "id", "verbose": "id", + "name": "id", "control": { "text": true }, - "type": "integer", + "type": "int(11)", + "allowNull": false, + "defaultValue": null, + "listview": { + "show": false + }, + "editview": { + "show": false + } + }, + { + "verbose": "Item", + "name": "item_id", + "control": { + "select": true + }, + "type": "int(11)", "allowNull": false, "defaultValue": null, "listview": { @@ -21,15 +37,22 @@ }, "editview": { "show": true + }, + "oneToMany": { + "table": "item", + "pk": "id", + "columns": [ + "name" + ] } }, { - "name": "notes1", - "verbose": "notes1", + "verbose": "User", + "name": "user_id", "control": { - "text": true + "select": true }, - "type": "text", + "type": "int(11)", "allowNull": true, "defaultValue": null, "listview": { @@ -37,15 +60,23 @@ }, "editview": { "show": true + }, + "oneToMany": { + "table": "user", + "pk": "id", + "columns": [ + "firstname", + "lastname" + ] } }, { - "name": "notes2", - "verbose": "notes2", + "verbose": "Cache", + "name": "cache", "control": { "text": true }, - "type": "text", + "type": "decimal(6,2)", "allowNull": false, "defaultValue": null, "listview": { @@ -56,12 +87,12 @@ } }, { - "name": "notes3", - "verbose": "notes3", + "verbose": "Date", + "name": "date", "control": { - "text": true + "date": true }, - "type": "text", + "type": "date", "allowNull": true, "defaultValue": null, "listview": { @@ -72,19 +103,39 @@ } }, { - "name": "notes4", - "verbose": "notes4", + "name": "deleted", + "verbose": "Deleted", "control": { - "text": true + "radio": true, + "options": [ + "Yes", + "No" + ] }, - "type": "text", - "allowNull": false, + "type": "boolean", + "allowNull": true, "defaultValue": null, "listview": { - "show": true + "show": false }, "editview": { - "show": true + "show": false + } + }, + { + "name": "deleted_at", + "verbose": "Deleted At", + "control": { + "datetime": true + }, + "type": "datetime", + "allowNull": true, + "defaultValue": null, + "listview": { + "show": false + }, + "editview": { + "show": false } } ], @@ -93,7 +144,15 @@ }, "listview": { "order": {}, - "page": 25 + "page": 5, + "filter": [ + "item_id", + "user_id", + "cache", + "date", + "deleted", + "deleted_at" + ] }, "editview": { "readonly": false @@ -104,28 +163,28 @@ "table": { "name": "item", "pk": "id", - "verbose": "item" + "verbose": "Item" }, "columns": [ { - "name": "id", "verbose": "id", + "name": "id", "control": { "text": true }, - "type": "integer", + "type": "int(11)", "allowNull": false, "defaultValue": null, "listview": { - "show": true + "show": false }, "editview": { - "show": true + "show": false } }, { - "name": "name", "verbose": "name", + "name": "name", "control": { "text": true }, @@ -140,16 +199,16 @@ } }, { - "name": "description", "verbose": "description", + "name": "description", "control": { - "text": true + "textarea": true }, "type": "text", "allowNull": true, "defaultValue": null, "listview": { - "show": true + "show": false }, "editview": { "show": true @@ -159,7 +218,7 @@ "name": "image", "verbose": "image", "control": { - "text": true + "file": true }, "type": "varchar(255)", "allowNull": true, @@ -183,37 +242,37 @@ "readonly": false } }, - "purchase": { - "slug": "purchase", + "recipe": { + "slug": "recipe", "table": { - "name": "purchase", + "name": "recipe", "pk": "id", - "verbose": "purchase" + "verbose": "Recipe (Many to Many)" }, "columns": [ { - "name": "id", "verbose": "id", + "name": "id", "control": { "text": true }, - "type": "integer", + "type": "int(11)", "allowNull": false, "defaultValue": null, "listview": { "show": true }, "editview": { - "show": true + "show": false } }, { - "name": "item_id", - "verbose": "item_id", + "verbose": "Name", + "name": "name", "control": { "text": true }, - "type": "integer", + "type": "varchar(45)", "allowNull": false, "defaultValue": null, "listview": { @@ -224,61 +283,93 @@ } }, { - "name": "user_id", - "verbose": "user_id", - "control": { - "text": true - }, - "type": "integer", - "allowNull": true, - "defaultValue": null, - "listview": { - "show": true - }, - "editview": { - "show": true - } - }, - { - "name": "cache", - "verbose": "cache", + "verbose": "Recipe Types", + "name": "recipe_type", "control": { - "text": true + "select": true, + "multiple": true }, - "type": "decimal(6,2)", + "type": "int(11)", "allowNull": false, - "defaultValue": null, "listview": { - "show": true + "show": false }, "editview": { "show": true + }, + "manyToMany": { + "link": { + "table": "recipe_has_recipe_types", + "parentPk": "recipe_id", + "childPk": "recipe_type_id" + }, + "ref": { + "table": "recipe_type", + "pk": "id", + "columns": [ + "title" + ] + } } }, { - "name": "date", - "verbose": "date", + "verbose": "Recipe Methods", + "name": "recipe_method", "control": { - "text": true + "select": true, + "multiple": true }, - "type": "date", + "type": "int(11)", "allowNull": true, - "defaultValue": null, "listview": { - "show": true + "show": false }, "editview": { "show": true + }, + "manyToMany": { + "link": { + "table": "recipe_has_recipe_methods", + "parentPk": "recipe_id", + "childPk": "recipe_method_id" + }, + "ref": { + "table": "recipe_method", + "pk": "id", + "columns": [ + "title" + ] + } } - }, + } + ], + "mainview": { + "show": true + }, + "listview": { + "order": {}, + "page": 25 + }, + "editview": { + "readonly": false + } + }, + "recipe_has_recipe_methods": { + "slug": "recipe_has_recipe_methods", + "table": { + "name": "recipe_has_recipe_methods", + "pk": "recipe_id", + "verbose": "recipe_has_recipe_methods" + }, + "columns": [ { - "name": "deleted", - "verbose": "deleted", + "verbose": "recipe_id", + "name": "recipe_id", "control": { "text": true }, - "type": "char", - "allowNull": true, + "type": "int(11)", + "allowNull": false, "defaultValue": null, "listview": { "show": true @@ -288,13 +379,13 @@ } }, { - "name": "deleted_at", - "verbose": "deleted_at", + "verbose": "recipe_method_id", + "name": "recipe_method_id", "control": { "text": true }, - "type": "timestamp", - "allowNull": true, + "type": "int(11)", + "allowNull": false, "defaultValue": null, "listview": { "show": true @@ -305,7 +396,7 @@ } ], "mainview": { - "show": true + "show": false }, "listview": { "order": {}, @@ -315,21 +406,21 @@ "readonly": false } }, - "recipe_type": { - "slug": "recipe_type", + "recipe_has_recipe_types": { + "slug": "recipe_has_recipe_types", "table": { - "name": "recipe_type", - "pk": "id", - "verbose": "recipe_type" + "name": "recipe_has_recipe_types", + "pk": "recipe_id", + "verbose": "recipe_has_recipe_types" }, "columns": [ { - "name": "id", - "verbose": "id", + "verbose": "recipe_id", + "name": "recipe_id", "control": { "text": true }, - "type": "integer", + "type": "int(11)", "allowNull": false, "defaultValue": null, "listview": { @@ -340,12 +431,12 @@ } }, { - "name": "title", - "verbose": "title", + "verbose": "recipe_type_id", + "name": "recipe_type_id", "control": { "text": true }, - "type": "varchar(45)", + "type": "int(11)", "allowNull": false, "defaultValue": null, "listview": { @@ -357,7 +448,7 @@ } ], "mainview": { - "show": true + "show": false }, "listview": { "order": {}, @@ -372,28 +463,28 @@ "table": { "name": "recipe_method", "pk": "id", - "verbose": "recipe_method" + "verbose": "Recipe Method" }, "columns": [ { - "name": "id", "verbose": "id", + "name": "id", "control": { "text": true }, - "type": "integer", + "type": "int(11)", "allowNull": false, "defaultValue": null, "listview": { - "show": true + "show": false }, "editview": { - "show": true + "show": false } }, { - "name": "title", "verbose": "title", + "name": "title", "control": { "text": true }, @@ -419,33 +510,33 @@ "readonly": false } }, - "recipe": { - "slug": "recipe", + "recipe_type": { + "slug": "recipe_type", "table": { - "name": "recipe", + "name": "recipe_type", "pk": "id", - "verbose": "recipe" + "verbose": "Recipe Type" }, "columns": [ { - "name": "id", "verbose": "id", + "name": "id", "control": { "text": true }, - "type": "integer", + "type": "int(11)", "allowNull": false, "defaultValue": null, "listview": { - "show": true + "show": false }, "editview": { - "show": true + "show": false } }, { - "name": "name", - "verbose": "name", + "verbose": "title", + "name": "title", "control": { "text": true }, @@ -471,40 +562,37 @@ "readonly": false } }, - "recipe_has_recipe_types": { - "slug": "recipe_has_recipe_types", + "user": { + "slug": "user", "table": { - "name": "recipe_has_recipe_types", - "pk": [ - "recipe_id", - "recipe_type_id" - ], - "verbose": "recipe_has_recipe_types" + "name": "user", + "pk": "id", + "verbose": "User (One to One)" }, "columns": [ { - "name": "recipe_id", - "verbose": "recipe_id", + "verbose": "id", + "name": "id", "control": { "text": true }, - "type": "integer", + "type": "int(11)", "allowNull": false, "defaultValue": null, "listview": { - "show": true + "show": false }, "editview": { - "show": true + "show": false } }, { - "name": "recipe_type_id", - "verbose": "recipe_type_id", + "verbose": "firstname", + "name": "firstname", "control": { "text": true }, - "type": "integer", + "type": "varchar(45)", "allowNull": false, "defaultValue": null, "listview": { @@ -513,38 +601,15 @@ "editview": { "show": true } - } - ], - "mainview": { - "show": true - }, - "listview": { - "order": {}, - "page": 25 - }, - "editview": { - "readonly": false - } - }, - "recipe_has_recipe_methods": { - "slug": "recipe_has_recipe_methods", - "table": { - "name": "recipe_has_recipe_methods", - "pk": [ - "recipe_id", - "recipe_method_id" - ], - "verbose": "recipe_has_recipe_methods" - }, - "columns": [ + }, { - "name": "recipe_id", - "verbose": "recipe_id", + "verbose": "lastname", + "name": "lastname", "control": { "text": true }, - "type": "integer", - "allowNull": false, + "type": "varchar(45)", + "allowNull": true, "defaultValue": null, "listview": { "show": true @@ -554,19 +619,35 @@ } }, { - "name": "recipe_method_id", - "verbose": "recipe_method_id", + "name": "created_at", + "verbose": "created_at", "control": { "text": true }, - "type": "integer", + "type": "datetime", "allowNull": false, "defaultValue": null, "listview": { "show": true }, "editview": { + "show": false + } + }, + { + "name": "updated_at", + "verbose": "updated_at", + "control": { + "text": true + }, + "type": "datetime", + "allowNull": false, + "defaultValue": null, + "listview": { "show": true + }, + "editview": { + "show": false } } ], @@ -578,88 +659,60 @@ "page": 25 }, "editview": { - "readonly": false + "readonly": false, + "oneToOne": { + "address": "user_id", + "phone": "user_id" + } } }, - "user": { - "slug": "user", + "address": { + "slug": "address", "table": { - "name": "user", + "name": "address", "pk": "id", - "verbose": "user" + "verbose": "Address" }, "columns": [ { - "name": "id", "verbose": "id", + "name": "id", "control": { "text": true }, - "type": "integer", + "type": "int(11)", "allowNull": false, "defaultValue": null, "listview": { "show": true }, "editview": { - "show": true + "show": false } }, { - "name": "firstname", - "verbose": "firstname", + "verbose": "user_id", + "name": "user_id", "control": { "text": true }, - "type": "varchar(45)", + "type": "int(11)", "allowNull": false, "defaultValue": null, "listview": { "show": true }, "editview": { - "show": true + "show": false } }, { - "name": "lastname", - "verbose": "lastname", + "verbose": "street", + "name": "street", "control": { "text": true }, "type": "varchar(45)", - "allowNull": true, - "defaultValue": null, - "listview": { - "show": true - }, - "editview": { - "show": true - } - }, - { - "name": "created_at", - "verbose": "created_at", - "control": { - "text": true - }, - "type": "timestamp", - "allowNull": false, - "defaultValue": null, - "listview": { - "show": true - }, - "editview": { - "show": true - } - }, - { - "name": "updated_at", - "verbose": "updated_at", - "control": { - "text": true - }, - "type": "timestamp", "allowNull": false, "defaultValue": null, "listview": { @@ -671,7 +724,7 @@ } ], "mainview": { - "show": true + "show": false }, "listview": { "order": {}, @@ -681,49 +734,49 @@ "readonly": false } }, - "address": { - "slug": "address", + "phone": { + "slug": "phone", "table": { - "name": "address", + "name": "phone", "pk": "id", - "verbose": "address" + "verbose": "Phone" }, "columns": [ { - "name": "id", "verbose": "id", + "name": "id", "control": { "text": true }, - "type": "integer", + "type": "int(11)", "allowNull": false, "defaultValue": null, "listview": { "show": true }, "editview": { - "show": true + "show": false } }, { - "name": "user_id", "verbose": "user_id", + "name": "user_id", "control": { "text": true }, - "type": "integer", + "type": "int(11)", "allowNull": false, "defaultValue": null, "listview": { "show": true }, "editview": { - "show": true + "show": false } }, { - "name": "street", - "verbose": "street", + "verbose": "mobile", + "name": "mobile", "control": { "text": true }, @@ -739,7 +792,7 @@ } ], "mainview": { - "show": true + "show": false }, "listview": { "order": {}, @@ -749,49 +802,33 @@ "readonly": false } }, - "phone": { - "slug": "phone", + "car": { + "slug": "car", "table": { - "name": "phone", + "name": "car", "pk": "id", - "verbose": "phone" + "verbose": "Car (Many to One)" }, "columns": [ { - "name": "id", "verbose": "id", + "name": "id", "control": { "text": true }, - "type": "integer", - "allowNull": false, - "defaultValue": null, - "listview": { - "show": true - }, - "editview": { - "show": true - } - }, - { - "name": "user_id", - "verbose": "user_id", - "control": { - "text": true - }, - "type": "integer", + "type": "int(11)", "allowNull": false, "defaultValue": null, "listview": { - "show": true + "show": false }, "editview": { - "show": true + "show": false } }, { - "name": "mobile", - "verbose": "mobile", + "verbose": "model", + "name": "model", "control": { "text": true }, @@ -814,36 +851,56 @@ "page": 25 }, "editview": { - "readonly": false + "readonly": false, + "manyToOne": { + "repair": "car_id", + "driver": "car_id" + } } }, - "car": { - "slug": "car", + "driver": { + "slug": "driver", "table": { - "name": "car", + "name": "driver", "pk": "id", - "verbose": "car" + "verbose": "driver" }, "columns": [ { - "name": "id", "verbose": "id", + "name": "id", "control": { "text": true }, - "type": "integer", + "type": "int(11)", "allowNull": false, "defaultValue": null, "listview": { "show": true }, "editview": { + "show": false + } + }, + { + "verbose": "car_id", + "name": "car_id", + "control": { + "text": true + }, + "type": "int(11)", + "allowNull": false, + "defaultValue": null, + "listview": { "show": true + }, + "editview": { + "show": false } }, { - "name": "model", - "verbose": "model", + "verbose": "name", + "name": "name", "control": { "text": true }, @@ -859,7 +916,7 @@ } ], "mainview": { - "show": true + "show": false }, "listview": { "order": {}, @@ -878,42 +935,42 @@ }, "columns": [ { - "name": "id", "verbose": "id", + "name": "id", "control": { "text": true }, - "type": "integer", + "type": "int(11)", "allowNull": false, "defaultValue": null, "listview": { "show": true }, "editview": { - "show": true + "show": false } }, { - "name": "car_id", "verbose": "car_id", + "name": "car_id", "control": { "text": true }, - "type": "integer", + "type": "int(11)", "allowNull": false, "defaultValue": null, "listview": { "show": true }, "editview": { - "show": true + "show": false } }, { - "name": "date", "verbose": "date", + "name": "date", "control": { - "text": true + "date": true }, "type": "date", "allowNull": false, @@ -927,7 +984,7 @@ } ], "mainview": { - "show": true + "show": false }, "listview": { "order": {}, @@ -937,12 +994,12 @@ "readonly": false } }, - "driver": { - "slug": "driver", + "controls": { + "slug": "controls", "table": { - "name": "driver", + "name": "controls", "pk": "id", - "verbose": "driver" + "verbose": "Controls" }, "columns": [ { @@ -951,24 +1008,55 @@ "control": { "text": true }, - "type": "integer", + "type": "int(11)", "allowNull": false, "defaultValue": null, "listview": { "show": true }, + "editview": { + "show": false + } + }, + { + "name": "controls_otm_single_id", + "verbose": "one to many single", + "control": { + "select": true + }, + "oneToMany": { + "table": "controls_otm_single", + "pk": "id", + "columns": [ + "name" + ] + }, + "type": "int(11)", + "allowNull": true, + "defaultValue": null, + "listview": { + "show": true + }, "editview": { "show": true } }, { - "name": "car_id", - "verbose": "car_id", + "name": "controls_otm_multiple_id", + "verbose": "one to many multiple", "control": { - "text": true + "select": true }, - "type": "integer", - "allowNull": false, + "oneToMany": { + "table": "controls_otm_multiple", + "pk": "id", + "columns": [ + "first", + "last" + ] + }, + "type": "int(11)", + "allowNull": true, "defaultValue": null, "listview": { "show": true @@ -978,13 +1066,79 @@ } }, { - "name": "name", - "verbose": "name", + "verbose": "many to many single", + "name": "controls_mtm_single", "control": { - "text": true + "select": true, + "multiple": true + }, + "type": "int(11)", + "allowNull": true, + "listview": { + "show": true + }, + "editview": { + "show": true + }, + "manyToMany": { + "link": { + "table": "controls_has_controls_mtm_single", + "parentPk": "controls_id", + "childPk": "controls_mtm_single_id" + }, + "ref": { + "table": "controls_mtm_single", + "pk": "id", + "columns": [ + "name" + ] + } + } + }, + { + "verbose": "many to many multiple", + "name": "controls_mtm_multiple", + "control": { + "select": true, + "multiple": true + }, + "type": "int(11)", + "allowNull": true, + "listview": { + "show": true + }, + "editview": { + "show": true + }, + "manyToMany": { + "link": { + "table": "controls_has_controls_mtm_multiple", + "parentPk": "controls_id", + "childPk": "controls_mtm_multiple_id" + }, + "ref": { + "table": "controls_mtm_multiple", + "pk": "id", + "columns": [ + "first", + "last" + ] + } + } + }, + { + "name": "static", + "verbose": "static", + "control": { + "select": true, + "options": [ + "one", + "two", + "three" + ] }, "type": "varchar(45)", - "allowNull": false, + "allowNull": true, "defaultValue": null, "listview": { "show": true @@ -992,35 +1146,15 @@ "editview": { "show": true } - } - ], - "mainview": { - "show": true - }, - "listview": { - "order": {}, - "page": 25 - }, - "editview": { - "readonly": false - } - }, - "controls_mtm_single": { - "slug": "controls_mtm_single", - "table": { - "name": "controls_mtm_single", - "pk": "id", - "verbose": "controls_mtm_single" - }, - "columns": [ + }, { - "name": "id", - "verbose": "id", + "name": "text", + "verbose": "text", "control": { "text": true }, - "type": "integer", - "allowNull": false, + "type": "varchar(45)", + "allowNull": true, "defaultValue": null, "listview": { "show": true @@ -1030,13 +1164,65 @@ } }, { - "name": "name", - "verbose": "name", + "name": "boolean", + "verbose": "boolean", "control": { - "text": true + "radio": true, + "options": [ + "Yes", + "No" + ] + }, + "type": "char", + "allowNull": true, + "defaultValue": null, + "listview": { + "show": true + }, + "editview": { + "show": true + } + }, + { + "name": "bigint", + "verbose": "bigint", + "control": { + "number": true + }, + "type": "bigint", + "allowNull": true, + "defaultValue": null, + "listview": { + "show": true + }, + "editview": { + "show": true + } + }, + { + "name": "double", + "verbose": "double", + "control": { + "number": true + }, + "type": "double", + "allowNull": true, + "defaultValue": null, + "listview": { + "show": true + }, + "editview": { + "show": true + } + }, + { + "name": "upload", + "verbose": "upload", + "control": { + "file": true }, "type": "varchar(45)", - "allowNull": false, + "allowNull": true, "defaultValue": null, "listview": { "show": true @@ -1044,35 +1230,16 @@ "editview": { "show": true } - } - ], - "mainview": { - "show": true - }, - "listview": { - "order": {}, - "page": 25 - }, - "editview": { - "readonly": false - } - }, - "controls_otm_single": { - "slug": "controls_otm_single", - "table": { - "name": "controls_otm_single", - "pk": "id", - "verbose": "controls_otm_single" - }, - "columns": [ + }, { - "name": "id", - "verbose": "id", + "name": "binary", + "verbose": "binary", "control": { - "text": true + "file": true, + "binary": true }, - "type": "integer", - "allowNull": false, + "type": "bytea", + "allowNull": true, "defaultValue": null, "listview": { "show": true @@ -1082,13 +1249,13 @@ } }, { - "name": "name", - "verbose": "name", + "name": "date", + "verbose": "date", "control": { - "text": true + "date": true }, - "type": "varchar(45)", - "allowNull": false, + "type": "date", + "allowNull": true, "defaultValue": null, "listview": { "show": true @@ -1096,35 +1263,15 @@ "editview": { "show": true } - } - ], - "mainview": { - "show": true - }, - "listview": { - "order": {}, - "page": 25 - }, - "editview": { - "readonly": false - } - }, - "controls_otm_multiple": { - "slug": "controls_otm_multiple", - "table": { - "name": "controls_otm_multiple", - "pk": "id", - "verbose": "controls_otm_multiple" - }, - "columns": [ + }, { - "name": "id", - "verbose": "id", + "name": "time", + "verbose": "time", "control": { - "text": true + "time": true }, - "type": "integer", - "allowNull": false, + "type": "time", + "allowNull": true, "defaultValue": null, "listview": { "show": true @@ -1134,13 +1281,13 @@ } }, { - "name": "first", - "verbose": "first", + "name": "datetime", + "verbose": "datetime", "control": { - "text": true + "datetime": true }, - "type": "varchar(45)", - "allowNull": false, + "type": "datetime", + "allowNull": true, "defaultValue": null, "listview": { "show": true @@ -1150,12 +1297,13 @@ } }, { - "name": "last", - "verbose": "last", + "name": "textarea", + "verbose": "textarea", "control": { - "text": true + "textarea": true, + "editor": "ck-compact" }, - "type": "varchar(45)", + "type": "text", "allowNull": true, "defaultValue": null, "listview": { @@ -1171,27 +1319,47 @@ }, "listview": { "order": {}, - "page": 25 + "page": 25, + "filter": [ + "controls_otm_single_id", + "controls_otm_multiple_id", + "controls_mtm_single", + "controls_mtm_multiple", + "static", + "text", + "boolean", + "bigint", + "double", + "upload", + "date", + "time", + "datetime", + "year", + "textarea" + ] }, "editview": { - "readonly": false + "readonly": false, + "manyToOne": { + "controls_inline": "controls_id" + } } }, - "controls_mtm_multiple": { - "slug": "controls_mtm_multiple", + "controls_has_controls_mtm_multiple": { + "slug": "controls_has_controls_mtm_multiple", "table": { - "name": "controls_mtm_multiple", - "pk": "id", - "verbose": "controls_mtm_multiple" + "name": "controls_has_controls_mtm_multiple", + "pk": "controls_id", + "verbose": "controls_has_controls_mtm_multiple" }, "columns": [ { - "name": "id", - "verbose": "id", + "name": "controls_id", + "verbose": "controls_id", "control": { "text": true }, - "type": "integer", + "type": "int(11)", "allowNull": false, "defaultValue": null, "listview": { @@ -1202,12 +1370,12 @@ } }, { - "name": "first", - "verbose": "first", + "name": "controls_mtm_multiple_id", + "verbose": "controls_mtm_multiple_id", "control": { "text": true }, - "type": "varchar(45)", + "type": "int(11)", "allowNull": false, "defaultValue": null, "listview": { @@ -1216,26 +1384,10 @@ "editview": { "show": true } - }, - { - "name": "last", - "verbose": "last", - "control": { - "text": true - }, - "type": "varchar(45)", - "allowNull": true, - "defaultValue": null, - "listview": { - "show": true - }, - "editview": { - "show": true - } } ], "mainview": { - "show": true + "show": false }, "listview": { "order": {}, @@ -1249,10 +1401,7 @@ "slug": "controls_has_controls_mtm_single", "table": { "name": "controls_has_controls_mtm_single", - "pk": [ - "controls_id", - "controls_mtm_single_id" - ], + "pk": "controls_id", "verbose": "controls_has_controls_mtm_single" }, "columns": [ @@ -1262,7 +1411,7 @@ "control": { "text": true }, - "type": "integer", + "type": "int(11)", "allowNull": false, "defaultValue": null, "listview": { @@ -1278,7 +1427,7 @@ "control": { "text": true }, - "type": "integer", + "type": "int(11)", "allowNull": false, "defaultValue": null, "listview": { @@ -1290,7 +1439,7 @@ } ], "mainview": { - "show": true + "show": false }, "listview": { "order": {}, @@ -1300,40 +1449,60 @@ "readonly": false } }, - "controls_has_controls_mtm_multiple": { - "slug": "controls_has_controls_mtm_multiple", + "controls_inline": { + "slug": "controls_inline", "table": { - "name": "controls_has_controls_mtm_multiple", - "pk": [ - "controls_id", - "controls_mtm_multiple_id" - ], - "verbose": "controls_has_controls_mtm_multiple" + "name": "controls_inline", + "pk": "id", + "verbose": "inline controls" }, "columns": [ + { + "name": "id", + "verbose": "id", + "control": { + "text": true + }, + "type": "int(11)", + "allowNull": false, + "defaultValue": null, + "listview": { + "show": true + }, + "editview": { + "show": false + } + }, { "name": "controls_id", "verbose": "controls_id", "control": { "text": true }, - "type": "integer", + "type": "int(11)", "allowNull": false, "defaultValue": null, "listview": { "show": true }, "editview": { - "show": true + "show": false } }, { - "name": "controls_mtm_multiple_id", - "verbose": "controls_mtm_multiple_id", + "name": "controls_inline_otm_single_id", + "verbose": "one to many single", "control": { - "text": true + "select": true + }, + "oneToMany": { + "table": "controls_inline_otm_single", + "pk": "id", + "columns": [ + "name" + ] }, - "type": "integer", + "type": "int(11)", "allowNull": false, "defaultValue": null, "listview": { @@ -1342,34 +1511,22 @@ "editview": { "show": true } - } - ], - "mainview": { - "show": true - }, - "listview": { - "order": {}, - "page": 25 - }, - "editview": { - "readonly": false - } - }, - "controls": { - "slug": "controls", - "table": { - "name": "controls", - "pk": "id", - "verbose": "controls" - }, - "columns": [ + }, { - "name": "id", - "verbose": "id", + "name": "controls_inline_otm_multiple_id", + "verbose": "one to many multiple", "control": { - "text": true + "select": true + }, + "oneToMany": { + "table": "controls_inline_otm_multiple", + "pk": "id", + "columns": [ + "first", + "last" + ] }, - "type": "integer", + "type": "int(11)", "allowNull": false, "defaultValue": null, "listview": { @@ -1380,45 +1537,79 @@ } }, { - "name": "controls_otm_single_id", - "verbose": "controls_otm_single_id", + "verbose": "many to many single", + "name": "controls_inline_mtm_single", "control": { - "text": true + "select": true, + "multiple": true }, - "type": "integer", - "allowNull": true, - "defaultValue": null, + "type": "int(11)", + "allowNull": false, "listview": { "show": true }, "editview": { "show": true + }, + "manyToMany": { + "link": { + "table": "controls_inline_has_controls_inline_mtm_single", + "parentPk": "controls_inline_id", + "childPk": "controls_inline_mtm_single_id" + }, + "ref": { + "table": "controls_inline_mtm_single", + "pk": "id", + "columns": [ + "name" + ] + } } }, { - "name": "controls_otm_multiple_id", - "verbose": "controls_otm_multiple_id", + "verbose": "many to many multiple", + "name": "controls_inline_mtm_multiple", "control": { - "text": true + "select": true, + "multiple": true }, - "type": "integer", - "allowNull": true, - "defaultValue": null, + "type": "int(11)", + "allowNull": false, "listview": { "show": true }, "editview": { "show": true + }, + "manyToMany": { + "link": { + "table": "controls_inline_has_controls_inline_mtm_multiple", + "parentPk": "controls_inline_id", + "childPk": "controls_inline_mtm_multiple_id" + }, + "ref": { + "table": "controls_inline_mtm_multiple", + "pk": "id", + "columns": [ + "first", + "last" + ] + } } }, { "name": "static", "verbose": "static", "control": { - "text": true + "select": true, + "options": [ + "one", + "two", + "three" + ] }, "type": "varchar(45)", - "allowNull": true, + "allowNull": false, "defaultValue": null, "listview": { "show": true @@ -1434,7 +1625,7 @@ "text": true }, "type": "varchar(45)", - "allowNull": true, + "allowNull": false, "defaultValue": null, "listview": { "show": true @@ -1447,10 +1638,14 @@ "name": "boolean", "verbose": "boolean", "control": { - "text": true + "radio": true, + "options": [ + "Yes", + "No" + ] }, "type": "char", - "allowNull": true, + "allowNull": false, "defaultValue": null, "listview": { "show": true @@ -1463,10 +1658,10 @@ "name": "bigint", "verbose": "bigint", "control": { - "text": true + "number": true }, "type": "bigint", - "allowNull": true, + "allowNull": false, "defaultValue": null, "listview": { "show": true @@ -1479,10 +1674,10 @@ "name": "double", "verbose": "double", "control": { - "text": true + "number": true }, "type": "double", - "allowNull": true, + "allowNull": false, "defaultValue": null, "listview": { "show": true @@ -1495,10 +1690,10 @@ "name": "upload", "verbose": "upload", "control": { - "text": true + "file": true }, "type": "varchar(45)", - "allowNull": true, + "allowNull": false, "defaultValue": null, "listview": { "show": true @@ -1511,10 +1706,11 @@ "name": "binary", "verbose": "binary", "control": { - "text": true + "file": true, + "binary": true }, "type": "bytea", - "allowNull": true, + "allowNull": false, "defaultValue": null, "listview": { "show": true @@ -1527,10 +1723,10 @@ "name": "date", "verbose": "date", "control": { - "text": true + "date": true }, "type": "date", - "allowNull": true, + "allowNull": false, "defaultValue": null, "listview": { "show": true @@ -1543,10 +1739,10 @@ "name": "time", "verbose": "time", "control": { - "text": true + "time": true }, "type": "time", - "allowNull": true, + "allowNull": false, "defaultValue": null, "listview": { "show": true @@ -1559,10 +1755,10 @@ "name": "datetime", "verbose": "datetime", "control": { - "text": true + "datetime": true }, - "type": "timestamp", - "allowNull": true, + "type": "datetime", + "allowNull": false, "defaultValue": null, "listview": { "show": true @@ -1575,10 +1771,11 @@ "name": "textarea", "verbose": "textarea", "control": { - "text": true + "textarea": true, + "editor": "ck-compact" }, "type": "text", - "allowNull": true, + "allowNull": false, "defaultValue": null, "listview": { "show": true @@ -1589,7 +1786,7 @@ } ], "mainview": { - "show": true + "show": false }, "listview": { "order": {}, @@ -1599,21 +1796,73 @@ "readonly": false } }, - "controls_inline_otm_single": { - "slug": "controls_inline_otm_single", + "controls_inline_has_controls_inline_mtm_multiple": { + "slug": "controls_inline_has_controls_inline_mtm_multiple", "table": { - "name": "controls_inline_otm_single", - "pk": "id", - "verbose": "controls_inline_otm_single" + "name": "controls_inline_has_controls_inline_mtm_multiple", + "pk": "controls_inline_id", + "verbose": "controls_inline_has_controls_inline_mtm_multiple" }, "columns": [ { - "name": "id", - "verbose": "id", + "name": "controls_inline_id", + "verbose": "controls_inline_id", + "control": { + "text": true + }, + "type": "int(11)", + "allowNull": false, + "defaultValue": null, + "listview": { + "show": true + }, + "editview": { + "show": true + } + }, + { + "name": "controls_inline_mtm_multiple_id", + "verbose": "controls_inline_mtm_multiple_id", + "control": { + "text": true + }, + "type": "int(11)", + "allowNull": false, + "defaultValue": null, + "listview": { + "show": true + }, + "editview": { + "show": true + } + } + ], + "mainview": { + "show": false + }, + "listview": { + "order": {}, + "page": 25 + }, + "editview": { + "readonly": false + } + }, + "controls_inline_has_controls_inline_mtm_single": { + "slug": "controls_inline_has_controls_inline_mtm_single", + "table": { + "name": "controls_inline_has_controls_inline_mtm_single", + "pk": "controls_inline_id", + "verbose": "controls_inline_has_controls_inline_mtm_single" + }, + "columns": [ + { + "name": "controls_inline_id", + "verbose": "controls_inline_id", "control": { "text": true }, - "type": "integer", + "type": "int(11)", "allowNull": false, "defaultValue": null, "listview": { @@ -1624,12 +1873,12 @@ } }, { - "name": "name", - "verbose": "name", + "name": "controls_inline_mtm_single_id", + "verbose": "controls_inline_mtm_single_id", "control": { "text": true }, - "type": "varchar(45)", + "type": "int(11)", "allowNull": false, "defaultValue": null, "listview": { @@ -1641,7 +1890,7 @@ } ], "mainview": { - "show": true + "show": false }, "listview": { "order": {}, @@ -1651,12 +1900,12 @@ "readonly": false } }, - "controls_inline_otm_multiple": { - "slug": "controls_inline_otm_multiple", + "controls_inline_mtm_multiple": { + "slug": "controls_inline_mtm_multiple", "table": { - "name": "controls_inline_otm_multiple", + "name": "controls_inline_mtm_multiple", "pk": "id", - "verbose": "controls_inline_otm_multiple" + "verbose": "controls_inline_mtm_multiple" }, "columns": [ { @@ -1665,7 +1914,7 @@ "control": { "text": true }, - "type": "integer", + "type": "int(11)", "allowNull": false, "defaultValue": null, "listview": { @@ -1709,7 +1958,7 @@ } ], "mainview": { - "show": true + "show": false }, "listview": { "order": {}, @@ -1733,7 +1982,7 @@ "control": { "text": true }, - "type": "integer", + "type": "int(11)", "allowNull": false, "defaultValue": null, "listview": { @@ -1761,7 +2010,7 @@ } ], "mainview": { - "show": true + "show": false }, "listview": { "order": {}, @@ -1771,12 +2020,12 @@ "readonly": false } }, - "controls_inline_mtm_multiple": { - "slug": "controls_inline_mtm_multiple", + "controls_inline_otm_multiple": { + "slug": "controls_inline_otm_multiple", "table": { - "name": "controls_inline_mtm_multiple", + "name": "controls_inline_otm_multiple", "pk": "id", - "verbose": "controls_inline_mtm_multiple" + "verbose": "controls_inline_otm_multiple" }, "columns": [ { @@ -1785,7 +2034,7 @@ "control": { "text": true }, - "type": "integer", + "type": "int(11)", "allowNull": false, "defaultValue": null, "listview": { @@ -1829,7 +2078,7 @@ } ], "mainview": { - "show": true + "show": false }, "listview": { "order": {}, @@ -1839,24 +2088,21 @@ "readonly": false } }, - "controls_inline_has_controls_inline_mtm_single": { - "slug": "controls_inline_has_controls_inline_mtm_single", + "controls_inline_otm_single": { + "slug": "controls_inline_otm_single", "table": { - "name": "controls_inline_has_controls_inline_mtm_single", - "pk": [ - "controls_inline_id", - "controls_inline_mtm_single_id" - ], - "verbose": "controls_inline_has_controls_inline_mtm_single" + "name": "controls_inline_otm_single", + "pk": "id", + "verbose": "controls_inline_otm_single" }, "columns": [ { - "name": "controls_inline_id", - "verbose": "controls_inline_id", + "name": "id", + "verbose": "id", "control": { "text": true }, - "type": "integer", + "type": "int(11)", "allowNull": false, "defaultValue": null, "listview": { @@ -1867,12 +2113,12 @@ } }, { - "name": "controls_inline_mtm_single_id", - "verbose": "controls_inline_mtm_single_id", + "name": "name", + "verbose": "name", "control": { "text": true }, - "type": "integer", + "type": "varchar(45)", "allowNull": false, "defaultValue": null, "listview": { @@ -1884,7 +2130,7 @@ } ], "mainview": { - "show": true + "show": false }, "listview": { "order": {}, @@ -1894,24 +2140,21 @@ "readonly": false } }, - "controls_inline_has_controls_inline_mtm_multiple": { - "slug": "controls_inline_has_controls_inline_mtm_multiple", + "controls_mtm_multiple": { + "slug": "controls_mtm_multiple", "table": { - "name": "controls_inline_has_controls_inline_mtm_multiple", - "pk": [ - "controls_inline_id", - "controls_inline_mtm_multiple_id" - ], - "verbose": "controls_inline_has_controls_inline_mtm_multiple" + "name": "controls_mtm_multiple", + "pk": "id", + "verbose": "controls_mtm_multiple" }, "columns": [ { - "name": "controls_inline_id", - "verbose": "controls_inline_id", + "name": "id", + "verbose": "id", "control": { "text": true }, - "type": "integer", + "type": "int(11)", "allowNull": false, "defaultValue": null, "listview": { @@ -1922,12 +2165,12 @@ } }, { - "name": "controls_inline_mtm_multiple_id", - "verbose": "controls_inline_mtm_multiple_id", + "name": "first", + "verbose": "first", "control": { "text": true }, - "type": "integer", + "type": "varchar(45)", "allowNull": false, "defaultValue": null, "listview": { @@ -1936,10 +2179,26 @@ "editview": { "show": true } + }, + { + "name": "last", + "verbose": "last", + "control": { + "text": true + }, + "type": "varchar(45)", + "allowNull": true, + "defaultValue": null, + "listview": { + "show": true + }, + "editview": { + "show": true + } } ], "mainview": { - "show": true + "show": false }, "listview": { "order": {}, @@ -1949,12 +2208,12 @@ "readonly": false } }, - "controls_inline": { - "slug": "controls_inline", + "controls_mtm_single": { + "slug": "controls_mtm_single", "table": { - "name": "controls_inline", + "name": "controls_mtm_single", "pk": "id", - "verbose": "controls_inline" + "verbose": "controls_mtm_single" }, "columns": [ { @@ -1963,23 +2222,7 @@ "control": { "text": true }, - "type": "integer", - "allowNull": false, - "defaultValue": null, - "listview": { - "show": true - }, - "editview": { - "show": true - } - }, - { - "name": "controls_id", - "verbose": "controls_id", - "control": { - "text": true - }, - "type": "integer", + "type": "int(11)", "allowNull": false, "defaultValue": null, "listview": { @@ -1990,12 +2233,12 @@ } }, { - "name": "controls_inline_otm_single_id", - "verbose": "controls_inline_otm_single_id", + "name": "name", + "verbose": "name", "control": { "text": true }, - "type": "integer", + "type": "varchar(45)", "allowNull": false, "defaultValue": null, "listview": { @@ -2004,14 +2247,34 @@ "editview": { "show": true } - }, + } + ], + "mainview": { + "show": false + }, + "listview": { + "order": {}, + "page": 25 + }, + "editview": { + "readonly": false + } + }, + "controls_otm_multiple": { + "slug": "controls_otm_multiple", + "table": { + "name": "controls_otm_multiple", + "pk": "id", + "verbose": "controls_otm_multiple" + }, + "columns": [ { - "name": "controls_inline_otm_multiple_id", - "verbose": "controls_inline_otm_multiple_id", + "name": "id", + "verbose": "id", "control": { "text": true }, - "type": "integer", + "type": "int(11)", "allowNull": false, "defaultValue": null, "listview": { @@ -2022,8 +2285,8 @@ } }, { - "name": "static", - "verbose": "static", + "name": "first", + "verbose": "first", "control": { "text": true }, @@ -2038,45 +2301,13 @@ } }, { - "name": "text", - "verbose": "text", + "name": "last", + "verbose": "last", "control": { "text": true }, "type": "varchar(45)", - "allowNull": false, - "defaultValue": null, - "listview": { - "show": true - }, - "editview": { - "show": true - } - }, - { - "name": "boolean", - "verbose": "boolean", - "control": { - "text": true - }, - "type": "char", - "allowNull": false, - "defaultValue": null, - "listview": { - "show": true - }, - "editview": { - "show": true - } - }, - { - "name": "bigint", - "verbose": "bigint", - "control": { - "text": true - }, - "type": "bigint", - "allowNull": false, + "allowNull": true, "defaultValue": null, "listview": { "show": true @@ -2084,14 +2315,34 @@ "editview": { "show": true } - }, + } + ], + "mainview": { + "show": false + }, + "listview": { + "order": {}, + "page": 25 + }, + "editview": { + "readonly": false + } + }, + "controls_otm_single": { + "slug": "controls_otm_single", + "table": { + "name": "controls_otm_single", + "pk": "id", + "verbose": "controls_otm_single" + }, + "columns": [ { - "name": "double", - "verbose": "double", + "name": "id", + "verbose": "id", "control": { "text": true }, - "type": "double", + "type": "int(11)", "allowNull": false, "defaultValue": null, "listview": { @@ -2102,8 +2353,8 @@ } }, { - "name": "upload", - "verbose": "upload", + "name": "name", + "verbose": "name", "control": { "text": true }, @@ -2116,82 +2367,105 @@ "editview": { "show": true } - }, + } + ], + "mainview": { + "show": false + }, + "listview": { + "order": {}, + "page": 25 + }, + "editview": { + "readonly": false + } + }, + "notes": { + "slug": "notes", + "table": { + "name": "notes", + "pk": "id", + "verbose": "Notes (Editors)" + }, + "columns": [ { - "name": "binary", - "verbose": "binary", + "verbose": "id", + "name": "id", "control": { "text": true }, - "type": "bytea", + "type": "int(11)", "allowNull": false, "defaultValue": null, "listview": { "show": true }, "editview": { - "show": true + "show": false } }, { - "name": "date", - "verbose": "date", + "verbose": "Textarea", + "name": "notes1", "control": { - "text": true + "textarea": true }, - "type": "date", - "allowNull": false, + "type": "text", + "allowNull": true, "defaultValue": null, "listview": { - "show": true + "show": false }, "editview": { "show": true } }, { - "name": "time", - "verbose": "time", + "verbose": "CKEditor Full", + "name": "notes2", "control": { - "text": true + "textarea": true, + "editor": "ck-full" }, - "type": "time", + "type": "text", "allowNull": false, "defaultValue": null, "listview": { - "show": true + "show": false }, "editview": { "show": true } }, { - "name": "datetime", - "verbose": "datetime", + "verbose": "CKEditor Compact", + "name": "notes3", "control": { - "text": true + "textarea": true, + "editor": "ck-compact" }, - "type": "timestamp", - "allowNull": false, + "type": "text", + "allowNull": true, "defaultValue": null, "listview": { - "show": true + "show": false }, "editview": { "show": true } }, { - "name": "textarea", - "verbose": "textarea", + "verbose": "TinyMCE", + "name": "notes4", "control": { - "text": true + "textarea": true, + "editor": "tinymce" }, "type": "text", "allowNull": false, "defaultValue": null, "listview": { - "show": true + "show": false }, "editview": { "show": true