gda 1.0.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 90fd4381e4ad8e36706b5668d06a7aefd38bddb3
-  data.tar.gz: d4decc43386524ae4bb1b5f013b9c8e61284cf7d
+SHA256:
+  metadata.gz: 57c06ead700d0c7f320a74263ce3e5ecfe28015a5489d65d9f3c5faf96647709
+  data.tar.gz: dad5b08bd24a8c61f2294b045a7b5a5c822a048ed94d1c82ebf8b63413c54b6d
 SHA512:
-  metadata.gz: 1a1cff3f1c41b0797b0acfc4432e8bdee15f37dd3a82737f44f30a5b39480450065c8f3d6e52e54dcf8c443023683b1c76910d0ab64cd5d6b6ffb2ff337eb3f6
-  data.tar.gz: a46766066ba0905568447e5d2b0068299cd4693dccc578683b17593cbd5feba30af797c44459786a7fdf6e21d9415a61851aaa6b6700b6ce21d964fb5f80c854
+  metadata.gz: 1d734598fe06db00664019f84b15680499a48e4b54ee7512970009c84cfac4831bba103edf87539f2ae5e20bbbd433a9eeb730d16e0767651fdfa8e6f030612e
+  data.tar.gz: 05f7689feb91287713fad9729d0af8b255ffa12c781892d1f3be5e84524b2853cd8492281d2dfeff8700ed14f78f87e02d60eba5075760439d6eca4bb6c775eb

data/README.rdoc

@@ -7,11 +7,6 @@
 An SQL parser. Wraps libgda in a loving embrace to give you a ruby level SQL
 parser.
 
-== FEATURES/PROBLEMS:
-
-* Not done yet
-* Do not use
-
 == SYNOPSIS:
 
   parser = GDA::SQL::Parser.new
@@ -39,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,12 +2,16 @@ require 'mkmf'
 
 # :stopdoc:
 
-ENV['PKG_CONFIG_PATH']= '/usr/local/Library/ENV/pkgconfig/mountain_lion'
+ENV['PKG_CONFIG_PATH'] ||= '/usr/local/lib/pkgconfig'
 
 dir_config 'libgda'
 
 def asplode missing
-  abort "#{missing} is missing. Try 'brew install libgda'"
+  abort <<-MSG
+#{missing} is missing. Try 'brew install libgda' if you are on OSX and have homebrew installed.
+You can also check https://github.com/GNOME/libgda for more info on how to install
+the dependency.
+MSG
 end
 
 pkg_config 'libgda-5.0'

data/ext/gda/gda.c

@@ -16,7 +16,7 @@ static VALUE parse(VALUE self, VALUE sql)
 {
     GdaSqlParser * parser;
     GdaStatement * stmt;
-    GError * error;
+    GError * error = NULL;
     const gchar * rest;
 
     Data_Get_Struct(self, GdaSqlParser, parser);

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

@@ -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/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

@@ -4,7 +4,7 @@ require 'gda/visitors/dot'
 require 'gda/visitors/max_depth'
 
 module GDA
-  VERSION = '1.0.0'
+  VERSION = '1.1.1'
 
   module SQL
     class Statement

data/test/helper.rb

@@ -3,7 +3,7 @@ require 'gda'
 require 'sqlite3'
 
 module GDA
-  class TestCase < MiniTest::Unit::TestCase
+  class TestCase < Minitest::Test
     @@rails_sql = nil
 
     def self.rails_sql

data/test/test_gda.rb

@@ -34,17 +34,20 @@ module GDA
 
     def test_pg_parser
       provider = SQL::Provider.find "PostgreSQL"
+      skip "don't have PG provider" unless provider
       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"
+      skip "don't have MySQL provider" unless provider
       assert provider.parser.parse 'SELECT topics.* FROM topics WHERE topics.id = 147 LIMIT 1'
 
     end
 
     def test_id_quote
       provider = SQL::Provider.find "MySQL"
+      skip "don't have MySQL provider" unless provider
       assert_equal '"1foo"', provider.quote("1foo")
     end
 

data/test/test_nodes.rb

@@ -22,5 +22,10 @@ module GDA
       stmt = parser.parse 'SELECT * FROM OMG WHERE 1 = 10'
       assert_operator stmt.ast.to_a.length, :>, 1
     end
+
+    def test_not_equal_operator
+      stmt = parser.parse 'SELECT id FROM comments WHERE issue_id = 1 AND type <> 3'
+      assert stmt.ast.is_a?(GDA::Nodes::Select)
+    end
   end
 end

data/test/test_statement.rb

@@ -2,6 +2,39 @@ require 'helper'
 
 module GDA
   module SQL
+    class TestUnion < TestCase
+      attr_reader :parser, :stmt
+
+      def setup
+        @parser = GDA::SQL::Parser.new
+        sql = <<-SQL.gsub(/^ */, "")
+            SELECT id FROM posts WHERE actor_id = 1 AND actor_type = 1
+            UNION
+            SELECT id FROM posts WHERE actor_id = 1 AND actor_type = 3
+          SQL
+
+        @stmt = parser.parse(sql)
+      end
+
+      def test_union_query
+        assert_equal 2, stmt.ast.stmt_list.count
+        assert_equal 0, stmt.ast.compound_type, "should be an UNION type"
+      end
+
+      def test_union_query_visitor
+        visitor = Class.new(Visitors::Visitor) do
+          attr_reader :selects_count
+          def visit_GDA_Nodes_Select(*)
+            @selects_count ||= 0
+            @selects_count += 1
+          end
+        end.new
+
+        visitor.accept stmt.ast
+        assert_equal 2, visitor.selects_count
+      end
+    end
+
     class TestStatement < TestCase
       attr_reader :parser, :stmt
 

metadata

@@ -1,85 +1,91 @@
 --- !ruby/object:Gem::Specification
 name: gda
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Aaron Patterson
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-03-07 00:00:00.000000000 Z
+date: 2022-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.6'
+        version: '5.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.6'
+        version: '5.14'
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: 0.4.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
-  name: rake-compiler
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.23'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.23'
 description: |-
   An SQL parser. Wraps libgda in a loving embrace to give you a ruby level SQL
   parser.
@@ -93,7 +99,7 @@ extra_rdoc_files:
 - Manifest.txt
 - README.rdoc
 files:
-- .autotest
+- ".autotest"
 - CHANGELOG.rdoc
 - Manifest.txt
 - README.rdoc
@@ -120,36 +126,30 @@ files:
 - test/test_node_attributes.rb
 - test/test_nodes.rb
 - test/test_statement.rb
-- .gemtest
 homepage: http://github.com/tenderlove/gda
-licenses: []
-metadata: {}
-post_install_message: 
+licenses:
+- MIT
+metadata:
+  homepage_uri: http://github.com/tenderlove/gda
+post_install_message:
 rdoc_options:
-- --main
+- "--main"
 - README.rdoc
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: gda
-rubygems_version: 2.0.2
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: An SQL parser
-test_files:
-- 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
+test_files: []