From b2ad5624eece2e5eefafbfc754c5267245e62b08 Mon Sep 17 00:00:00 2001
From: Dmitry Maslennikov <mrdaimor@gmail.com>
Date: Sun, 12 Jul 2020 17:05:58 +0300
Subject: [PATCH] testing env

---
 .vscode/launch.json         |  1 +
 connection.schema.json      | 22 +++++---------
 test/docker-compose.yml     | 14 +++++++++
 test/project.code-workspace | 59 +++++++++++++++++++++++++++++++++++++
 4 files changed, 81 insertions(+), 15 deletions(-)
 create mode 100644 test/docker-compose.yml
 create mode 100644 test/project.code-workspace

diff --git a/.vscode/launch.json b/.vscode/launch.json
index 12078dd..a5fc4e0 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -6,6 +6,7 @@
 			"type": "extensionHost",
 			"request": "launch",
 			"args": [
+				"${workspaceFolder}/test/project.code-workspace",
 				"--extensionDevelopmentPath=${workspaceFolder}"
 			],
 			"outFiles": [
diff --git a/connection.schema.json b/connection.schema.json
index 900dd91..7d42df0 100644
--- a/connection.schema.json
+++ b/connection.schema.json
@@ -30,8 +30,13 @@
       "title": "Connect using",
       "type": "string",
       "minLength": 1,
-      "enum": ["Server and Port", "Server Name"],
+      "enum": ["Server and Port"],
       "default": "Server and Port"
+    },
+    "showSystem": {
+      "title": "Show system items?",
+      "type": "boolean",
+      "default": false
     }
   },
   "dependencies": {
@@ -57,20 +62,7 @@
             "username": { "$ref": "#/definitions/username" },
             "askForPassword": { "$ref": "#/definitions/askForPassword" }
           },
-          "required": ["server", "port", "namespace", "username"]
-        },
-        {
-          "properties": {
-            "connectionMethod": {
-              "enum": ["Server Name"]
-            },
-            "serverName": {
-              "title": "Server Name",
-              "type": "string",
-              "minLength": 1
-            }
-          },
-          "required": ["serverName"]
+          "required": ["server", "port", "username"]
         }
       ]
     },
diff --git a/test/docker-compose.yml b/test/docker-compose.yml
new file mode 100644
index 0000000..0413880
--- /dev/null
+++ b/test/docker-compose.yml
@@ -0,0 +1,14 @@
+version: "3.7"
+services: 
+  cache16: 
+    image: daimor/intersystems-cache:2016.2
+    volumes: 
+      - ~/cache.key:/usr/cachesys/mgr/cache.key
+    ports:
+      - 57772:57772
+  cache18: 
+    image: daimor/intersystems-cache:2018.1
+    volumes: 
+      - ~/cache.key:/usr/cachesys/mgr/cache.key
+    ports:
+      - 57773:57772
diff --git a/test/project.code-workspace b/test/project.code-workspace
new file mode 100644
index 0000000..c802c8e
--- /dev/null
+++ b/test/project.code-workspace
@@ -0,0 +1,59 @@
+{
+  "folders": [
+    {
+      "path": ".",
+      "name": "root"
+    }
+  ],
+  "settings": {
+    "sqltools.useNodeRuntime": true,
+    "sqltools.format": {
+      "reservedWordCase": "upper",
+      "linesBetweenQueries": "preserve"
+    },
+    "sqltools.debug": {
+      "namespaces": "*"
+    },
+    "sqltools.connections": [
+      {
+        "askForPassword": false,
+        "connectionMethod": "Server and Port",
+        "driver": "InterSystems IRIS",
+        "name": "Caché 2016.2",
+        "namespace": "SAMPLES",
+        "password": "SYS",
+        "port": 57772,
+        "previewLimit": 50,
+        "server": "localhost",
+        "showSystem": false,
+        "username": "_SYSTEM"
+      },
+      {
+        "askForPassword": false,
+        "connectionMethod": "Server and Port",
+        "driver": "InterSystems IRIS",
+        "name": "Caché 2018.1",
+        "namespace": "SAMPLES",
+        "password": "SYS",
+        "port": 57773,
+        "previewLimit": 50,
+        "server": "localhost",
+        "showSystem": false,
+        "username": "_SYSTEM"
+      },
+      {
+        "askForPassword": false,
+        "connectionMethod": "Server and Port",
+        "driver": "InterSystems IRIS",
+        "name": "InterSystems IRIS",
+        "namespace": "USER",
+        "password": "SYS",
+        "port": 52773,
+        "previewLimit": 50,
+        "server": "localhost",
+        "showSystem": false,
+        "username": "_SYSTEM"
+      }
+    ]
+  }
+}
\ No newline at end of file