sql_tree 0.0.3 → 0.1.0

data/lib/sql_tree/node/assignment.rb

@@ -0,0 +1,22 @@
+module SQLTree::Node
+
+  class Assignment < Base
+    
+    attr_accessor :field, :expression
+    
+    def initialize(field, expression = nil)
+      @field, @expression = field, expression
+    end
+    
+    def to_sql
+      "#{quote_var(field)} = #{expression.to_sql}"
+    end
+    
+    def self.parse(tokens)
+      assignment = self.new(SQLTree::Node::Variable.parse(tokens).name)
+      tokens.consume(SQLTree::Token::EQ)
+      assignment.expression = SQLTree::Node::Expression.parse(tokens)
+      assignment
+    end
+  end
+end

data/lib/sql_tree/node/delete_query.rb

@@ -0,0 +1,28 @@
+module SQLTree::Node
+
+  class DeleteQuery < Base
+
+    attr_accessor :table, :where
+
+    def initialize(table, where = nil)
+      @table, @where = table, where
+    end
+
+    def to_sql
+      sql = "DELETE FROM #{self.quote_var(table)}"
+      sql << " WHERE #{where.to_sql}" if self.where
+      sql
+    end
+    
+    def self.parse(tokens)
+      tokens.consume(SQLTree::Token::DELETE)
+      tokens.consume(SQLTree::Token::FROM)
+      delete_query = self.new(SQLTree::Node::Variable.parse(tokens).name)
+      if tokens.peek == SQLTree::Token::WHERE
+        tokens.consume(SQLTree::Token::WHERE)
+        delete_query.where = SQLTree::Node::Expression.parse(tokens)
+      end
+      return delete_query
+    end
+  end
+end

data/lib/sql_tree/node/insert_query.rb

@@ -0,0 +1,51 @@
+module SQLTree::Node
+
+  class InsertQuery < Base
+
+    attr_accessor :table, :fields, :values
+
+    def initialize(table, fields = nil, values = [])
+      @table, @fields, @values  = table, fields, values
+    end
+
+    def to_sql
+      sql = "INSERT INTO #{self.quote_var(table)} "
+      sql << '(' + fields.map { |f| f.to_sql }.join(', ') + ') ' if fields
+      sql << 'VALUES (' + values.map { |v| v.to_sql }.join(', ') + ')'
+      sql
+    end
+    
+    def self.parse_field_list(tokens)
+      tokens.consume(SQLTree::Token::LPAREN)
+      fields = [SQLTree::Node::Variable.parse(tokens)]
+      while tokens.peek == SQLTree::Token::COMMA
+        tokens.consume(SQLTree::Token::COMMA)
+        fields << SQLTree::Node::Variable.parse(tokens)
+      end
+      tokens.consume(SQLTree::Token::RPAREN)
+      return fields
+    end
+    
+    def self.parse_value_list(tokens)
+      tokens.consume(SQLTree::Token::VALUES)
+      tokens.consume(SQLTree::Token::LPAREN)
+      values = [SQLTree::Node::Expression.parse(tokens)]
+      while tokens.peek == SQLTree::Token::COMMA
+        tokens.consume(SQLTree::Token::COMMA)
+        values << SQLTree::Node::Expression.parse(tokens)
+      end
+      tokens.consume(SQLTree::Token::RPAREN)
+      return values
+    end
+    
+    def self.parse(tokens)
+      tokens.consume(SQLTree::Token::INSERT)
+      tokens.consume(SQLTree::Token::INTO)
+      insert_query = self.new(SQLTree::Node::Variable.parse(tokens).name)
+
+      insert_query.fields = self.parse_field_list(tokens) if tokens.peek == SQLTree::Token::LPAREN
+      insert_query.values = self.parse_value_list(tokens)
+      return insert_query
+    end
+  end
+end

data/lib/sql_tree/node/select_query.rb

@@ -13,7 +13,7 @@ module SQLTree::Node
       raise "At least one SELECT expression is required" if self.select.empty?
       sql = (self.distinct) ? "SELECT DISTINCT " : "SELECT "
       sql << select.map { |s| s.to_sql }.join(', ')
