Changed QualifiedColumn's initializer to accept a Table node and a Column node.

Author: Dray Lacy

lib/sql/parser.racc

@@ -176,7 +176,7 @@ rule
 
   column_reference
     : qualifier period column_name { result = SQL::Statement::QualifiedColumn.new(val[0], val[2]) }
-    | column_name { result = SQL::Statement::Column.new(val[0]) }
+    | column_name
 
   qualifier
     : table_name
@@ -194,7 +194,7 @@ rule
 
 # sql module
   column_name
-    : identifier
+    : identifier { result = SQL::Statement::Column.new(val[0]) }
 
 # literals
   general_literal

lib/sql/parser.racc.rb

@@ -14,12 +14,12 @@ module SQL
 
   class Parser < Racc::Parser
 
-module_eval <<'..end lib/sql/parser.racc modeval..idb11a60ebf3', 'lib/sql/parser.racc', 223
+module_eval <<'..end lib/sql/parser.racc modeval..id47df124798', 'lib/sql/parser.racc', 223
 
 def self.parse(sql)
   new.scan_str(sql)
 end
-..end lib/sql/parser.racc modeval..idb11a60ebf3
+..end lib/sql/parser.racc modeval..id47df124798
 
 ##### racc 1.4.5 generates ###
 
@@ -111,7 +111,7 @@ def self.parse(sql)
  1, 91, :_reduce_none,
  1, 91, :_reduce_none,
  3, 72, :_reduce_86,
- 1, 72, :_reduce_87,
+ 1, 72, :_reduce_none,
  1, 95, :_reduce_none,
  4, 92, :_reduce_89,
  1, 92, :_reduce_none,
@@ -120,7 +120,7 @@ def self.parse(sql)
  4, 96, :_reduce_93,
  4, 96, :_reduce_94,
  4, 96, :_reduce_95,
- 1, 56, :_reduce_none,
+ 1, 56, :_reduce_96,
  1, 94, :_reduce_97,
  1, 94, :_reduce_none,
  1, 97, :_reduce_none,
@@ -1020,12 +1020,7 @@ def _reduce_86( val, _values, result )
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/sql/parser.racc', 178
-  def _reduce_87( val, _values, result )
- result = SQL::Statement::Column.new(val[0])
-   result
-  end
-.,.,
+ # reduce 87 omitted
 
  # reduce 88 omitted
 
@@ -1073,7 +1068,12 @@ def _reduce_95( val, _values, result )
   end
 .,.,
 
- # reduce 96 omitted
+module_eval <<'.,.,', 'lib/sql/parser.racc', 196
+  def _reduce_96( val, _values, result )
+ result = SQL::Statement::Column.new(val[0])
+   result
+  end
+.,.,
 
 module_eval <<'.,.,', 'lib/sql/parser.racc', 200
   def _reduce_97( val, _values, result )

lib/sql/sql_visitor.rb

@@ -182,15 +182,15 @@ def visit_Table(o)
     end
 
     def visit_QualifiedColumn(o)
-      "#{visit(o.table)}.#{o.name}"
+      "#{visit(o.table)}.#{visit(o.column)}"
     end
 
     def visit_Column(o)
       o.name
     end
 
     def visit_As(o)
-      "#{visit(o.value)} AS #{o.name}"
+      "#{visit(o.value)} AS #{visit(o.name)}"
     end
 
     def visit_Multiply(o)

lib/sql/statement.rb

@@ -260,13 +260,13 @@ def initialize(name)
     end
 
     class QualifiedColumn < Node
-      def initialize(table, name)
+      def initialize(table, column)
         @table = table
-        @name = name
+        @column = column
       end
 
       attr_reader :table
-      attr_reader :name
+      attr_reader :column
     end
 
     class Column < Node

test/test_statement.rb

@@ -29,31 +29,31 @@ def test_from_clause
   end
 
   def test_full_outer_join
