fix: address Copilot review feedback

- Fix grammar: 'is using' -> 'is to use' in README.md
- Remove unused WORKSPACE_FOLDER variable from post-create.sh
- Make bashrc alias updates idempotent (remove existing block first)
- Only run setup.sql if SQL Server connection succeeded
- Don't print SA password to terminal (reference env var instead)
- Use SA_PASSWORD in addition to MSSQL_SA_PASSWORD for CI consistency
- Use environment variable reference in healthcheck
- Pin Go tools to specific versions for reproducibility:
  - gopls@v0.18.1, dlv@v1.24.1, staticcheck@v0.6.1, gotext@v0.22.0
- Improve golangci-lint install security by using versioned tag URL
- Fix docs to match actual behavior (only setup.sql is executed)
- Install legacy ODBC sqlcmd (mssql-tools18) for compatibility testing
- Add sql-legacy alias to easily compare behavior between versions
- Document connecting from host tools (Azure Data Studio, SSMS)

Author: dlevy-msft-sql

.devcontainer/Dockerfile

@@ -3,17 +3,27 @@ FROM mcr.microsoft.com/devcontainers/go:1-1.24-bookworm
 
 # Install additional OS packages
 RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
-    && apt-get install -y curl libkrb5-dev \
+    && apt-get install -y curl libkrb5-dev gnupg2 \
     && apt-get clean -y && rm -rf /var/lib/apt/lists/*
 
+# Install Microsoft ODBC driver and mssql-tools18 (legacy ODBC sqlcmd/bcp for compatibility testing)
+RUN curl -fsSL https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor -o /usr/share/keyrings/microsoft-prod.gpg \
+    && curl -fsSL https://packages.microsoft.com/config/debian/12/prod.list | tee /etc/apt/sources.list.d/mssql-release.list \
+    && apt-get update \
+    && ACCEPT_EULA=Y apt-get install -y msodbcsql18 mssql-tools18 unixodbc-dev \
+    && apt-get clean -y && rm -rf /var/lib/apt/lists/*
+ENV PATH="/opt/mssql-tools18/bin:${PATH}"
+
 # Install golangci-lint for code quality
-RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b /usr/local/bin v1.64.8
+# Download from specific release tag instead of master branch for supply chain security
+ARG GOLANGCI_LINT_VERSION=v1.64.8
+RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/${GOLANGCI_LINT_VERSION}/install.sh | sh -s -- -b /usr/local/bin ${GOLANGCI_LINT_VERSION}
 
-# Install additional Go tools
-RUN go install golang.org/x/tools/gopls@latest \
-    && go install github.com/go-delve/delve/cmd/dlv@latest \
-    && go install honnef.co/go/tools/cmd/staticcheck@latest \
-    && go install golang.org/x/text/cmd/gotext@latest
+# Install additional Go tools (pinned versions for reproducibility)
+RUN go install golang.org/x/tools/gopls@v0.18.1 \
+    && go install github.com/go-delve/delve/cmd/dlv@v1.24.1 \
+    && go install honnef.co/go/tools/cmd/staticcheck@v0.6.1 \
+    && go install golang.org/x/text/cmd/gotext@v0.22.0
 
 # Create bin directory for local sqlcmd builds
 RUN mkdir -p /home/vscode/bin && chown vscode:vscode /home/vscode/bin

.devcontainer/README.md

@@ -64,7 +64,8 @@ After the container starts, these aliases are available:
 | `glint` | Run golangci-lint |
 | `ggen` | Run go generate (for translations) |
 | `test-db` | Test database connection |
-| `sql` | Connect to SQL Server interactively |
+| `sql` | Connect to SQL Server (go-sqlcmd) |
+| `sql-legacy` | Connect using legacy ODBC sqlcmd |
 | `rebuild` | Rebuild sqlcmd |
 
 ## SQL Server Connection
@@ -78,23 +79,58 @@ The SQL Server instance is accessible at:
 
 ### Using the Built-in sqlcmd
 
-The container builds sqlcmd from source and adds it to your PATH:
+The container has **two versions** of sqlcmd available:
+
+1. **go-sqlcmd** (this project) - the modern Go-based sqlcmd, built from source at `~/bin/sqlcmd`
+2. **Legacy ODBC sqlcmd** - the classic version from mssql-tools18 at `/opt/mssql-tools18/bin/sqlcmd`
+
+Since go-sqlcmd is first in PATH, the `sqlcmd` command runs the modern version. Use the aliases or full paths to choose which version:
 
 ```bash
-# Using the alias
-sql
+# go-sqlcmd (this project) - default in PATH
+sql                    # alias for go-sqlcmd with connection args
+sqlcmd -S localhost -U sa -P "$SQLCMDPASSWORD" -C
 
-# Or explicitly
-~/bin/sqlcmd -S localhost -U sa -P "SqlCmd@2025!" -C
+# Legacy ODBC sqlcmd (for compatibility testing)
+sql-legacy             # alias for legacy sqlcmd with connection args
+/opt/mssql-tools18/bin/sqlcmd -S localhost -U sa -P "$SQLCMDPASSWORD" -C
 
-# Run a query
+# Run a query with go-sqlcmd
 sql -Q "SELECT @@VERSION"
+
+# Compare behavior between versions
+sql -Q "SELECT 1 AS test"
+sql-legacy -Q "SELECT 1 AS test"
 ```
 
 ### VS Code SQL Extension
 
 The MSSQL extension is pre-configured with a connection profile named **"sqlcmd-container"**. Click the SQL Server icon in the Activity Bar to connect.
 
+### Connecting from Host Machine Tools
+
+The SQL Server port (1433) is forwarded to your host machine, so you can connect using tools installed locally:
+
+#### Azure Data Studio
+
+1. Open Azure Data Studio on your host machine
+2. Create a new connection:
+   - Server: `localhost,1433`
+   - Authentication: SQL Login
+   - User: `sa`
+   - Password: `SqlCmd@2025!`
+   - Trust server certificate: Yes
+
+#### SQL Server Management Studio (Windows)
+
+1. Open SSMS on your Windows host
+2. Connect to Server:
+   - Server name: `localhost,1433`
+   - Authentication: SQL Server Authentication
+   - Login: `sa`
+   - Password: `SqlCmd@2025!`
+   - Check "Trust server certificate"
+
 ## Environment Variables
 
 The following environment variables are set automatically:
@@ -141,7 +177,7 @@ ginstall
 
 ### Adding SQL Setup Scripts
 
-Place `.sql` files in `.devcontainer/mssql/` to have them executed when the container starts.
+The `setup.sql` script in `.devcontainer/mssql/` is executed automatically when the container starts. To run additional SQL scripts, either add them to `setup.sql` or update `post-create.sh` to execute them explicitly.
 
 ### Modifying the SA Password
 

.devcontainer/docker-compose.yml

@@ -20,12 +20,13 @@ services:
     restart: unless-stopped
     environment:
       ACCEPT_EULA: "Y"
+      SA_PASSWORD: "SqlCmd@2025!"
       MSSQL_SA_PASSWORD: "SqlCmd@2025!"
       MSSQL_PID: "Developer"
     volumes:
       - mssql-data:/var/opt/mssql
     healthcheck:
-      test: /opt/mssql-tools18/bin/sqlcmd -S localhost -U sa -P "SqlCmd@2025!" -C -Q "SELECT 1" || exit 1
+      test: ["CMD-SHELL", "/opt/mssql-tools18/bin/sqlcmd -S localhost -U sa -P \"$$SA_PASSWORD\" -C -Q \"SELECT 1\" || exit 1"]
       interval: 10s
       timeout: 5s
       retries: 15

.devcontainer/post-create.sh

@@ -3,9 +3,6 @@ set -e
 
 echo "=== go-sqlcmd Development Container Setup ==="
 
-# Get workspace folder name
-WORKSPACE_FOLDER=$(basename "$PWD")
-
 # Download Go dependencies
 echo "📦 Downloading Go dependencies..."
 go mod download
@@ -23,28 +20,39 @@ go build ./...
 echo "🔄 Verifying SQL Server connection..."
 max_attempts=30
 attempt=1
+sql_ready=false
 while [ $attempt -le $max_attempts ]; do
     if ~/bin/sqlcmd -S localhost -U sa -P "${SQLCMDPASSWORD}" -C -Q "SELECT 1" > /dev/null 2>&1; then
         echo "✅ SQL Server is ready!"
+        sql_ready=true
         break
     fi
     echo "  Waiting for SQL Server... (attempt $attempt/$max_attempts)"
     sleep 2
     attempt=$((attempt + 1))
 done
 
-if [ $attempt -gt $max_attempts ]; then
+if [ "$sql_ready" = false ]; then
     echo "⚠️ Warning: Could not verify SQL Server connection. Tests may fail."
 fi
 
-# Run initial setup SQL if it exists
+# Run initial setup SQL if it exists and SQL Server is ready
 if [ -f ".devcontainer/mssql/setup.sql" ]; then
-    echo "📋 Running setup.sql..."
-    ~/bin/sqlcmd -S localhost -U sa -P "${SQLCMDPASSWORD}" -C -i .devcontainer/mssql/setup.sql
+    if [ "$sql_ready" = true ]; then
+        echo "📋 Running setup.sql..."
+        ~/bin/sqlcmd -S localhost -U sa -P "${SQLCMDPASSWORD}" -C -i .devcontainer/mssql/setup.sql
+    else
+        echo "⚠️ Skipping setup.sql because SQL Server connection could not be verified."
+    fi
 fi
 
-# Create useful aliases
+# Create useful aliases (idempotent - remove existing block first)
 echo "🔧 Setting up helpful aliases..."
+ALIAS_MARKER="# go-sqlcmd development aliases"
+if grep -q "$ALIAS_MARKER" ~/.bashrc 2>/dev/null; then
+    # Remove existing alias block (from marker to next blank line or EOF)
+    sed -i "/$ALIAS_MARKER/,/^$/d" ~/.bashrc
+fi
 cat >> ~/.bashrc << 'EOF'
 
 # go-sqlcmd development aliases
@@ -61,6 +69,9 @@ alias ggen='go generate ./...'
 # sqlcmd shortcut - uses the locally built version
 alias sql='~/bin/sqlcmd -S localhost -U sa -P "$SQLCMDPASSWORD" -C'
 
+# Legacy ODBC sqlcmd for compatibility testing
+alias sql-legacy='/opt/mssql-tools18/bin/sqlcmd -S localhost -U sa -P "$SQLCMDPASSWORD" -C'
+
 # Quick test connection
 alias test-db='~/bin/sqlcmd -S localhost -U sa -P "$SQLCMDPASSWORD" -C -Q "SELECT @@VERSION"'
 
@@ -83,15 +94,16 @@ echo "  gvet        - Run go vet"
 echo "  glint       - Run golangci-lint"
 echo "  ggen        - Run go generate (for translations)"
 echo "  test-db     - Test database connection"
-echo "  sql         - Connect to SQL Server interactively"
+echo "  sql         - Connect to SQL Server (go-sqlcmd)"
+echo "  sql-legacy  - Connect using legacy ODBC sqlcmd"
 echo "  rebuild     - Rebuild sqlcmd"
 echo ""
 echo "🔧 Your locally built sqlcmd is at ~/bin/sqlcmd and in PATH"
 echo ""
 echo "🔗 SQL Server Connection:"
 echo "  Server:   localhost,1433"
 echo "  User:     sa"
-echo "  Password: SqlCmd@2025!"
+echo "  Password: (from SQLCMDPASSWORD environment variable)"
 echo "  Database: master (or SqlCmdTest)"
 echo ""
 echo "🧪 Environment variables are pre-configured for tests."

README.md

@@ -313,7 +313,7 @@ sqlcmd.exe: error: sqlcmd.exe: '-w 4': Der Wert muss größer als 8 und kleiner
 
 ### Quick Start with Dev Containers
 
-The easiest way to develop and test sqlcmd is using the included [Dev Container](.devcontainer/README.md), which works with:
+The easiest way to develop and test sqlcmd is to use the included [Dev Container](.devcontainer/README.md), which works with:
 
 - **VS Code**: Install the [Dev Containers extension](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-containers), open this repo, and click "Reopen in Container"
 - **GitHub Codespaces**: Click the "Code" button on GitHub and select "Create codespace"