tiny_tds 3.2.0-x64-mingw32 → 3.3.0-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 661ae25a8fe66dca380e127cd6618bc996f6cbf9d0042acf332fbb16af182c57
-  data.tar.gz: eb09ce7c6e0d912454352f2c3c0c778be6c2300a6bf827ece29e2ffde4a151ad
+  metadata.gz: 54b3de649d19270daf9ed150ebc13224493b09c204204aecf5f74dcafdbb2642
+  data.tar.gz: fecc088d5ffa3f9cb94fcc3a5f27a9d8e8d01828ed1118437265ec8fd5160936
 SHA512:
-  metadata.gz: 1c3504bca6edaf0e5935681d4e0bb119c8920e7ad58fe2189dcf9f8eda4d83a5b8c67fcbacd27d69d78c9d8be7b00e3095f3538139eb345e5a78a9f4b8a98ccd
-  data.tar.gz: b8b820b26e8be0e56f6f53569a37387557a8f82c8228d20a971d13f685566a605a6d91908b7feb7b0e6a841ba11f95825f760f15a9f5b0a96ae28bbe2891cf25
+  metadata.gz: 9d432eb891e3d6a266d4d4f81611c71a6d9100fa964ca50a52b2964815fe92e3b494ec5375dced644d0f6324784bf6bae837bfff29d282187525283f482a12e5
+  data.tar.gz: 5bd01484facd6fac7fca705f87fcf73f72e593613e506df7765326dc15b4ae98449e05aa03baee3fe924f05f444a0d94c962cea2f451150d74c472f0ae4455ee

data/.devcontainer/Dockerfile

@@ -0,0 +1,21 @@
+FROM mcr.microsoft.com/devcontainers/ruby:2.7
+
+# Install the SQL Server command-line tools and the Artistic Style code formatter
+RUN curl https://packages.microsoft.com/keys/microsoft.asc | sudo tee /etc/apt/trusted.gpg.d/microsoft.asc \
+    && curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list | sudo tee /etc/apt/sources.list.d/mssql-release.list \
+    && apt-get update \
+    && ACCEPT_EULA=Y apt-get install -y astyle mssql-tools18 unixodbc-dev
+ENV PATH=$PATH:/opt/mssql-tools18/bin
+
+# Install FreeTDS
+ENV FREETDS_VERSION=1.5.1
+COPY test/bin/install-freetds.sh /tmp/
+RUN /tmp/install-freetds.sh
+
+# Add the tiny_tds main Gemfile and install the gems.
+RUN mkdir -p /tmp/tiny_tds
+COPY Gemfile VERSION tiny_tds.gemspec /tmp/tiny_tds/
+RUN cd /tmp/tiny_tds \
+    && bundle install \
+    && rm -rf /tmp/tiny_tds
+RUN chown -R vscode:vscode /usr/local/rvm && chown -R vscode:vscode /usr/local/bundle

data/.devcontainer/boot.sh

@@ -0,0 +1,6 @@
+# Setup test databases and users.
+sqlcmd -C -S sqlserver -U sa -P 'c0MplicatedP@ssword' -i ./test/sql/db-create.sql
+sqlcmd -C -S sqlserver -U sa -P 'c0MplicatedP@ssword' -i ./test/sql/db-login.sql
+
+# Mark directory as safe in Git so that commands run without warnings.
+git config --global --add safe.directory /workspaces/tiny_tds

data/.devcontainer/compose.yaml

@@ -0,0 +1,40 @@
+version: '3'
+
+services:
+  tiny_tds:
+    build:
+      context: ..
+      dockerfile: .devcontainer/Dockerfile
+
+    volumes:
+      - ../..:/workspaces:cached
+
+    # Overrides default command so things don't shut down after the process ends.
+    command: sleep infinity
+
+    networks:
+      - default
+    depends_on:
+      - sqlserver
+
+  toxiproxy:
+    image: ghcr.io/shopify/toxiproxy:2.5.0
+
+  sqlserver:
+    image: mcr.microsoft.com/mssql/server:2022-latest
+    restart: unless-stopped
+    networks:
+      - default
+    volumes:
+      - sqlserver-data:/var/opt/mssql
+    ports:
+      - "1433:1433"
+    environment:
+      MSSQL_SA_PASSWORD: 'c0MplicatedP@ssword'
+      ACCEPT_EULA: Y
+
+networks:
+  default:
+
+volumes:
+  sqlserver-data:

