ydbi 0.5.8 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62f01549856766688a97c7b0978a288de3036664ada7ada30004210f3d59204e
-  data.tar.gz: 035ef8999addc9d27a10d2e51ccf7390c4aac40227d3273a93e5b4d0c0079cba
+  metadata.gz: 80455e3ec5f80b4e8539b22d58879b7012f70b83c29bc9784bb82427566aa91b
+  data.tar.gz: 18c776985c1edd563dc5783e6515f1b2653e80ab884272c084fdaad8b59e502e
 SHA512:
-  metadata.gz: d863b375ab55be7eaa5556427fce403e0cfb7197daa9dd7b997af1bf1e1ef920d383ff5ccdd5bbcacf63373b4466ef2a3722398175d949ad80be8f2f12aab44a
-  data.tar.gz: 11a57ae2353ff07445bf79e3a770023387284cf8883dafda2087b8e466fbbe6a2184d6aece6a4ee097cefb53aeff6849cfb12ae6e9062a85dedb9621f3e4bf85
+  metadata.gz: 7aa52a52781a15e92afb3707a326880aebbf42fe732133614bb8aebcb643b3403dd3075fe96589b2704f053048120e7672df3d6ba6687d1eb5c64624b1095fdf
+  data.tar.gz: ab575de5db9ed153350a8305e72757378380731b8bcb9e6adc1ffcc5b25aa4f1596ffd7bd4100579ed5d417dedf83fe70c27f8f97077999c2bc5c0d39aab676f

data/.envrc

@@ -0,0 +1,3 @@
+source_url "https://raw.githubusercontent.com/cachix/devenv/d1f7b48e35e6dee421cfd0f51481d17f77586997/direnvrc" "sha256-YBzqskFZxmNb3kYVoKD9ZixoPXJh1C9ZvTLGFRkauZ0="
+
+use devenv

data/.github/workflows/ruby.yml

@@ -0,0 +1,65 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: Ruby
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    # Service containers to run with `runner-job`
+    services:
+      # Label used to access the service container
+      postgres:
+        # Docker Hub image
+        image: postgres
+        # Provide the password for postgres
+        env:
+          # POSTGRES_PASSWORD: pg_password
+          POSTGRES_HOST_AUTH_METHOD: trust
+          POSTGRES_USER: ydbi_pg
+        # Set health checks to wait until postgres has started
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          # Maps tcp port 5432 on service container to the host
+          - 5432:5432
+
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby-version: ['2.6', '2.7', '3.0', '3.1', 3.2, 3.3]
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up Ruby
+    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
+    # change this to (see https://github.com/ruby/setup-ruby#versioning):
+    # uses: ruby/setup-ruby@v1
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - name: Run tests
+      env:
+        PGDATABASE: ydbi_pg
+        PGHOST: localhost
+        PGPORT: 5432
+        PGUSER: ydbi_pg
+        PGPASSWORD: postgres
+
+      run: |
+        psql --version
+        bundle exec rake test

data/.gitignore

@@ -0,0 +1,19 @@
+vendor/
+coverage/
+pkg/
+.bundle
+.ruby-version
+Gemfile.lock
+rdoc/
+*.patch
+
+# Devenv
+.devenv*
+devenv.local.nix
+
+# direnv
+.direnv
+
+# pre-commit
+.pre-commit-config.yaml
+

data/ChangeLog

@@ -1,3 +1,11 @@
+## 0.6.0 - 30/01/2024
+* fix running under postgresql 12 and later
+* run tests for ydbi-pg via test/dbd/postgresql and add them to the github workflow
+* Added support for https://devenv.sh
+
+## 0.5.9 - 15/12/2022
+* fix issue with tty, see https://github.com/zdavatz/oddb.org/issues/183
+
 ## 0.5.8 - 11/03/2021
 
 * removed fixed dependency to pg (is now optional like mysql)

data/Gemfile

@@ -0,0 +1,5 @@
+# A sample Gemfile
+source "https://rubygems.org"
+
+gemspec
+gem 'pg'

data/Rakefile

@@ -0,0 +1,14 @@
+$:.unshift 'build'
+found = false;
+if File.exist? 'lib/dbi'
+    require 'Rakefile.dbi'
+end
+if File.exist? 'lib/dbd'
+    require 'rake_task_lib'
+    build_dbd_tasks(File.basename(Dir['lib/dbd/*.rb'][0], '.rb').downcase)
+    found = true;
+end
+unless found
+    abort "Well, this is odd; No DBI or DBD found."
+end
+require 'bundler/gem_tasks'

