retold-data-service 1.0.1 → 1.0.2

package/debug/Build-Database.sh

@@ -0,0 +1,12 @@
+#! /bin/bash
+echo "Example - Database Build Script"
+echo "Contact: Steven Velozo <steven@velozo.com>"
+echo ""
+echo "---"
+echo ""
+
+echo "--> Stricture now generates everything automatically"
+echo "--> It loads from ./Model.ddl if no parameters are passed"
+npx stricture
+
+echo "--> Database Code generation and compilation complete!"

package/debug/Harness-Configuration.json

@@ -34,7 +34,7 @@
 			"DefaultMeadowDataProvider": "MySQL",
 
 			"MeadowModel":              "/home/coder/retold-dev/library/debug/model/Model.json",
-			"MeadowEntitySchemaPrefix": "/home/coder/retold-dev/library/debug/model/meadow/Model-MeadowSchema-",
+			"MeadowEntitySchemaPrefix": "/home/coder/retold-dev/library/debug/model/meadow/MeadowSchema-",
 
 			"StrictureDDL": false
 		},

package/debug/model/{generated_documentation → doc}/Dictionary.md

@@ -15,4 +15,4 @@ Table | Column Count
 
 - - -
 
-Generated on 2022-04-12 at 05:42
+Generated on 2022-05-23 at 09:07

package/debug/model/{generated_documentation → doc}/Model-Author.md

@@ -17,4 +17,4 @@ DeletingIDUser |  | Numeric |
 Name | 200 | String |  
 - - -
 
-Generated on 2022-04-12 at 05:42
+Generated on 2022-05-23 at 09:07

package/debug/model/{generated_documentation → doc}/Model-Book.md

@@ -23,4 +23,4 @@ ImageURL | 254 | String |
 PublicationYear |  | Numeric |  
 - - -
 
-Generated on 2022-04-12 at 05:42
+Generated on 2022-05-23 at 09:07

package/debug/model/{generated_documentation → doc}/Model-BookAuthorJoin.md

@@ -11,4 +11,4 @@ IDBook |  | Numeric | Book.IDBook
 IDAuthor |  | Numeric | Author.IDAuthor 
 - - -
 
-Generated on 2022-04-12 at 05:42
+Generated on 2022-05-23 at 09:07

package/debug/model/{generated_documentation → doc}/Model-BookPrice.md

@@ -22,4 +22,4 @@ CouponCode | 16 | String |
 IDBook |  | Numeric | Book.IDBook 
 - - -
 
-Generated on 2022-04-12 at 05:42
+Generated on 2022-05-23 at 09:07

package/debug/model/{generated_documentation → doc}/Model-Review.md

@@ -19,4 +19,4 @@ Rating |  | Numeric |
 IDBook |  | Numeric | Book.IDBook 
 - - -
 
-Generated on 2022-04-12 at 05:42
+Generated on 2022-05-23 at 09:07

package/debug/model/{generated_documentation → doc}/ModelChangeTracking.md

@@ -14,4 +14,4 @@ BookPrice | X | X | X
 Review | X | X | X 
 - - -
 
-Generated on 2022-04-12 at 05:42
+Generated on 2022-05-23 at 09:07

package/debug/model/{generated_documentation/diagrams/Stricture_Output.dot → doc/diagrams/Relationships.dot}

@@ -1,4 +1,4 @@
-## Table Connection Graph -- Generated 2022-04-12T05:42:45.172Z
+## Table Connection Graph -- Generated 2022-05-23T16:07:11.401Z
 digraph DataModel {
 rankdir=LR
 Book;

package/debug/model/{generated_documentation/diagrams/full/Stricture_Output.dot → doc/diagrams/RelationshipsFull.dot}

@@ -1,4 +1,4 @@
-## Table Connection Graph -- Generated 2022-04-12T05:42:47.865Z
+## Table Connection Graph -- Generated 2022-05-23T16:07:11.408Z
 digraph DataModel {
 rankdir=LR
 Book;

package/debug/model/{mysql/Model-CreateDatabase.mysql.sql → mysql_create/MeadowModel-CreateMySQLDatabase.mysql.sql}

@@ -1,4 +1,4 @@
--- Data Model -- Generated 2022-04-12T05:42:37.433Z
+-- Data Model -- Generated 2022-05-23T16:07:11.382Z
 
 -- This script creates the following tables:
 -- Table ----------------------------------------- Column Count ----------------

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "retold-data-service",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Serve up a whole model!",
   "main": "source/Retold-Data-Service.js",
   "scripts": {
@@ -27,8 +27,7 @@
     "chai": "3.5.0",
     "coveralls": "2.13.1",
     "istanbul": "0.4.5",
-    "mocha": "3.4.1",
-    "mysql2": "1.2.0"
+    "mocha": "3.4.1"
   },
   "dependencies": {
     "async": "^3.2.3",
@@ -38,6 +37,7 @@
     "orator": "^2.0.4",
     "restify": "^8.6.1",
     "simple-get": "^4.0.1",
-    "underscore": "^1.13.2"
+    "underscore": "^1.13.2",
+    "mysql2": "1.2.0"
   }
 }

package/source/Retold-Data-Service.js

@@ -67,11 +67,13 @@ class RetoldDataService
 			if (this._Settings.Retold.hasOwnProperty('MeadowModel'))
 			{
 				// One or many full Model file path(s) has been set
+				this._Settings.Retold.MeadowModel = `${process.cwd()}/model/MeadowModel.json`;
 			}
 			
-			if (this._Settings.Retold.hasOwnProperty('MeadowEntitySchema'))
+			if (this._Settings.Retold.hasOwnProperty('MeadowEntitySchemaPrefix'))
 			{
 				// One or many Entity Schema file path(s) is set
+				this._Settings.Retold.MeadowEntitySchemaPrefix = `${process.cwd()}/model/meadow/MeadowSchema`;
 			}
 		}
 		else
@@ -101,8 +103,9 @@ class RetoldDataService
 				"DefaultMeadowDataProvider": "Base",
 
 				// Either the Meadow side or Stricture side should be set.
-				"MeadowModel": false,
-				"MeadowEntitySchemaPrefix": false,
+				// Try to use the opinionated Stricture locations if they arent (you really should set this though!)
+				"MeadowModel": `${process.cwd()}/model/MeadowModel.json`,
+				"MeadowEntitySchemaPrefix": `${process.cwd()}/model/meadow/MeadowSchema`,
 
 				"StrictureDDL": false
 			});

package/debug/model/Build-Database.sh

@@ -1,22 +0,0 @@
-#! /bin/bash
-echo "Example - Database Build Script"
-echo "Contact: Steven Velozo <steven@velozo.com>"
-echo ""
-echo "---"
-echo ""
-
-echo "--> Generating JSON model from DDL (with the BookStore prefix)"
-npx stricture -i ./ddl/Model.ddl -c Compile -f ./ -o Model
-
-echo "--> Generating MySQL Create Statements"
-npx stricture -i ./Model-Extended.json -c MySQL -f ./mysql/ -o "Model-CreateDatabase"
-
-echo "--> Generating Meadow Schemas"
-npx stricture -i ./Model-Extended.json -c Meadow -f ./meadow/ -o "Model-MeadowSchema-"
-
-echo "--> Generating Documentation"
-npx stricture -i ./Model-Extended.json -c Documentation -g -f ./generated_documentation/
-npx stricture -i ./Model-Extended.json -c Relationships -g -f ./generated_documentation/diagrams/
-npx stricture -i ./Model-Extended.json -c RelationshipsFull -g -f ./generated_documentation/diagrams/full/
-
-echo "--> Database Code generation and compilation complete!"