Use Github Actions for CI (#9)

Author: mlarraz

.github/workflows/CI.yml

@@ -4,10 +4,61 @@ on:
   push:
     branches:
       - master
-      - github_actions
   pull_request:
 
 jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby:
+          - "3.3"
+          - "3.4"
+        activerecord:
+          - "6.1"
+    continue-on-error: ${{ matrix.ruby == 'head' || matrix.activerecord == 'head' }}
+    name: Ruby ${{ matrix.ruby }} / ActiveRecord ${{ matrix.activerecord }}
+    services:
+      postgres:
+        image: postgres
+        ports:
+          - 5432:5432
+        env:
+          POSTGRES_HOST_AUTH_METHOD: trust
+          POSTGRES_DB: odbc_test
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+    env:
+      RAILS_VERSION: ${{ matrix.activerecord }}
+      CONN_STR: 'DRIVER={PostgreSQL ANSI};SERVER=localhost;PORT=5432;DATABASE=odbc_test;UID=postgres;'
+      PGHOST: localhost
+      PGUSER: postgres
+      RAILS_ENV: test
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install Apt Packages
+        run: >
+          sudo apt-get install
+          unixodbc
+          unixodbc-dev
+          odbc-postgresql
+          odbcinst
+
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - name: Setup PostgreSQL
+        run: |
+          sudo odbcinst -j
+          sudo cat /usr/share/psqlodbc/odbcinst.ini.template
+          sudo odbcinst -i -d -f /usr/share/psqlodbc/odbcinst.ini.template
+      - run: |
+          bundle exec rake test
   RuboCop:
     runs-on: ubuntu-latest
     steps:

.travis.yml

@@ -1,5 +1,12 @@
 source "https://rubygems.org"
 
+gem "activerecord", "~> #{ENV.fetch('RAILS_VERSION', '6.1')}.0"
+
+gem "base64"
+gem "bigdecimal"
+gem "mutex_m"
+
+gem "rake"
 gem "rubocop", "~> 1.75.0"
 
 gemspec

Gemfile

@@ -149,11 +149,9 @@ def disconnect!
 
       # Build a new column object from the given options. Effectively the same
       # as super except that it also passes in the native type.
-      # rubocop:disable Metrics/ParameterLists
-      def new_column(name, default, sql_type_metadata, null, table_name, default_function = nil, collation = nil, native_type = nil)
-        ::ODBCAdapter::Column.new(name, default, sql_type_metadata, null, table_name, default_function, collation, native_type)
+      def new_column(...)
+        ::ODBCAdapter::Column.new(...)
       end
-      # rubocop:enable Metrics/ParameterLists
 
       protected
 

gemfiles/active_record_5_0.gemfile

@@ -42,7 +42,7 @@ def default_sequence_name(table_name, pri_key = nil)
         "#{table_name}_#{pri_key || 'id'}_seq"
       end
 
-      def sql_for_insert(sql, pri_key, _id_value, _sequence_name, binds)
+      def sql_for_insert(sql, pri_key, binds)
         unless pri_key
           table_ref = extract_table_ref_from_insert_sql(sql)
           pri_key = primary_key(table_ref) if table_ref

gemfiles/active_record_5_1.gemfile

@@ -4,11 +4,9 @@ class Column < ActiveRecord::ConnectionAdapters::Column
 
     # Add the native_type accessor to allow the native DBMS to report back what
     # it uses to represent the column internally.
-    # rubocop:disable Metrics/ParameterLists
-    def initialize(name, default, sql_type_metadata = nil, null = true, table_name = nil, native_type = nil, default_function = nil, collation = nil)
-      super(name, default, sql_type_metadata, null, table_name, default_function, collation)
+    def initialize(*, native_type: nil, **)
+      super(*, **)
       @native_type = native_type
     end
-    # rubocop:enable Metrics/ParameterLists
   end
 end

gemfiles/active_record_5_2.gemfile

@@ -28,7 +28,8 @@ def quote_column_name(name)
     # sequence, but not all ODBC drivers support them.
     def quoted_date(value)
       if value.acts_like?(:time)
-        zone_conversion_method = ActiveRecord::Base.default_timezone == :utc ? :getutc : :getlocal
+        default_tz = ActiveRecord.try(:default_timezone) || ActiveRecord::Base.default_timezone
+        zone_conversion_method = default_tz == :utc ? :getutc : :getlocal
 
         if value.respond_to?(zone_conversion_method)
           value = value.send(zone_conversion_method)

lib/active_record/connection_adapters/odbc_adapter.rb

@@ -83,7 +83,7 @@ def columns(table_name, _name = nil)
         end
         sql_type_metadata = ActiveRecord::ConnectionAdapters::SqlTypeMetadata.new(**args)
 
-        cols << new_column(format_case(col_name), col_default, sql_type_metadata, col_nullable, table_name, col_native_type)
+        cols << new_column(format_case(col_name), col_default, sql_type_metadata, col_nullable, native_type: col_native_type)
       end
     end
 

lib/odbc_adapter/adapters/postgresql_odbc_adapter.rb

@@ -19,12 +19,12 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "activerecord", ">= 6.0", "< 8"
+  spec.required_ruby_version = ">= 3.3.0"
+
+  spec.add_dependency "activerecord", ">= 6.1", "< 8"
   spec.add_dependency "ruby-odbc", ">= 0.9", "< 2"
 
-  spec.add_development_dependency "bundler",   ">= 1.14"
   spec.add_development_dependency "minitest",  "~> 5.10"
   spec.add_development_dependency "pry",       "~> 0.11"
-  spec.add_development_dependency "rake",      "~> 12.0"
   spec.add_development_dependency "simplecov", "~> 0.14"
 end

lib/odbc_adapter/column.rb

@@ -1,3 +1,4 @@
+require "logger"
 require "simplecov"
 SimpleCov.start