meadow-connection-mssql 1.0.14 → 1.0.16

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "meadow-connection-mssql",
-    "version": "1.0.14",
+    "version": "1.0.16",
     "description": "Meadow MSSQL Plugin",
     "main": "source/Meadow-Connection-MSSQL.js",
     "scripts": {
@@ -49,10 +49,10 @@
     "homepage": "https://github.com/stevenvelozo/meadow-connection-mssql",
     "devDependencies": {
         "fable": "^3.1.63",
-        "quackage": "^1.0.59"
+        "quackage": "^1.0.62"
     },
     "dependencies": {
         "fable-serviceproviderbase": "^3.0.19",
-        "mssql": "^9.1.1"
+        "mssql": "^12.2.0"
     }
 }

package/source/Meadow-Connection-MSSQL.js

@@ -32,6 +32,59 @@ class MeadowConnectionMSSQL extends libFableServiceProviderBase
 
 		this.connected = false;
 
+		// Resolve MSSQL connection settings from options or fable settings
+		if (typeof(this.options.MSSQL) == 'object')
+		{
+			// Options were passed in with an MSSQL sub-object; coerce PascalCase to lowercase
+			if (!this.options.MSSQL.hasOwnProperty('server') && this.options.MSSQL.hasOwnProperty('Server'))
+			{
+				this.options.MSSQL.server = this.options.MSSQL.Server;
+			}
+			if (!this.options.MSSQL.hasOwnProperty('port') && this.options.MSSQL.hasOwnProperty('Port'))
+			{
+				this.options.MSSQL.port = this.options.MSSQL.Port;
+			}
+			if (!this.options.MSSQL.hasOwnProperty('user') && this.options.MSSQL.hasOwnProperty('User'))
+			{
+				this.options.MSSQL.user = this.options.MSSQL.User;
+			}
+			if (!this.options.MSSQL.hasOwnProperty('password') && this.options.MSSQL.hasOwnProperty('Password'))
+			{
+				this.options.MSSQL.password = this.options.MSSQL.Password;
+			}
+			if (!this.options.MSSQL.hasOwnProperty('database') && this.options.MSSQL.hasOwnProperty('Database'))
+			{
+				this.options.MSSQL.database = this.options.MSSQL.Database;
+			}
+		}
+		else if (typeof(this.options.server) === 'string')
+		{
+			// Options were passed in flat (already has server, user, etc.)
+			this.options.MSSQL = (
+				{
+					server: this.options.server,
+					port: this.options.port,
+					user: this.options.user,
+					password: this.options.password,
+					database: this.options.database,
+					ConnectionPoolLimit: this.options.ConnectionPoolLimit
+				});
+		}
+		else if (typeof(this.fable.settings.MSSQL) == 'object')
+		{
+			// Fall back to fable settings
+			let tmpSettings = this.fable.settings.MSSQL;
+			this.options.MSSQL = (
+				{
+					server: tmpSettings.server || tmpSettings.Server,
+					port: tmpSettings.port || tmpSettings.Port,
+					user: tmpSettings.user || tmpSettings.User,
+					password: tmpSettings.password || tmpSettings.Password,
+					database: tmpSettings.database || tmpSettings.Database,
+					ConnectionPoolLimit: tmpSettings.ConnectionPoolLimit
+				});
+		}
+
 		// Schema provider handles DDL operations (create, drop, index, etc.)
 		this._SchemaProvider = new libMeadowSchemaMSSQL(this.fable, this.options, `${this.Hash}-Schema`);
 	}
@@ -142,18 +195,19 @@ class MeadowConnectionMSSQL extends libFableServiceProviderBase
 			this.log.error(`Meadow MSSQL connect() called without a callback; this could lead to connection race conditions.`);
 			tmpCallback = () => { };
 		}
+		let tmpMSSQLSettings = this.options.MSSQL || {};
 		let tmpConnectionSettings = (
 			{
-				server: this.options.server,
-				user: this.options.user,
-				password: this.options.password,
-				database: this.options.database,
+				server: tmpMSSQLSettings.server,
+				user: tmpMSSQLSettings.user,
+				password: tmpMSSQLSettings.password,
+				database: tmpMSSQLSettings.database,
 				requestTimeout: 80000,
 				connectionTimeout: 80000,
-				port: this.options.port,
+				port: tmpMSSQLSettings.port,
 				pool:
 				{
-					max: 10,
+					max: tmpMSSQLSettings.ConnectionPoolLimit || 10,
 					min: 0,
 					idleTimeoutMillis: 30000
 				},

package/source/Meadow-Schema-MSSQL.js

@@ -70,7 +70,7 @@ class MeadowSchemaMSSQL extends libFableServiceProviderBase
 					tmpCreateTableStatement += `        [${tmpColumn.Column}] VARCHAR(254) DEFAULT '00000000-0000-0000-0000-000000000000'`;
 					break;
 				case 'ForeignKey':
-					tmpCreateTableStatement += `        [${tmpColumn.Column}] INT UNSIGNED NOT NULL DEFAULT 0`;
+					tmpCreateTableStatement += `        [${tmpColumn.Column}] INT NOT NULL DEFAULT 0`;
 					tmpPrimaryKey = tmpColumn.Column;
 					break;
 				case 'Numeric':
@@ -91,6 +91,12 @@ class MeadowSchemaMSSQL extends libFableServiceProviderBase
 				case 'Boolean':
 					tmpCreateTableStatement += `        [${tmpColumn.Column}] TINYINT DEFAULT 0`;
 					break;
+				case 'JSON':
+					tmpCreateTableStatement += `        [${tmpColumn.Column}] NVARCHAR(MAX)`;
+					break;
+				case 'JSONProxy':
+					tmpCreateTableStatement += `        [${tmpColumn.StorageColumn}] NVARCHAR(MAX)`;
+					break;
 				default:
 					break;
 			}
@@ -941,6 +947,8 @@ class MeadowSchemaMSSQL extends libFableServiceProviderBase
 			case 'Text': return 'String';
 			case 'DateTime': return 'DateTime';
 			case 'Boolean': return 'Boolean';
+			case 'JSON': return 'JSON';
+			case 'JSONProxy': return 'JSONProxy';
 			default: return 'String';
 		}
 	}
@@ -964,6 +972,8 @@ class MeadowSchemaMSSQL extends libFableServiceProviderBase
 			case 'Text': return '';
 			case 'DateTime': return '';
 			case 'Boolean': return false;
+			case 'JSON': return {};
+			case 'JSONProxy': return {};
 			default: return '';
 		}
 	}