gda 1.0.2 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 24187edab9ea611cc70441c2cd71e6ebf45b1e35
-  data.tar.gz: ea34f33ca8d22358c1f9e3649179dfcfc403cabe
+SHA256:
+  metadata.gz: 552887449432426def5ab031502569f211e5a189202b6f2b548cc0fbd354f9e2
+  data.tar.gz: a590d4fa722c42553e2d95f79a1f825c91cf26ea234f6d2a2a5f44d06a57b9c2
 SHA512:
-  metadata.gz: fdbad785a72ccd235f8b0cf214b776db7d3c7f0db20a7561fd02163a520c055858323994944f68fc714e535a1866400c0fd256581ed6f91c0b665521a86d918f
-  data.tar.gz: 21f5de0090fdf3d28415f144eadf936a9021145c12de5f7cd29a6bb14b5aef3d1204eb9ca03bc3adea973a90c24ee52dc35e580d641004487a4f8389f168f961
+  metadata.gz: d392a3794b75a506bb2fd541cb0406ea23135d436f346be56d9974457abd06f7045b3bf6623798045fdc69e4424f9a1cd83eb8a1f065fa3a2a74726ef577379b
+  data.tar.gz: 7d2e04c3b9a1d0b3ecb311b68545870c51b048509133ed592da314528703a2b7e1ed0e3127e6661199ce2c35712e4c80beacd5e0cc722b2e5e05acba115f8b74

data/{README.rdoc → README.md}

@@ -34,7 +34,7 @@ parser.
 
 (The MIT License)
 
-Copyright (c) 2012-2013 Aaron Patterson
+Copyright (c) 2012-2016 Aaron Patterson
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/ext/gda/extconf.rb

@@ -2,7 +2,7 @@ require 'mkmf'
 
 # :stopdoc:
 
-ENV['PKG_CONFIG_PATH'] ||= '/usr/local/Library/ENV/pkgconfig/10.8'
+ENV['PKG_CONFIG_PATH'] ||= '/usr/local/lib/pkgconfig'
 
 dir_config 'libgda'
 

data/ext/gda/gda_nodes.c

@@ -23,6 +23,7 @@ VALUE cSavepoint;
 VALUE cBegin;
 VALUE cRollback;
 VALUE cCommit;
+VALUE cCompound;
 
 #define WrapInteger(klass, type, lname) \
     static VALUE rb_##klass##_##lname(VALUE self) \
@@ -146,6 +147,8 @@ WrapNode(cJoin, GdaSqlSelectJoin, expr);
 WrapList(cJoin, GdaSqlSelectJoin, use);
 WrapInteger(cJoin, GdaSqlSelectJoin, position);
 
+WrapInteger(cCompound, GdaSqlStatementCompound, compound_type);
+
 WrapList(cUnknown, GdaSqlStatementUnknown, expressions);
 
 static VALUE distinct_p(VALUE self)
@@ -236,12 +239,36 @@ VALUE WrapAnyPart(VALUE stmt, GdaSqlAnyPart *part)
 	case GDA_SQL_ANY_SQL_SELECT_JOIN:
 	    return Wrap(stmt, cJoin, part);
 	    break;
+    case GDA_SQL_ANY_STMT_COMPOUND:
+	    return Wrap(stmt, cCompound, part);
+	    break;
 	default:
 	    rb_raise(rb_eRuntimeError, "unknown node type: %d\n", part->type);
 	    return Qnil;
     }
 }
 