data/TODO

@@ -0,0 +1,44 @@
+0.4.0:
+    x Work
+     x Postgres quoting toggles
+     x Postgres binding toggles
+     x Test for #20489
+    * Release checklist:
+     x Update ChangeLog
+     x rake
+     x remove all related gems, install all DBI/DBD gems (check prereqs)
+     x write a few test scripts to make sure drivers are loading  
+     x Update homepage (irc channel, git, other changes)
+     * tag as 0.4.0
+     * upload rdoc
+     * upload packages
+     * release announcement (rf, ruby-talk, dbi lists, other places?)
+     * rebase master from development
+     * BEER 
+0.6.0:
+    * Cleanup:
+     * Arrays:
+          * Find some way to get the extents of an array type
+           * checked pg_type, pg_attribute and pg_class, can't find anything.
+           * I don't think this is possible, but let's slate it for 0.6.0 anyways.
+     * Tracing
+      * WTH do we want to do with this
+       * Wow, this module has *serious issues*. Crashes DBI without warning. Redo this completely.
+        * 0.6.0
+    * Re-institute drivers
+     * Proxy
+      * Slated for 0.6.0
+    * Finish type management system
+     * Unify ColumnInfo
+      * Should we enforce ColumnInfo requirements at the DBI level?
+       * At least test the result of statement colinfo uniformly
+       * 0.6.0
+    * Cleanup core
+     * Require code is a mess
+      * Just remove the case-sensitivity from the DBDs in general
+       * 0.6.0
+     * Find a good clean way to enumerate drivers in separate gems
+      * Some registration-on-require would be cleaner and safer
+       * 0.6.0
+    * Scripts
+     * bin/dbd_proxy seems to have never worked; slate it for 0.6.0

data/bench/bench.rb

@@ -0,0 +1,79 @@
+require 'rubygems'
+$:.unshift File.dirname(__FILE__) + '/../lib'
+require 'dbi'
+
+class DbiBenchmark
+	attr_reader :db
+
+	def initialize db, quiet=false
+		@db = db
+		@quiet = quiet
+	end
+
+	def puts(*args)
+		super unless @quiet
+	end
+
+	def run
+		times = {}
+		%w[create_test_table selecting_floats selecting_datetimes].each do |name|
+			t = Time.now
+			puts "* #{name.tr('_', ' ').capitalize}"
+			send name
+			took = Time.now - t
+			puts "  (took #{took} seconds)"
+			puts
+			times[name] = took
+		end
+		times
+	ensure
+		db.do 'drop table data'
+	end
+
+	def create_test_table
+		db.do <<-end
+			create table data (
+				date timestamp,
+				value float
+			)
+		end
+		db.do 'begin'
+		today = Date.today
+		5_000.times do
+			db.do "insert into data values ('#{today + rand(100) - 50}', #{10 + rand * 30})"
+		end
+		db.do 'commit'
+	end
+
+	def selecting_floats
+		strs = db.select_all('select value from data').map { |v| v.to_s }
+		puts *strs[0, 5]
+		puts '...'
+	end
+
+	def selecting_datetimes
+		strs = db.select_all('select date from data').map { |v| v.to_s }
+		puts *strs[0, 5]
+		puts '...'
+	end
+end
+
+def bench
+	dbiurls = [
+		'DBI:Mysql:dbitest:localhost',
+		'DBI:ODBC:MYDBITEST',
+	  'DBI:Pg:dbitest:localhost',
+		'DBI:ODBC:PGDBITEST',
+	]
+	order = %w[create_test_table selecting_floats selecting_datetimes]
+	dbiurls.map do |url|
+	  # assume all dbs have the same credentials
+		DBI.connect(url, *ARGV) do |db|
+			[url.first.sub('DBI:', ''), *DbiBenchmark.new(db, true).run.values_at(*order)]
+		end
+	end
+end
+
+puts 'Running benchmark:'
+DBI::Utils::TableFormatter.ascii(%w[db insert float datetime], bench, nil, nil, nil, nil, 30)
+

data/build/rake_task_lib.rb