-      sql << " FROM "     << from.map { |f| f.to_sql }.join(', ')
+      sql << " FROM "     << from.map { |f| f.to_sql }.join(', ') if from
       sql << " WHERE "    << where.to_sql if where
       sql << " GROUP BY " << group_by.map { |g| g.to_sql }.join(', ') if group_by
       sql << " ORDER BY " << order_by.map { |o| o.to_sql }.join(', ') if order_by

data/lib/sql_tree/node/update_query.rb

@@ -0,0 +1,36 @@
+module SQLTree::Node
+
+  class UpdateQuery < Base
+    
+    attr_accessor :table, :updates, :where
+    
+    def initialize(table, updates = [], where = nil)
+      @table, @updates, @where = table, updates, where
+    end
+    
+    def to_sql
+      sql = "UPDATE #{self.quote_var(table)} SET "
+      sql << updates.map { |u| u.to_sql }.join(', ')
+      sql << " WHERE " << where.to_sql if self.where
+      sql
+    end
+    
+    def self.parse(tokens)
+      tokens.consume(SQLTree::Token::UPDATE)
+      update_query = self.new(SQLTree::Node::Variable.parse(tokens).name)
+      tokens.consume(SQLTree::Token::SET)
+      update_query.updates = [SQLTree::Node::Assignment.parse(tokens)]
+      while tokens.peek == SQLTree::Token::COMMA
+        tokens.consume(SQLTree::Token::COMMA)
+        update_query.updates << SQLTree::Node::Assignment.parse(tokens)
+      end
+      
+      if tokens.peek == SQLTree::Token::WHERE
+        tokens.consume(SQLTree::Token::WHERE)
+        update_query.where = SQLTree::Node::Expression.parse(tokens)
+      end
+      
+      update_query
+    end
+  end
+end

data/lib/sql_tree/node/variable.rb

@@ -13,7 +13,7 @@ module SQLTree::Node
     end
 
     def ==(other)
-      other.name == self.name
+      other.class == self.class && other.name == self.name
     end
 
     def self.parse(tokens)

data/lib/sql_tree/parser.rb

@@ -57,6 +57,9 @@ class SQLTree::Parser
   def parse!
     case self.peek
     when SQLTree::Token::SELECT then SQLTree::Node::SelectQuery.parse(self)
+    when SQLTree::Token::INSERT then SQLTree::Node::InsertQuery.parse(self)
+    when SQLTree::Token::DELETE then SQLTree::Node::DeleteQuery.parse(self)
+    when SQLTree::Token::UPDATE then SQLTree::Node::UpdateQuery.parse(self)
     else raise UnexpectedToken.new(self.peek)
     end
   end

data/lib/sql_tree/token.rb

@@ -112,7 +112,7 @@ class SQLTree::Token
 
   # A list of all the SQL reserverd keywords.
   KEYWORDS = %w{SELECT FROM WHERE GROUP HAVING ORDER DISTINCT LEFT RIGHT INNER FULL OUTER NATURAL JOIN USING
-                AND OR NOT AS ON IS NULL BY LIKE ILIKE BETWEEN IN ASC DESC}
+                AND OR NOT AS ON IS NULL BY LIKE ILIKE BETWEEN IN ASC DESC INSERT INTO VALUES DELETE UPDATE SET}
 
   # Create a token for all the reserved keywords in SQL
   KEYWORDS.each { |kw| const_set(kw, Class.new(SQLTree::Token::Keyword).new(kw)) }

data/spec/integration/{full_queries_spec.rb → parse_and_generate_spec.rb}

@@ -2,6 +2,10 @@ require "#{File.dirname(__FILE__)}/../spec_helper"
 
 describe SQLTree, 'parsing and generating SQL' do
 
+  it "should parse an generate q query without FROM" do
+    SQLTree['SELECT 1'].to_sql.should == 'SELECT 1'
+  end
+
   it "should parse and generate SQL fo a simple list query" do
     SQLTree["SELECT * FROM table"].to_sql.should == 'SELECT * FROM "table"'
   end