data/.devcontainer/devcontainer.json

@@ -0,0 +1,30 @@
+// For format details, see https://aka.ms/devcontainer.json.
+{
+  "name": "tiny_tds project development",
+  "dockerComposeFile": "compose.yaml",
+  "service": "tiny_tds",
+  "workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
+
+  // Features to add to the dev container. More info: https://containers.dev/features.
+  "features": {
+    "ghcr.io/devcontainers/features/docker-in-docker:2": {
+      // Moby is not installable in Debian 11
+      "moby": false
+    }
+  },
+
+  "containerEnv": {
+    "TINYTDS_UNIT_HOST": "sqlserver",
+    "TOXIPROXY_HOST": "toxiproxy"
+  },
+
+  // Use 'forwardPorts' to make a list of ports inside the container available locally.
+  // This can be used to network with other containers or the host.
+  // "forwardPorts": [3000, 5432],
+
+  // Use 'postCreateCommand' to run commands after the container is created.
+  "postCreateCommand": ".devcontainer/boot.sh",
+
+  // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
+  // "remoteUser": "root"
+}

data/.github/workflows/ci.yml

@@ -66,8 +66,6 @@ jobs:
     name: install-windows-mingw
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v4
-
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby-version }}
@@ -80,13 +78,7 @@ jobs:
 
       - name: Install native gem
         shell: pwsh
-        run: |
-          $rubyArchitecture = (ruby -e "puts RbConfig::CONFIG['arch']").Trim()
-          $gemVersion = (Get-Content VERSION).Trim()
-          $gemToInstall = "./tiny_tds-$gemVersion-$rubyArchitecture.gem"
-
-          Write-Host "Looking to install $gemToInstall"
-          gem install "$gemToInstall"
+        run: gem install "tiny_tds-*.gem"
 
       - name: Test if TinyTDS loads
         shell: pwsh
@@ -191,8 +183,6 @@ jobs:
     name: install-windows-ucrt
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v4
-
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby-version }}
@@ -205,13 +195,7 @@ jobs:
 
       - name: Install native gem
         shell: pwsh
-        run: |
-          $rubyArchitecture = (ruby -e "puts RbConfig::CONFIG['arch']").Trim()
-          $gemVersion = (Get-Content VERSION).Trim()
-          $gemToInstall = "./tiny_tds-$gemVersion-$rubyArchitecture.gem"
-
-          Write-Host "Looking to install $gemToInstall"
-          gem install "$gemToInstall"
+        run: gem install "tiny_tds-*.gem"
 
       - name: Test if TinyTDS loads
         shell: pwsh
@@ -308,9 +292,12 @@ jobs:
       fail-fast: false
       matrix:
         ruby-version:
-          - "2.7"
-          - "3.0"
-          - "3.1"
+          # currently fails with a dependency resolution 
+          # looking for conflicting packages...
+          # :: installing mingw-w64-x86_64-gcc-libs (15.1.0-8) breaks dependency 'mingw-w64-x86_64-gcc-libs=14.2.0-3' required by mingw-w64-x86_64-gcc
+          # - "2.7"
+          # - "3.0"
+          # - "3.1"
           - "3.2"
           - "3.3"
           - "3.4"
@@ -389,8 +376,6 @@ jobs:
     name: install-linux
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v4
-
       - name: Download precompiled gem
         uses: actions/download-artifact@v4
         with:
@@ -407,7 +392,7 @@ jobs:
             sh -c "
               gem update --system 3.3.22 &&
               ${{ matrix.bootstrap }}
-              gem install --no-document ./gems/tiny_tds-$(cat VERSION)-${{ matrix.platform }}.gem &&
+              gem install --no-document ./gems/tiny_tds-*.gem &&
               ruby -e \"require 'tiny_tds'; puts TinyTds::Gem.root_path\" &&
               tsql-ttds -C &&
               defncopy-ttds -v
@@ -425,7 +410,6 @@ jobs:
           - true
 
         mssql-version:
-          - 2017
           - 2019
           - 2022
 