-    assert_sql 't1 FULL OUTER JOIN t2 ON t1.a = t2.a', SQL::Statement::FullOuterJoin.new(SQL::Statement::Table.new('t1'), SQL::Statement::Table.new('t2'), SQL::Statement::Equals.new(SQL::Statement::QualifiedColumn.new(SQL::Statement::Table.new('t1'), 'a'), SQL::Statement::QualifiedColumn.new(SQL::Statement::Table.new('t2'), 'a')))
+    assert_sql 't1 FULL OUTER JOIN t2 ON t1.a = t2.a', SQL::Statement::FullOuterJoin.new(SQL::Statement::Table.new('t1'), SQL::Statement::Table.new('t2'), SQL::Statement::Equals.new(SQL::Statement::QualifiedColumn.new(SQL::Statement::Table.new('t1'), SQL::Statement::Column.new('a')), SQL::Statement::QualifiedColumn.new(SQL::Statement::Table.new('t2'), SQL::Statement::Column.new('a'))))
   end
 
   def test_full_join
-    assert_sql 't1 FULL JOIN t2 ON t1.a = t2.a', SQL::Statement::FullJoin.new(SQL::Statement::Table.new('t1'), SQL::Statement::Table.new('t2'), SQL::Statement::Equals.new(SQL::Statement::QualifiedColumn.new(SQL::Statement::Table.new('t1'), 'a'), SQL::Statement::QualifiedColumn.new(SQL::Statement::Table.new('t2'), 'a')))
+    assert_sql 't1 FULL JOIN t2 ON t1.a = t2.a', SQL::Statement::FullJoin.new(SQL::Statement::Table.new('t1'), SQL::Statement::Table.new('t2'), SQL::Statement::Equals.new(SQL::Statement::QualifiedColumn.new(SQL::Statement::Table.new('t1'), SQL::Statement::Column.new('a')), SQL::Statement::QualifiedColumn.new(SQL::Statement::Table.new('t2'), SQL::Statement::Column.new('a'))))
   end
 
   def test_right_outer_join
-    assert_sql 't1 RIGHT OUTER JOIN t2 ON t1.a = t2.a', SQL::Statement::RightOuterJoin.new(SQL::Statement::Table.new('t1'), SQL::Statement::Table.new('t2'), SQL::Statement::Equals.new(SQL::Statement::QualifiedColumn.new(SQL::Statement::Table.new('t1'), 'a'), SQL::Statement::QualifiedColumn.new(SQL::Statement::Table.new('t2'), 'a')))
+    assert_sql 't1 RIGHT OUTER JOIN t2 ON t1.a = t2.a', SQL::Statement::RightOuterJoin.new(SQL::Statement::Table.new('t1'), SQL::Statement::Table.new('t2'), SQL::Statement::Equals.new(SQL::Statement::QualifiedColumn.new(SQL::Statement::Table.new('t1'), SQL::Statement::Column.new('a')), SQL::Statement::QualifiedColumn.new(SQL::Statement::Table.new('t2'), SQL::Statement::Column.new('a'))))
   end
 
   def test_right_join
-    assert_sql 't1 RIGHT JOIN t2 ON t1.a = t2.a', SQL::Statement::RightJoin.new(SQL::Statement::Table.new('t1'), SQL::Statement::Table.new('t2'), SQL::Statement::Equals.new(SQL::Statement::QualifiedColumn.new(SQL::Statement::Table.new('t1'), 'a'), SQL::Statement::QualifiedColumn.new(SQL::Statement::Table.new('t2'), 'a')))
+    assert_sql 't1 RIGHT JOIN t2 ON t1.a = t2.a', SQL::Statement::RightJoin.new(SQL::Statement::Table.new('t1'), SQL::Statement::Table.new('t2'), SQL::Statement::Equals.new(SQL::Statement::QualifiedColumn.new(SQL::Statement::Table.new('t1'), SQL::Statement::Column.new('a')), SQL::Statement::QualifiedColumn.new(SQL::Statement::Table.new('t2'), SQL::Statement::Column.new('a'))))
   end
 
   def test_left_outer_join