@@ -0,0 +1,186 @@
+$:.unshift 'lib'
+require 'rake'
+require 'rubygems'
+require 'rubygems/package_task'
+require 'rake/packagetask'
+require 'rdoc/task'
+
+
+DEFAULT_TASKS = [:clobber_package, :package, :gem]
+
+DBD_GEM_DEP_MAP = {
+    'pg'      => 'pg',
+#    'mysql'   => 'mysql',
+#    'sqlite'  => 'sqlite-ruby',
+#    'sqlite3' => 'sqlite3-ruby'
+}
+
+#
+# Packaging
+#
+
+PACKAGE_FILES = %w(Rakefile build/rake_task_lib.rb setup.rb)
+DOC_FILES  = %w(readme.md LICENSE ChangeLog)
+EXCLUSIONS = %w(test/sql.log)
+DBD_FILES  = %w(test/DBD_TESTS)
+
+#
+# some inlines
+#
+
+def gem_files(code_files)
+    (code_files + DOC_FILES).collect { |x| Dir[x] }.reject { |x| EXCLUSIONS.include? x }.flatten
+end
+
+def package_files(code_files)
+    code_files + DOC_FILES + PACKAGE_FILES
+end
+
+def build_package_tasks(spec, code_files)
+    Gem::PackageTask.new(spec) do |s|
+    end
+
+    Rake::PackageTask.new('y'+spec.name, spec.version) do |p|
+        p.need_tar_gz = true
+        p.need_zip = true
+
+        package_files(code_files).each do |x|
+            p.package_files.include(x)
+        end
+
+        EXCLUSIONS.each do |x|
+            p.package_files.exclude(x)
+        end
+    end
+end
+
+def boilerplate_spec
+    gem = Gem::Specification.new
+    gem.authors     = ['Erik Hollensbe', 'Christopher Maujean']
+    gem.email       = 'zdavatz@ywesee.com'
+    gem.homepage    = 'https://github.com/zdavatz/ydbi'
+    gem.platform    = Gem::Platform::RUBY
+    gem.extra_rdoc_files = DOC_FILES
+    gem.required_ruby_version = '>= 1.8.0'
+    gem.rubyforge_project = 'ydbi'
+    return gem
+end
+
+# builds a dbd namespace from the DBD_PACKAGES hash
+def dbd_namespace(dbd)
+    "ydbd-" + dbd.to_s.downcase
+end
+
+def dbd_code_files(dbd)
+    code_files = [
+                "test/dbd/general/**",
+                File.join("test", "dbd", dbd.downcase == "pg" ? "postgresql" : dbd.downcase, "*"),
+                File.join("lib", "dbd", dbd + ".rb"),
+                "lib/dbd/#{dbd.downcase}/*.rb",
+    ] + DBD_FILES
+end
+
+def dbd_gem_files(code_files)
+    DBD_FILES + gem_files(code_files)
+end
+
+def dbd_package_files(code_files)
+    DBD_FILES + package_files(code_files)
+end
+
+def dbd_gem_spec(dbd, dbd_const, code_files)
+    spec = boilerplate_spec
+    spec.name        = dbd_namespace(dbd)
+    spec.version     = dbd_version(dbd_const)
+    spec.test_file   = 'test/ts_dbd.rb'
+    spec.files       = gem_files(code_files)
+    spec.summary     = dbd_description(dbd_const)
+    spec.description = dbd_description(dbd_const)
+    spec.add_dependency 'ydbi', DBI::VERSION
+
+    dcdbd = dbd.downcase
+
+    if DBD_GEM_DEP_MAP[dcdbd]
+        spec.add_dependency DBD_GEM_DEP_MAP[dcdbd]
+    end
+
+    return spec
+end
+
+def dbd_version(const)
+    DBI::DBD.const_get(const).const_get("VERSION")
+end
+
+def dbd_description(const)
+    DBI::DBD.const_get(const).const_get("DESCRIPTION")
+end
+
+
+def build_dbd_tasks(dbd)
+    task :default => DEFAULT_TASKS
+
+    begin
+        done = false
+        dbd_const = nil
+        Dir["lib/dbd/*.rb"].each do |dbd_file|
+            if File.basename(dbd_file.downcase, '.rb') == dbd.to_s.downcase
+                dbd_const = File.basename(dbd_file, '.rb')
+                require "dbd/#{dbd_const}"
+                done = true
+            end
+        end
+
+        abort "No DBD found even though we asked to make tasks for it" unless done
+
+        code_files = dbd_code_files(dbd_const)
+
+        spec = dbd_gem_spec(dbd, dbd_const, code_files)
+
+        build_package_tasks(spec, code_files)
+
+        # FIXME: convert to a rake_test_loader sooner or later
+        task :test do
+            ENV["DBTYPES"] = dbd
+            ruby "test/ts_dbd.rb"
+        end
+    rescue LoadError => e
+        DEFAULT_TASKS.each do |x|
+            task x do
+            end
+        end
+        warn "Skipping #{dbd_namespace(dbd)} because we can't require DBD"
+    end
+end
+
+def build_dbi_tasks
+end
+
+#
+# basic tasks
+#
+
+task :dist      => [:distclean, :package, :rdoc]
+task :distclean => [:clobber_package, :clobber_rdoc]
+task :clean     => [:distclean]
+task :default   => [:test, :dist]
+
+task :to_blog   => [:clobber_rdoc, :rdoc] do
+    sh "rm -r $git/blog/content/docs/ruby-dbi && mv rdoc $git/blog/content/docs/ruby-dbi"
+end
+
+#
+# Documentation
+#
+
+RDoc::Task.new do |rd|
+    rd.rdoc_dir = "rdoc"
+    rd.main = "readme.md"
+    rd.rdoc_files.include("./readme.md")
+    rd.rdoc_files.include("./ChangeLog")
+    rd.rdoc_files.include("./LICENSE")
+    rd.rdoc_files.include("./doc/**/*.rdoc")
+    rd.rdoc_files.include("./lib/**/*.rb")
+    rd.rdoc_files.include("./ext/**/*.c")
+    rd.options = %w(-a)
+end
+