+
+static VALUE rb_cCompound_stmt_list(VALUE self)
+{
+    GdaSqlStatementCompound * st;
+    GSList * list;
+    VALUE array;
+    VALUE stmt;
+
+    Data_Get_Struct(self, GdaSqlStatementCompound, st);
+    stmt = rb_iv_get(self, "stmt");
+    array = rb_ary_new();
+
+    for (list = st->stmt_list; list; list = list->next) {
+      GdaSqlStatement *sqlst = (GdaSqlStatement*) list->data;
+      VALUE obj = Wrap(stmt, cSelect, GDA_SQL_ANY_PART(sqlst->contents));
+      rb_ary_push(array, obj);
+    }
+    return array;
+}
+
+
 static VALUE rb_cInsert_values_list(VALUE self)
 {
     GdaSqlStatementInsert * st;
@@ -392,6 +419,7 @@ void Init_gda_nodes()
     mNodes = rb_define_module_under(mGDA, "Nodes");
 
     cNode = rb_define_class_under(mNodes, "Node", rb_cObject);
+    rb_undef_alloc_func(cNode);
 
     cSelect = rb_define_class_under(mNodes, "Select", cNode);
     rb_define_method(cSelect, "distinct?", distinct_p, 0);
@@ -477,6 +505,10 @@ void Init_gda_nodes()
     cField = rb_define_class_under(mNodes, "Field", cNode);
     WrapperMethod(cField, field_name);
 
+    cCompound = rb_define_class_under(mNodes, "Compound", cNode);
+    WrapperMethod(cCompound, compound_type);
+    WrapperMethod(cCompound, stmt_list);
+
     cBegin = rb_define_class_under(mNodes, "Begin", cNode);
     cRollback = rb_define_class_under(mNodes, "Rollback", cNode);
     cCommit = rb_define_class_under(mNodes, "Commit", cNode);

data/ext/gda/gda_provider.c

@@ -7,7 +7,7 @@ static VALUE name(VALUE self)
     GdaServerProvider * pr;
     Data_Get_Struct(self, GdaServerProvider, pr);
 
-    return rb_tainted_str_new2(gda_server_provider_get_name(pr));
+    return rb_str_new2(gda_server_provider_get_name(pr));
 }
 
 static VALUE find(VALUE klass, VALUE string)
