gda 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24187edab9ea611cc70441c2cd71e6ebf45b1e35
-  data.tar.gz: ea34f33ca8d22358c1f9e3649179dfcfc403cabe
+  metadata.gz: 09209a9fa57de499346a00205d6192c1fdc814b2
+  data.tar.gz: e5f046ad0e79ad6cbd379348140455837fe458c9
 SHA512:
-  metadata.gz: fdbad785a72ccd235f8b0cf214b776db7d3c7f0db20a7561fd02163a520c055858323994944f68fc714e535a1866400c0fd256581ed6f91c0b665521a86d918f
-  data.tar.gz: 21f5de0090fdf3d28415f144eadf936a9021145c12de5f7cd29a6bb14b5aef3d1204eb9ca03bc3adea973a90c24ee52dc35e580d641004487a4f8389f168f961
+  metadata.gz: 05f0726618f23cf50ce0e78215401bdfc4729ebb6ee4058e558947ad984b31a6c9fa52717965453c797fdfd2b08a89b3e90244e57a0dd401bb61da4a194d39f5
+  data.tar.gz: 97f55889fb6c30db52176f9ed61d7b8678702f2627f1c87be1f67dee193eb8df4c78813ac0d3ea8d5ad5912a15ce033dcd54a4aeb2f6639ee0d0d1816c30a45b

data/README.rdoc

@@ -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/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;
@@ -477,6 +504,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/lib/gda.rb

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

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/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,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: gda
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Aaron Patterson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-09 00:00:00.000000000 Z
+date: 2016-01-29 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
@@ -142,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.2.5
 signing_key: 
 specification_version: 4
 summary: An SQL parser