@@ -574,8 +558,8 @@ jobs:
         run: |
           ruby -e "require 'tiny_tds'; puts TinyTds::Gem.root_path"
 
-  standardrb:
-    name: standardrb
+  formatting:
+    name: Code formatting
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
@@ -588,3 +572,12 @@ jobs:
       - name: Check standardrb
         shell: bash
         run: bundle exec standardrb
+
+      # - name: Check artistic style
+      #   uses: per1234/artistic-style-action@v1
+      #   with:
+      #     options-file-path: "astyle.conf"
+      #     target-paths: "./ext/"
+      #     name-patterns: |
+      #       - '*.c'
+      #       - '*.h'

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## (unreleased)
+
+## 3.3.0
+
+* Use freetds v1.5.4 and OpenSSL v3.5.2 for Windows and Linux builds.
+* Use `TypedData` in C-Land.
+
+## 3.2.1
+
+* Ensure the native Gem loads on Windows. Fixes #581.
+* Use OpenSSL v3.4.1 for Windows and Linux builds.
+
 ## 3.2.0
 
 * Reduce number of files shipped with precompiled Windows gem

data/README.md

@@ -80,9 +80,9 @@ Optionally, Microsoft has done a great job writing [an article](https://learn.mi
 
 ## Data Types
 
-Our goal is to support every SQL Server data type and covert it to a logical Ruby object. When dates or times are returned, they are instantiated to either `:utc` or `:local` time depending on the query options. Only [datetimeoffset] types are excluded. All strings are associated the to the connection's encoding and all binary data types are associated to Ruby's `ASCII-8BIT/BINARY` encoding.
+Our goal is to support every SQL Server data type and convert it to a logical Ruby object. When dates or times are returned, they are instantiated to either `:utc` or `:local` time depending on the query options. Only [datetimeoffset] types are excluded. All strings are associated to the connection's encoding and all binary data types are associated to Ruby's `ASCII-8BIT/BINARY` encoding.
 
-Below is a list of the data types we support when using the 7.4 TDS protocol version. Using a lower protocol version will result in these types being returned as strings.
+Below is a list of the data types we support when using the 7.3 TDS protocol version. Using a lower protocol version will result in these types being returned as strings.
 
 * [date]
 * [datetime2]
@@ -98,11 +98,11 @@ Connect to a database.
 client = TinyTds::Client.new username: 'sa', password: 'secret', host: 'mydb.host.net'
 ```
 
-Creating a new client takes a hash of options. For valid iconv encoding options, see the output of `iconv -l`. Only a few have been tested and highly recommended to leave blank for the UTF-8 default.
+Creating a new client takes a hash of options. For valid iconv encoding options, see the output of `iconv -l`. Only a few have been tested, and are highly recommended to leave blank for the UTF-8 default.
 
 * :username - The database server user.
 * :password - The user password.
-* :dataserver - Can be the name for your data server as defined in freetds.conf. Raw hostname or hostname:port will work here too. FreeTDS says that named instance like 'localhost\SQLEXPRESS' work too, but I highly suggest that you use the :host and :port options below. [Google how to find your host port if you are using named instances](http://bit.ly/xAf2jm) or [go here](http://msdn.microsoft.com/en-us/library/ms181087.aspx).
+* :dataserver - Can be the name for your data server as defined in freetds.conf. Raw hostname or hostname:port will work here too. FreeTDS says that a named instance like 'localhost\SQLEXPRESS' will work too, but I highly suggest that you use the :host and :port options below. [Google how to find your host port if you are using named instances](http://bit.ly/xAf2jm) or [go here](http://msdn.microsoft.com/en-us/library/ms181087.aspx).
 * :host - Used if :dataserver blank. Can be an host name or IP.
 * :port - Defaults to 1433. Only used if :host is used.
 * :database - The default database to use.
@@ -401,47 +401,31 @@ First, clone the repo using the command line or your Git GUI of choice.
 $ git clone git@github.com:rails-sqlserver/tiny_tds.git
 ```
 
-After that, the quickest way to get setup for development is to use [Docker](https://www.docker.com/). Assuming you have [downloaded docker](https://www.docker.com/products/docker) for your platform, you can use [docker-compose](https://docs.docker.com/compose/install/) to run the necessary containers for testing.
+After that, the quickest way to get setup for development is to use the provided devcontainers setup.
 
 ```shell
-$ docker-compose up -d
+npm install -g @devcontainers/cli
+devcontainer up --workspace-folder .
+devcontainer exec --workspace-folder . bash
 ```
 
-This will download the official SQL Server for Linux Docker image from [Microsoft](https://hub.docker.com/r/microsoft/mssql-server-linux/). This will also download a [toxiproxy](https://github.com/shopify/toxiproxy) Docker image which we can use to simulate network failures for tests. Basically, it does the following:
+From within the container, you can run the tests using the following command:
 
 ```shell
-$ docker network create main-network
-$ docker pull mcr.microsoft.com/mssql/server:2017-latest
-$ docker run -p 1433:1433 -d --name sqlserver --network main-network mcr.microsoft.com/mssql/server:2017-latest
-$ docker pull shopify/toxiproxy
-$ docker run -p 8474:8474 -p 1234:1234 -d --name toxiproxy --network main-network shopify/toxiproxy
+bundle install
+bundle exec rake test
 ```
 
-Make sure to run these SQL scripts as SA to get the test database and user installed. If needed, install [sqlcmd as described by Microsoft for your platform](https://learn.microsoft.com/en-us/sql/tools/sqlcmd/sqlcmd-utility?view=sql-server-ver16&tabs=go%2Clinux&pivots=cs1-bash).
+You can customize the environment variables to run the tests against a different environment
 
-```shell
-/opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P super01S3cUr3 -i ./test/sql/db-create.sql
-/opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P super01S3cUr3 -i ./test/sql/db-login.sql
-```
-
-From here you can build and run tests against an installed version of FreeTDS.
-
-```shell
-$ bundle install
-$ bundle exec rake
-```
-
-Examples us using enviornment variables to customize the test task.
-
-```
-$ rake TINYTDS_UNIT_DATASERVER=mydbserver
-$ rake TINYTDS_UNIT_DATASERVER=mydbserver TINYTDS_SCHEMA=sqlserver_2017
-$ rake TINYTDS_UNIT_HOST=mydb.host.net TINYTDS_SCHEMA=sqlserver_azure
+```shell 
+rake test TINYTDS_UNIT_DATASERVER=mydbserver TINYTDS_SCHEMA=sqlserver_2017
+rake test TINYTDS_UNIT_HOST=mydb.host.net TINYTDS_SCHEMA=sqlserver_azure
 ```
 
 ### Code formatting
 
-We are using `standardrb` to format our code. Just run `bundle exec standardrb --fix` to format all Ruby files.
+We are using `standardrb` to format the Ruby code and Artistic Style for the C code. Run `bundle exec rake format` to format both types in one operation. Artistic Style needs to be manually installed through your package manager (e.g. `apt install -y astyle`).
 
 ### Compiling Gems for Windows and Linux
 
@@ -450,7 +434,7 @@ We are using `standardrb` to format our code. Just run `bundle exec standardrb -
 
 For the convenience, TinyTDS ships pre-compiled gems for supported versions of Ruby on Windows and Linux. In order to generate these gems, [rake-compiler-dock](https://github.com/rake-compiler/rake-compiler-dock) is used.
 
-Run the following rake task to compile the gems. This will check the availability of [Docker](https://www.docker.com/) and will give some advice for download and installation. When docker is running, it will download the docker image (once-only) and start the build:
+Run the following rake task to compile the gems. You can run these commands from inside the devcontainers setup, or outside if neeed. The command will check the availability of [Docker](https://www.docker.com/) and will give some advice for download and installation. When docker is running, it will download the docker image (once-only) and start the build:
 
 ```shell
 bundle exec rake gem:native

data/Rakefile

@@ -65,3 +65,8 @@ end
 
 task build: [:clean, :compile]
 task default: [:build, :test]
+
+task :format do
+  system("bundle exec standardrb --fix")
+  system('astyle --options=astyle.conf "./ext/*.c" "./ext/*.h"')
+end

data/VERSION

@@ -1 +1 @@
-3.2.0
+3.3.0

data/astyle.conf

@@ -0,0 +1,8 @@
+--style=1tbs
+--break-blocks
+--indent-preproc-block
+--indent-preproc-cond
+--indent=spaces=2
+--indent-switches
+--recursive
+--suffix=none