@@ -38,4 +42,34 @@ describe SQLTree, 'parsing and generating SQL' do
     SQLTree['SELECT SUM( field1 ) FROM  t  GROUP BY  field1,  MD5( field2 ) HAVING  SUM( field1 ) > 10'].to_sql.should ==
             'SELECT SUM("field1") FROM "t" GROUP BY "field1", MD5("field2") HAVING (SUM("field1") > 10)'
   end
+  
+  it "should parse and generate an INSERT query with field list" do
+    SQLTree['INSERT INTO  table  ( field1,   field2)  VALUES (1, 2)'].to_sql.should ==
+            'INSERT INTO "table" ("field1", "field2") VALUES (1, 2)'
+  end
+
+  it "should parse and generate an INSERT query without field list" do
+    SQLTree['INSERT INTO  table  VALUES (1, 2)'].to_sql.should ==
+            'INSERT INTO "table" VALUES (1, 2)'
+  end
+  
+  it "should parse and generate an DELETE query without WHERE clause" do
+    SQLTree['DELETE FROM  table'].to_sql.should ==
+            'DELETE FROM "table"'
+  end
+  
+  it "should parse and generate an DELETE query with WHERE clause" do
+    SQLTree['DELETE FROM  table  WHERE  1 = 1'].to_sql.should ==
+            'DELETE FROM "table" WHERE (1 = 1)'
+  end
+  
+  it "should parse and generate an UPDATE query without WHERE clause" do
+    SQLTree['UPDATE  table  SET  field1  = 1,  field2  = 2'].to_sql.should ==
+            'UPDATE "table" SET "field1" = 1, "field2" = 2'
+  end
+
+  it "should parse and generate an UPDATE query with WHERE clause" do
+    SQLTree['UPDATE  table  SET  field1  = 123 WHERE   id  = 17'].to_sql.should ==
+            'UPDATE "table" SET "field1" = 123 WHERE ("id" = 17)'
+  end
 end

data/spec/unit/delete_query_spec.rb

@@ -0,0 +1,16 @@
+require "#{File.dirname(__FILE__)}/../spec_helper"
+
+describe SQLTree::Node::DeleteQuery do
+
+  it "should parse a delete query without WHERE clause correctly" do
+    delete = SQLTree::Node::DeleteQuery["DELETE FROM table"]
+    delete.table.should == 'table'
+    delete.where.should be_nil
+  end
+
+  it "should parse a delete query without WHERE clause correctly" do
+    delete = SQLTree::Node::DeleteQuery["DELETE FROM table WHERE 1 = 1"]
+    delete.table.should == 'table'
+    delete.where.should be_kind_of(SQLTree::Node::Expression)
+  end
+end

data/spec/unit/insert_query_spec.rb

@@ -0,0 +1,24 @@
+require "#{File.dirname(__FILE__)}/../spec_helper"
+
+describe SQLTree::Node::InsertQuery do
+  
+  it "should parse an insert query without field list correctly" do
+    insert = SQLTree::Node::InsertQuery["INSERT INTO table VALUES (1, 'two', 3+4, MD5('$ecret'))"]
+    insert.table.should == 'table'
+    insert.fields.should be_nil
+    insert.values.should have(4).items
+    insert.values[0].should == SQLTree::Node::Value.new(1)
+    insert.values[1].should == SQLTree::Node::Value.new('two')
+    insert.values[2].should be_kind_of(SQLTree::Node::ArithmeticExpression)
+    insert.values[3].should be_kind_of(SQLTree::Node::FunctionExpression)
+  end
+  
+  it "should parse an insert query with field list" do
+    insert = SQLTree::Node::InsertQuery['INSERT INTO table ("field1", "field2") VALUES (1, 2)']
+    insert.table.should == 'table'
+    insert.fields.should have(2).items
+    insert.fields[0].should == SQLTree::Node::Variable.new('field1')
+    insert.fields[1].should == SQLTree::Node::Variable.new('field2')
+    insert.values.should have(2).items
+  end
+end

data/spec/unit/select_query_spec.rb

@@ -1,5 +1,29 @@
 require "#{File.dirname(__FILE__)}/../spec_helper"
 
