sql builder

3 files changed, 6 insertions, 25 deletions

diff --git a/lib/sql_algebra.rb b/lib/sql_algebra.rb
index 8adbed150d..79bdc8a449 100644
--- a/lib/sql_algebra.rb
+++ b/lib/sql_algebra.rb
@@ -29,4 +29,5 @@ require 'sql_algebra/predicates/match_predicate'
 
 require 'sql_algebra/extensions/range'
 
-require 'sql_algebra/sql/select'
\ No newline at end of file
+require 'sql_algebra/sql_builder/sql_builder'
+require 'sql_algebra/sql_builder/select_builder'
\ No newline at end of file
diff --git a/lib/sql_algebra/relations/table_relation.rb b/lib/sql_algebra/relations/table_relation.rb
index dd4987c3e1..17cdbab61a 100644
--- a/lib/sql_algebra/relations/table_relation.rb
+++ b/lib/sql_algebra/relations/table_relation.rb
@@ -6,6 +6,9 @@ class TableRelation < Relation
   end
   
   def to_sql
-    Select.new(:*).from(table)
+    SelectBuilder.new do
+      select :*
+      from table
+    end
   end
 end
\ No newline at end of file
diff --git a/lib/sql_algebra/sql/select.rb b/lib/sql_algebra/sql/select.rb
deleted file mode 100644
index da92ad3a52..0000000000
--- a/lib/sql_algebra/sql/select.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-class Select
-  attr_reader :attributes, :tables, :predicates
-  
-  def initialize(*attributes)
-    @attributes = attributes
-  end
-  
-  def from(*tables)
-    returning self do |select|
-      @tables = tables
-    end
-  end
-  
-  def where(*predicates)
-    returning self do |select|
-      @predicates = predicates
-    end
-  end
-  
-  def ==(other)
-    attributes == other.attributes and tables == other.tables and predicates == other.predicates
-  end
-end
\ No newline at end of file