data/devenv.lock

@@ -0,0 +1,228 @@
+{
+  "nodes": {
+    "devenv": {
+      "locked": {
+        "dir": "src/modules",
+        "lastModified": 1705399223,
+        "narHash": "sha256-2nhAJ/9LMlwaEZDnoDIhnhQ0pEC/YIIt09WD7FmTp6g=",
+        "owner": "cachix",
+        "repo": "devenv",
+        "rev": "ff37923d4ba9e220b9826594e83fc29e1a4f4338",
+        "type": "github"
+      },
+      "original": {
+        "dir": "src/modules",
+        "owner": "cachix",
+        "repo": "devenv",
+        "type": "github"
+      }
+    },
+    "flake-compat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1696426674,
+        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-compat_2": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1696426674,
+        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1694529238,
+        "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_2": {
+      "inputs": {
+        "systems": "systems_2"
+      },
+      "locked": {
+        "lastModified": 1701680307,
+        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "gitignore": {
+      "inputs": {
+        "nixpkgs": [
+          "pre-commit-hooks",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1703887061,
+        "narHash": "sha256-gGPa9qWNc6eCXT/+Z5/zMkyYOuRZqeFZBDbopNZQkuY=",
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "rev": "43e1aa1308018f37118e34d3a9cb4f5e75dc11d5",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1705331948,
+        "narHash": "sha256-qjQXfvrAT1/RKDFAMdl8Hw3m4tLVvMCc8fMqzJv0pP4=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "b8dd8be3c790215716e7c12b247f45ca525867e2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-23.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-ruby": {
+      "inputs": {
+        "flake-compat": "flake-compat",
+        "flake-utils": "flake-utils",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1705118282,
+        "narHash": "sha256-9FUnVSPjF+xV2a7tfai8fxi9Ek538mdkEjaFJnWRk9Y=",
+        "owner": "bobvanderlinden",
+        "repo": "nixpkgs-ruby",
+        "rev": "1a4b0055af39b2d0756d5a117589b8ccddbce4f8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "bobvanderlinden",
+        "repo": "nixpkgs-ruby",
+        "type": "github"
+      }
+    },
+    "nixpkgs-stable": {
+      "locked": {
+        "lastModified": 1704874635,
+        "narHash": "sha256-YWuCrtsty5vVZvu+7BchAxmcYzTMfolSPP5io8+WYCg=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "3dc440faeee9e889fe2d1b4d25ad0f430d449356",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-23.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "pre-commit-hooks": {
+      "inputs": {
+        "flake-compat": "flake-compat_2",
+        "flake-utils": "flake-utils_2",
+        "gitignore": "gitignore",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "nixpkgs-stable": "nixpkgs-stable"
+      },
+      "locked": {
+        "lastModified": 1705229514,
+        "narHash": "sha256-itILy0zimR/iyUGq5Dgg0fiW8plRDyxF153LWGsg3Cw=",
+        "owner": "cachix",
+        "repo": "pre-commit-hooks.nix",
+        "rev": "ffa9a5b90b0acfaa03b1533b83eaf5dead819a05",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "repo": "pre-commit-hooks.nix",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "devenv": "devenv",
+        "nixpkgs": "nixpkgs",
+        "nixpkgs-ruby": "nixpkgs-ruby",
+        "pre-commit-hooks": "pre-commit-hooks"
+      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "systems_2": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}