@@ -52,6 +52,7 @@ static VALUE quote_str(VALUE self, VALUE str)
 void Init_gda_provider()
 {
     cProvider = rb_define_class_under(mSQL, "Provider", rb_cObject);
+    rb_undef_alloc_func(cProvider);
     rb_define_singleton_method(cProvider, "find", find, 1);
     rb_define_method(cProvider, "name", name, 0);
     rb_define_method(cProvider, "parser", parser, 0);

data/ext/gda/gda_statement.c

@@ -49,6 +49,9 @@ void Init_gda_statement()
     cStatement = rb_define_class_under(mSQL, "Statement", rb_cObject);
     cStructure = rb_define_class_under(mSQL, "Structure", rb_cObject);
 
+    rb_undef_alloc_func(cStatement);
+    rb_undef_alloc_func(cStructure);
+
     rb_define_method(cStatement, "serialize", serialize, 0);
     rb_define_method(cStatement, "structure", structure, 0);
     rb_define_method(cStructure, "ast", ast, 0);

data/lib/gda/version.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+module GDA
+  VERSION = '1.1.2'
+end

data/lib/gda/visitors/visitor.rb

@@ -94,6 +94,10 @@ module GDA
         visit node.expressions
       end
 
+      def visit_GDA_Nodes_Compound node
+        visit node.stmt_list
+      end
+
       ## Terminal nodes
       def visit_GDA_Nodes_Table node
       end

data/lib/gda.rb

@@ -1,11 +1,9 @@
-require 'gda.so'
+require 'gda/gda'
 require 'gda/visitors/each'
 require 'gda/visitors/dot'
 require 'gda/visitors/max_depth'
 
 module GDA
-  VERSION = '1.0.2'
-
   module SQL
     class Statement
       def ast

metadata

@@ -1,85 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: gda
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.2
 platform: ruby
 authors:
 - Aaron Patterson
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-12-09 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.8'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.8'
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: rake-compiler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.1
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: hoe
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.14'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.14'
+date: 2019-03-20 00:00:00.000000000 Z
+dependencies: []
 description: |-
   An SQL parser. Wraps libgda in a loving embrace to give you a ruby level SQL
   parser.
@@ -91,13 +21,10 @@ extensions:
 extra_rdoc_files:
 - CHANGELOG.rdoc
 - Manifest.txt
-- README.rdoc
 files:
-- ".autotest"
 - CHANGELOG.rdoc
 - Manifest.txt
-- README.rdoc
-- Rakefile
+- README.md
 - ext/gda/extconf.rb
 - ext/gda/gda.c
 - ext/gda/gda.h
@@ -108,23 +35,16 @@ files:
 - ext/gda/gda_statement.c
 - ext/gda/gda_statement.h
 - lib/gda.rb
+- lib/gda/version.rb
 - lib/gda/visitors/dot.rb
 - lib/gda/visitors/each.rb
 - lib/gda/visitors/max_depth.rb
 - lib/gda/visitors/visitor.rb
-- test/helper.rb
-- test/sqllog.sqlite3
-- test/test_dot_visitor.rb
-- test/test_gda.rb
-- test/test_max_depth.rb
-- test/test_node_attributes.rb
-- test/test_nodes.rb
-- test/test_statement.rb
 homepage: http://github.com/tenderlove/gda
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--main"
 - README.rdoc
@@ -134,16 +54,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
-signing_key: 
+rubygems_version: 3.4.0.dev
+signing_key:
 specification_version: 4
 summary: An SQL parser
 test_files: []

data/.autotest

@@ -1,12 +0,0 @@
-require "autotest/restart"
-require 'rbconfig'
-
-Autotest.add_hook :initialize do |at|
-  at.find_directories = ARGV unless ARGV.empty?
-  at.testlib = "minitest/autorun"
-end
-
-Autotest.add_hook :run_command do |at|
-  at.unit_diff = 'cat'
-  system "ruby -S rake compile"
-end

data/Rakefile

@@ -1,34 +0,0 @@
-# -*- ruby -*-
-
-require 'rubygems'
-require 'hoe'
-
-Hoe.plugins.delete :rubyforge
-Hoe.plugin :minitest
-Hoe.plugin :gemspec # `gem install hoe-gemspec`
-Hoe.plugin :git     # `gem install hoe-git`
-
-Hoe.spec 'gda' do
-  developer('Aaron Patterson', 'tenderlove@ruby-lang.org')
-  self.readme_file   = 'README.rdoc'
-  self.history_file  = 'CHANGELOG.rdoc'
-  self.extra_rdoc_files  = FileList['*.rdoc']
-
-  extra_dev_deps << ['rake-compiler', '>= 0.4.1']
-  extra_dev_deps << ['sqlite3']
-
-  self.spec_extras = {
-    :extensions            => ["ext/gda/extconf.rb"],
-    :required_ruby_version => '>= 1.9.3'
-  }
-
-  require "rake/extensiontask"
-
-  Rake::ExtensionTask.new "gda", spec do |ext|
-    ext.lib_dir = File.join(*['lib', ENV['FAT_DIR']].compact)
-  end
-end
-
-task :test => :compile
-
-# vim: syntax=ruby

data/test/helper.rb

@@ -1,17 +0,0 @@
-require 'minitest/autorun'
-require 'gda'
-require 'sqlite3'
-
-module GDA
-  class TestCase < MiniTest::Unit::TestCase
-    @@rails_sql = nil
-
-    def self.rails_sql
-      return @@rails_sql if @@rails_sql
-
-      db_file = File.join File.dirname(__FILE__), 'sqllog.sqlite3'
-      db      = SQLite3::Database.new db_file
-      @@rails_sql = db.execute('SELECT * FROM sqllog').map(&:first)
-    end
-  end
-end

data/test/test_dot_visitor.rb

@@ -1,43 +0,0 @@
-require 'helper'
-
-module GDA
-  class TestDotVisitor < TestCase
-    attr_reader :parser
-
-    class TestViz < Visitors::Dot
-      def initialize tc
-        super()
-        @tc = tc
-      end
-
-      Visitors::Visitor.private_instance_methods.grep(/^visit_(.*)/) do |method|
-        next if superclass.private_instance_methods(false).include?(method)
-
-        klass = $1.split('_').inject(Object) { |k,c| k.const_get c }
-
-        define_method(method) do |node|
-          flunk "#{klass} (#{method}) not tested yet"
-        end
-      end
-
-      def method_missing m, *args
-        return super unless @tc.respond_to?(m)
-
-        @tc.send m, *args
-      end
-    end
-
-    def setup
-      super
-      @parser = GDA::SQL::Parser.new
-      @viz    = TestViz.new(self)
-    end
-
-    rails_sql.uniq.each do |sql|
-      define_method(:"test_#{sql}") do
-        stmt = parser.parse sql
-        @viz.accept stmt.ast
-      end
-    end
-  end
-end

data/test/test_gda.rb

@@ -1,55 +0,0 @@
-require 'helper'
-
-module GDA
-  class TestParser < TestCase
-    attr_reader :parser
-
-    def setup
-      super
-      @parser = GDA::SQL::Parser.new
-    end
-
-    def test_split
-      assert_equal ['test', '"table"'], GDA.sql_identifier_split("test.\"table\"")
-    end
-
-    def test_parses
-      assert parser.parse('SELECT * FROM FOO')
-    end
-
-    def test_providers
-      assert_kind_of Array, GDA::SQL.providers
-      assert_operator GDA::SQL.providers.length, :>, 0
-    end
-
-    def test_get_provider
-      assert GDA::SQL::Provider.find SQL.providers.first
-    end
-
-    def test_provider_name
-      name = SQL.providers.first
-      provider = SQL::Provider.find name
-      assert_equal name, provider.name
-    end
-
-    def test_pg_parser
-      provider = SQL::Provider.find "PostgreSQL"
-      assert provider.parser.parse 'INSERT INTO "accounts" ("credit_limit", "firm_id", "firm_name") VALUES ($1, $2, $3) RETURNING "id"'
-    end
-
-    def test_mysql_parser
-      provider = SQL::Provider.find "MySQL"
-      assert provider.parser.parse 'SELECT topics.* FROM topics WHERE topics.id = 147 LIMIT 1'
-
-    end
-
-    def test_id_quote
-      provider = SQL::Provider.find "MySQL"
-      assert_equal '"1foo"', provider.quote("1foo")
-    end
-
-    def test_error
-      assert_nil SQL::Provider.find "asdfasdfadsf"
-    end
-  end
-end

data/test/test_max_depth.rb

@@ -1,19 +0,0 @@
-require 'helper'
-
-module GDA
-  module Visitors
-    class TestMaxDepth < TestCase
-      attr_reader :parser
-
-      def setup
-        super
-        @parser = GDA::SQL::Parser.new
-      end
-
-      def test_depth
-        stmt = parser.parse('SELECT * FROM FOO')
-        assert_equal 5, stmt.ast.max_depth
-      end
-    end
-  end
-end

data/test/test_node_attributes.rb

@@ -1,159 +0,0 @@
-require 'helper'
-
-module GDA
-  class TestNodeAttributes < TestCase
-    attr_reader :parser
-
-    class AttributeTest < Visitors::Visitor
-      def initialize tc
-        @tc = tc
-      end
-
-      private
-
-      def visit_Array node
-        node.each { |n| accept n }
-      end
-
-      def visit_GDA_Nodes_Select node
-        assert_respond_to node, :distinct?
-        super
-      end
-
-      def visit_GDA_Nodes_Unknown node
-        super
-      end
-
-      def visit_GDA_Nodes_Insert node
-        assert_string node, :on_conflict
-        super
-      end
-
-      def visit_GDA_Nodes_SelectField node
-        [:field_name, :table_name, :as].each do |m|
-          assert_string node, m
-        end
-        super
-      end
-
-      def visit_GDA_Nodes_Expr node
-        assert_string node, :value
-        assert_string node, :cast_as
-        super
-      end
-
-      def visit_GDA_Nodes_Function node
-        assert_string node, :function_name
-        super
-      end
-
-      def visit_GDA_Nodes_From node
-        super
-      end
-
-      def visit_GDA_Nodes_Table node
-        assert_string node, :table_name
-        super
-      end
-
-      def visit_GDA_Nodes_Update node
-        assert_string node, :on_conflict
-        super
-      end
-
-      def visit_GDA_Nodes_Operation node
-        assert_string node, :operator
-        super
-      end
-
-      def visit_GDA_Nodes_Delete node
-        super
-      end
-
-      def visit_GDA_Nodes_Order node
-        assert_boolean node, :asc
-        assert_string node, :collation_name
-        super
-      end
-
-      def visit_GDA_Nodes_RollbackSavepoint node
-        assert_string node, :__type__
-        assert_string node, :isolation_level
-        assert_string node, :trans_mode
-        assert_string node, :trans_name
-        super
-      end
-
-      alias :visit_GDA_Nodes_Begin           :visit_GDA_Nodes_RollbackSavepoint
-      alias :visit_GDA_Nodes_Savepoint       :visit_GDA_Nodes_RollbackSavepoint
-      alias :visit_GDA_Nodes_DeleteSavepoint :visit_GDA_Nodes_RollbackSavepoint
-      alias :visit_GDA_Nodes_Commit          :visit_GDA_Nodes_RollbackSavepoint
-      alias :visit_GDA_Nodes_Rollback        :visit_GDA_Nodes_RollbackSavepoint
-
-      def visit_GDA_Nodes_Field node
-        assert_string node, :field_name
-        super
-      end
-
-      def visit_GDA_Nodes_Join node
-        assert_string node, :join_type
-        assert_int node, :position
-        super
-      end
-
-      def visit_GDA_Nodes_Target node
-        assert_string node, :table_name
-        assert_string node, :as
-        super
-      end
-
-      def assert_boolean node, m
-        assert_respond_to node, m
-        if node.send(m)
-          assert_equal(true, node.send(m))
-        else
-          assert_equal(false, node.send(m))
-        end
-      end
-
-      def assert_string node, m
-        assert_respond_to node, m
-        assert_kind_of(String, node.send(m)) if node.send(m)
-      end
-
-      def assert_int node, m
-        assert_respond_to node, m
-        assert_kind_of(Numeric, node.send(m)) if node.send(m)
-      end
-
-      Visitors::Visitor.private_instance_methods.grep(/^visit_(.*)/) do |method|
-        next if private_instance_methods(false).include?(method)
-
-        klass = $1.split('_').inject(Object) { |k,c| k.const_get c }
-
-        define_method(method) do |node|
-          flunk "#{klass} (#{method}) not tested yet"
-        end
-      end
-
-      def method_missing m, *args
-        return super unless @tc.respond_to?(m)
-
-        @tc.send m, *args
-      end
-    end
-
-    def setup
-      super
-      @parser      = GDA::SQL::Parser.new
-      @attr_tester = AttributeTest.new(self)
-    end
-
-    rails_sql.uniq.each do |sql|
-      define_method(:"test_#{sql}") do
-        stmt = parser.parse sql
-        @attr_tester.accept stmt.ast
-      end
-    end
-  end
-end

data/test/test_nodes.rb

@@ -1,26 +0,0 @@
-require 'helper'
-
-module GDA
-  class TestNodes < TestCase
-    attr_reader :parser
-
-    def setup
-      super
-      @parser = GDA::SQL::Parser.new
-    end
-
-    rails_sql.uniq.each do |sql|
-      define_method(:"test_#{sql}") do
-        stmt = parser.parse sql
-        stmt.ast.each do |node|
-          assert node
-        end
-      end
-    end
-
-    def test_depth
-      stmt = parser.parse 'SELECT * FROM OMG WHERE 1 = 10'
-      assert_operator stmt.ast.to_a.length, :>, 1
-    end
-  end
-end

data/test/test_statement.rb

@@ -1,79 +0,0 @@
-require 'helper'
-
-module GDA
-  module SQL
-    class TestStatement < TestCase
-      attr_reader :parser, :stmt
-
-      def setup
-        super
-        @parser = GDA::SQL::Parser.new
-        @stmt = parser.parse 'SELECT * FROM FOO WHERE 1 = 1 GROUP BY omg HAVING omg(id) < 2 ORDER BY foo, bar LIMIT 50 OFFSET 2'
-      end
-
-      def test_serialize
-        assert stmt.serialize
-      end
-
-      def test_from
-        assert stmt.ast
-        assert stmt.ast.from
-      end
-
-      def test_distinct_expr
-        assert_nil stmt.ast.distinct_expr
-      end
-
-      def test_expr_list
-        assert_equal 1, stmt.ast.expr_list.length
-
-        stmt.ast.expr_list.each do |node|
-          assert node
-        end
-      end
-
-      def test_where_cond
-        assert stmt.ast.where_cond
-      end
-
-      def test_group_by
-        assert stmt.ast.group_by
-        stmt.ast.group_by.each do |node|
-          assert node
-        end
-      end
-
-      def test_having_cond
-        assert stmt.ast.having_cond
-      end
-
-      def test_order_by
-        assert_equal 2, stmt.ast.order_by.length
-        stmt.ast.order_by.each do |node|
-          assert node
-        end
-      end
-
-      def test_limit_count
-        assert stmt.ast.limit_count
-      end
-
-      def test_limit_offset
-        assert stmt.ast.limit_offset
-      end
-
-      def test_distinct?
-        refute stmt.ast.distinct?
-      end
-
-      def test_each
-        yielded = false
-        stmt.ast.each do |node|
-          yielded = true
-          assert node
-        end
-        assert yielded
-      end
-    end
-  end
-end