+describe SQLTree::Node::SelectQuery do
+  
+  it "should parse a query without FROM, WHERE, ORDER, GROUP or HAVING clause" do
+    tree = SQLTree::Node::SelectQuery['SELECT 1']
+    tree.select.first.expression.value.should == 1
+    tree.from.should     be_nil
+    tree.where.should    be_nil
+    tree.group_by.should be_nil
+    tree.having.should   be_nil
+    tree.order_by.should be_nil
+  end
+  
+  it "should parse a query with all clauses" do
+    tree = SQLTree::Node::SelectQuery['SELECT 1 AS static, field FROM table1 AS t1, table2 LEFT JOIN table3 t3 ON (t1.id = t2.id)
+              WHERE t1.field = 1234 GROUP BY t2.group_field HAVING SUM(t2.group_field) > 100 ORDER BY t.timestamp DESC']
+
+    tree.select.length.should == 2
+    tree.from.length.should   == 2
+    tree.where.should be_kind_of(SQLTree::Node::ComparisonExpression)
+    tree.group_by.first.should be_kind_of(SQLTree::Node::Field)
+    tree.having.should be_kind_of(SQLTree::Node::ComparisonExpression)
+  end
+end
+
 describe SQLTree::Node::Source do
 
   it "should parse the table name correctly" do

data/spec/unit/update_query_spec.rb

@@ -0,0 +1,22 @@
+require "#{File.dirname(__FILE__)}/../spec_helper"
+
+describe SQLTree::Node::UpdateQuery do
+
+  it "should parse a delete query without WHERE clause correctly" do
+    update = SQLTree::Node::UpdateQuery["UPDATE table SET field1 = 1, field2 = 5 - 3"]
+    update.table.should == 'table'
+    update.updates.should have(2).items
+    update.updates[0].field.should == 'field1'
+    update.updates[0].expression.should == SQLTree::Node::Value.new(1)
+    update.updates[1].field.should == 'field2'
+    update.updates[1].expression.should be_kind_of(SQLTree::Node::ArithmeticExpression)
+    update.where.should be_nil
+  end
+
+  it "should parse a delete query without WHERE clause correctly" do
+    update = SQLTree::Node::UpdateQuery["UPDATE table SET field = 1 WHERE id = 17"]
+    update.table.should == 'table'
+    update.updates.should have(1).item
+    update.where.should be_kind_of(SQLTree::Node::Expression)
+  end
+end

data/sql_tree.gemspec

@@ -3,7 +3,7 @@ Gem::Specification.new do |s|
 
   # Do not modify the version and date values by hand, because this will
   # automatically by them gem release script.
-  s.version = "0.0.3"
+  s.version = "0.1.0"
   s.date    = "2009-10-09"
 
   s.summary = "A pure Ruby library to represent SQL queries with a syntax tree for inspection and modification."
@@ -22,6 +22,6 @@ Gem::Specification.new do |s|
 
   # Do not modify the files and test_files values by hand, because this will
   # automatically by them gem release script.
-  s.files = %w(spec/unit/select_query_spec.rb spec/spec_helper.rb lib/sql_tree/tokenizer.rb lib/sql_tree/node/variable.rb lib/sql_tree/node/join.rb .gitignore lib/sql_tree/node/ordering.rb LICENSE spec/lib/matchers.rb spec/integration/full_queries_spec.rb lib/sql_tree/parser.rb sql_tree.gemspec spec/unit/tokenizer_spec.rb spec/unit/expression_node_spec.rb lib/sql_tree/node/select_expression.rb spec/unit/leaf_node_spec.rb lib/sql_tree/token.rb lib/sql_tree/node/table_reference.rb lib/sql_tree/node/source.rb lib/sql_tree/node/field.rb Rakefile tasks/github-gem.rake lib/sql_tree/node/select_query.rb lib/sql_tree/node.rb README.rdoc spec/integration/api_spec.rb lib/sql_tree/node/value.rb lib/sql_tree/node/expression.rb lib/sql_tree.rb)
-  s.test_files = %w(spec/unit/select_query_spec.rb spec/integration/full_queries_spec.rb spec/unit/tokenizer_spec.rb spec/unit/expression_node_spec.rb spec/unit/leaf_node_spec.rb spec/integration/api_spec.rb)
+  s.files = %w(spec/unit/select_query_spec.rb spec/unit/insert_query_spec.rb spec/spec_helper.rb lib/sql_tree/tokenizer.rb lib/sql_tree/node/variable.rb lib/sql_tree/node/join.rb .gitignore lib/sql_tree/node/ordering.rb LICENSE spec/lib/matchers.rb lib/sql_tree/parser.rb sql_tree.gemspec spec/unit/tokenizer_spec.rb spec/unit/expression_node_spec.rb spec/unit/delete_query_spec.rb lib/sql_tree/node/select_expression.rb lib/sql_tree/node/assignment.rb spec/unit/leaf_node_spec.rb lib/sql_tree/token.rb lib/sql_tree/node/table_reference.rb lib/sql_tree/node/source.rb lib/sql_tree/node/insert_query.rb lib/sql_tree/node/field.rb Rakefile tasks/github-gem.rake spec/unit/update_query_spec.rb spec/integration/parse_and_generate_spec.rb lib/sql_tree/node/select_query.rb lib/sql_tree/node.rb README.rdoc spec/integration/api_spec.rb lib/sql_tree/node/value.rb lib/sql_tree/node/expression.rb lib/sql_tree/node/delete_query.rb lib/sql_tree.rb lib/sql_tree/node/update_query.rb)
+  s.test_files = %w(spec/unit/select_query_spec.rb spec/unit/insert_query_spec.rb spec/unit/tokenizer_spec.rb spec/unit/expression_node_spec.rb spec/unit/delete_query_spec.rb spec/unit/leaf_node_spec.rb spec/unit/update_query_spec.rb spec/integration/parse_and_generate_spec.rb spec/integration/api_spec.rb)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sql_tree
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors: 
 - Willem van Bergen
@@ -23,6 +23,7 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - spec/unit/select_query_spec.rb
+- spec/unit/insert_query_spec.rb
 - spec/spec_helper.rb
 - lib/sql_tree/tokenizer.rb
 - lib/sql_tree/node/variable.rb
@@ -31,26 +32,32 @@ files:
 - lib/sql_tree/node/ordering.rb
 - LICENSE
 - spec/lib/matchers.rb
-- spec/integration/full_queries_spec.rb
 - lib/sql_tree/parser.rb
 - sql_tree.gemspec
 - spec/unit/tokenizer_spec.rb
 - spec/unit/expression_node_spec.rb
+- spec/unit/delete_query_spec.rb
 - lib/sql_tree/node/select_expression.rb
+- lib/sql_tree/node/assignment.rb
 - spec/unit/leaf_node_spec.rb
 - lib/sql_tree/token.rb
 - lib/sql_tree/node/table_reference.rb
 - lib/sql_tree/node/source.rb
+- lib/sql_tree/node/insert_query.rb
 - lib/sql_tree/node/field.rb
 - Rakefile
 - tasks/github-gem.rake
+- spec/unit/update_query_spec.rb
+- spec/integration/parse_and_generate_spec.rb
 - lib/sql_tree/node/select_query.rb
 - lib/sql_tree/node.rb
 - README.rdoc
 - spec/integration/api_spec.rb
 - lib/sql_tree/node/value.rb
 - lib/sql_tree/node/expression.rb
+- lib/sql_tree/node/delete_query.rb
 - lib/sql_tree.rb
+- lib/sql_tree/node/update_query.rb
 has_rdoc: true
 homepage: http://wiki.github.com/wvanbergen/sql_tree
 licenses: []
@@ -86,8 +93,11 @@ specification_version: 3
 summary: A pure Ruby library to represent SQL queries with a syntax tree for inspection and modification.
 test_files: 
 - spec/unit/select_query_spec.rb
-- spec/integration/full_queries_spec.rb
+- spec/unit/insert_query_spec.rb
 - spec/unit/tokenizer_spec.rb
 - spec/unit/expression_node_spec.rb
+- spec/unit/delete_query_spec.rb
 - spec/unit/leaf_node_spec.rb
+- spec/unit/update_query_spec.rb
+- spec/integration/parse_and_generate_spec.rb
 - spec/integration/api_spec.rb