-    assert_sql 't1 LEFT OUTER JOIN t2 ON t1.a = t2.a', SQL::Statement::LeftOuterJoin.new(SQL::Statement::Table.new('t1'), SQL::Statement::Table.new('t2'), SQL::Statement::Equals.new(SQL::Statement::QualifiedColumn.new(SQL::Statement::Table.new('t1'), 'a'), SQL::Statement::QualifiedColumn.new(SQL::Statement::Table.new('t2'), 'a')))
+    assert_sql 't1 LEFT OUTER JOIN t2 ON t1.a = t2.a', SQL::Statement::LeftOuterJoin.new(SQL::Statement::Table.new('t1'), SQL::Statement::Table.new('t2'), SQL::Statement::Equals.new(SQL::Statement::QualifiedColumn.new(SQL::Statement::Table.new('t1'), SQL::Statement::Column.new('a')), SQL::Statement::QualifiedColumn.new(SQL::Statement::Table.new('t2'), SQL::Statement::Column.new('a'))))
   end
 
   def test_left_join
-    assert_sql 't1 LEFT JOIN t2 ON t1.a = t2.a', SQL::Statement::LeftJoin.new(SQL::Statement::Table.new('t1'), SQL::Statement::Table.new('t2'), SQL::Statement::Equals.new(SQL::Statement::QualifiedColumn.new(SQL::Statement::Table.new('t1'), 'a'), SQL::Statement::QualifiedColumn.new(SQL::Statement::Table.new('t2'), 'a')))
+    assert_sql 't1 LEFT JOIN t2 ON t1.a = t2.a', SQL::Statement::LeftJoin.new(SQL::Statement::Table.new('t1'), SQL::Statement::Table.new('t2'), SQL::Statement::Equals.new(SQL::Statement::QualifiedColumn.new(SQL::Statement::Table.new('t1'), SQL::Statement::Column.new('a')), SQL::Statement::QualifiedColumn.new(SQL::Statement::Table.new('t2'), SQL::Statement::Column.new('a'))))
   end
 
   def test_inner_join
-    assert_sql 't1 INNER JOIN t2 ON t1.a = t2.a', SQL::Statement::InnerJoin.new(SQL::Statement::Table.new('t1'), SQL::Statement::Table.new('t2'), SQL::Statement::Equals.new(SQL::Statement::QualifiedColumn.new(SQL::Statement::Table.new('t1'), 'a'), SQL::Statement::QualifiedColumn.new(SQL::Statement::Table.new('t2'), 'a')))
+    assert_sql 't1 INNER JOIN t2 ON t1.a = t2.a', SQL::Statement::InnerJoin.new(SQL::Statement::Table.new('t1'), SQL::Statement::Table.new('t2'), SQL::Statement::Equals.new(SQL::Statement::QualifiedColumn.new(SQL::Statement::Table.new('t1'), SQL::Statement::Column.new('a')), SQL::Statement::QualifiedColumn.new(SQL::Statement::Table.new('t2'), SQL::Statement::Column.new('a'))))
   end
 
   def test_cross_join
@@ -168,15 +168,15 @@ def test_table
   end
 
   def test_qualified_column
-    assert_sql 'users.id', SQL::Statement::QualifiedColumn.new(SQL::Statement::Table.new('users'), 'id')
+    assert_sql 'users.id', SQL::Statement::QualifiedColumn.new(SQL::Statement::Table.new('users'), SQL::Statement::Column.new('id'))
   end
 
   def test_column
     assert_sql 'id', SQL::Statement::Column.new('id')
   end
 
   def test_as
-    assert_sql '1 AS a', SQL::Statement::As.new(SQL::Statement::Integer.new(1), 'a')
+    assert_sql '1 AS a', SQL::Statement::As.new(SQL::Statement::Integer.new(1), SQL::Statement::Column.new('a'))
   end
 
   def test_multiply