Improve test setup

Author: pacman82

.devcontainer/devcontainer.json

@@ -0,0 +1,37 @@
+{
+	"name": "Rust & Microsoft SQL Server",
+	// "build": {
+	// 	"dockerfile": "Dockerfile"
+	// },
+	"dockerComposeFile": "../docker-compose.yml",
+	"service": "dev",
+	"workspaceFolder": "/workspace",
+	"runArgs": [ "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined" ],
+
+	// Set *default* container specific settings.json values on container create.
+	"settings": { 
+		"terminal.integrated.shell.linux": "/bin/bash",
+		"lldb.executable": "/usr/bin/lldb",
+		// VS Code don't watch files under ./target
+		"files.watcherExclude": {
+			"**/target/**": true
+		}
+	},
+
+	// Add the IDs of extensions you want installed when the container is created.
+	"extensions": [
+		"bungcip.better-toml",
+		"vadimcn.vscode-lldb",
+		"mutantdino.resourcemonitor",
+		"matklad.rust-analyzer"
+	],
+
+	// Use 'forwardPorts' to make a list of ports inside the container available locally.
+	// "forwardPorts": [],
+
+	// Use 'postCreateCommand' to run commands after the container is created.
+	// "postCreateCommand": "rustc --version",
+
+	// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
+	"remoteUser": "vscode"
+}

Contributing.md

@@ -0,0 +1,42 @@
+# Contributions
+
+Wether they be in code, intersting feature suggestions, design critique or bug reports, all contributions are welocme. Please start an issue, before investing a lot of work. This helps avoid situations there I would feel the need to reject a large body of work, and a lot of your time has been wasted. `odbc-parquet` is a pet project and a work of love, which implies that I maintain it in my spare time. Please understand that I may not always react immediatly. If you contribute code to fix a Bug, please also contribute the test to fix it. Happy contributing.
+
+## Local build and test setup
+
+Running local tests currently requires:
+
+* Docker and Docker compose.
+
+### Visual Studio Code
+
+Should you use Visual Studio Code with the Remote Developmont extension, it will pick up the `.devcontainer` configuration and everything should be setup for you.
+
+### Not Visual Studio Code
+
+With docker and the SQL Driver installed run:
+
+```shell
+docker-compose up
+```
+
+This starts two containers called `odbc2parquet_dev` and `odbc2parquet_mssql`. You can use the `dev` container to build your code and execute tests in case you do not want to install the required ODBC drivers and/or Rust toolchain on your local machine.
+
+Otherwise you can install these requirements from here:
+
+* Install Rust compiler and Cargo. Follow the instructions on [this site](https://www.rust-lang.org/en-US/install.html).
+* [Microsoft ODBC Driver 17 for SQL Server](https://docs.microsoft.com/en-us/sql/connect/odbc/download-odbc-driver-for-sql-server?view=sql-server-ver15).
+* <https://rustup.rs/>
+
+### Workaround
+
+Have not figuered out, how to get the nighly toolchain during Docker setup yet. Meanwhile you must use `rustup toolchain install nightly` and `cargo +nightly install parquet` to install the missing pieces for the development setup on the dev container.
+
+
+We now can execute the tests in Rust typical fashion using:
+
+```
+cargo test
+```
+
+to run all tests in the workspace, which should now succeed.

README.md

@@ -60,11 +60,3 @@ odbc2parquet --connection-string "Driver={ODBC Driver 17 for SQL Server};Server=
 ```
 
 Use `odbc2parquet --help` to see all option.
-
-## Local test setup
-
-Executing `cargo test` requires
-
-* the Microsoft Excel ODBC Drivers.
-* the MS SQL Database started with `docker-compose up`
-* `cargo install parquet` for the parquet binaries `parquet-read` and `parquet-schema`.

docker-compose.yml

@@ -1,4 +1,17 @@
-mssql:
-    build: docker/
-    ports:
-        - 1433:1433
+services:
+
+  mssql:
+    build: docker/mssql
+    ports:
+      - 1433:1433
+
+  dev:
+    build: docker/dev
+    volumes:
+      - .:/workspace:cached
+
+    # Overrides default command so things don't shut down after the process ends.
+    command: sleep infinity
+
+    # Runs app on the same network as the database container, allows "forwardPorts" in devcontainer.json function.
+    network_mode: service:mssql

docker/dev/Dockerfile

@@ -0,0 +1,13 @@
+# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.148.0/containers/rust/.devcontainer/base.Dockerfile
+
+FROM mcr.microsoft.com/vscode/devcontainers/rust:0-1
+
+# Install Microsoft ODBC SQL Drivers (msodbcsql17 package) for Debian 10
+# https://docs.microsoft.com/de-de/sql/connect/odbc/linux-mac/installing-the-microsoft-odbc-driver-for-sql-server?view=sql-server-ver15
+RUN curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add -
+RUN curl https://packages.microsoft.com/config/debian/10/prod.list > /etc/apt/sources.list.d/mssql-release.list
+RUN echo msodbcsql17 msodbcsql/ACCEPT_EULA boolean true | debconf-set-selections
+
+# [Optional] Uncomment this section to install additional packages.
+RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
+    && apt-get -y install --no-install-recommends unixodbc-dev msodbcsql17

docker/Dockerfile docker/mssql/Dockerfile

@@ -2,40 +2,6 @@ use assert_cmd::Command;
 use predicates::ord::eq;
 use tempfile::tempdir;
 
-#[test]
-fn test_xls_table() {
-    let expected = "\
-        {Text: \"Hello\", Real: 1.3, Boolean: true}\n\
-        {Text: \"World\", Real: 5.4, Boolean: false}\n\
-    ";
-
-    // A temporary directory, to be removed at the end of the test.
-    let out_dir = tempdir().unwrap();
-    // The name of the output parquet file we are going to write. Since it is in a temporary
-    // directory it will not outlive the end of the test.
-    let out_path = out_dir.path().join("out.par");
-    // We need to pass the output path as a string argument.
-    let out_str = out_path.to_str().expect("Tempfile path must be utf8");
-
-    let mut cmd = Command::cargo_bin("odbc2parquet").unwrap();
-    cmd.args(&[
-        "-vvvv",
-        "-c",
-        // See: https://www.connectionstrings.com/microsoft-excel-odbc-driver/
-        "Driver={Microsoft Excel Driver (*.xls, *.xlsx, *.xlsm, *.xlsb)};Dbq=tests/test-table.xlsx;",
-        out_str,
-        "SELECT * FROM [sheet1$]",
-    ])
-    .assert()
-    .success();
-
-    // Use the parquet-read tool to verify the output. It can be installed with
-    // `cargo install parquet`.
-    let mut cmd = Command::new("parquet-read");
-    cmd.arg(out_str).assert().success().stdout(eq(expected));
-}
-
-/// Currently this test requires the docker setup from `odbc-api` to run.
 #[test]
 fn nullable_parquet_buffers() {
     let expected = "\
@@ -87,7 +53,6 @@ fn foobar_connection_string() {
         .code(1);
 }
 
-/// Currently this test requires the docker setup from `odbc-api` to run.
 #[test]
 fn parameters_in_query() {
     let expected = "\