Added VERSION constant, and removed class loading based on const_missing and use simple requires instead.

Author: wvanbergen

lib/sql_tree.rb

@@ -5,6 +5,8 @@
 # necessary files for the gem to function properly.
 module SQLTree
 
+  VERSION = "0.1.1"
+
   class << self
     # The character to quote variable names with.
     attr_accessor :identifier_quote_char
@@ -13,38 +15,14 @@ class << self
   # Set default quote characters
   self.identifier_quote_char = '"'
 
-  # Loads constants in the SQLTree namespace using self.load_default_class_file(base, const)
-  # <tt>const</tt>:: The constant that is not yet loaded in the SQLTree namespace. This should be passed as a string or symbol.
-  def self.const_missing(const)
-    load_default_class_file(SQLTree, const)
-  end
-
-  # Loads constants that reside in the SQLTree tree using the constant name
-  # and its base constant to determine the filename.
-  # <tt>base</tt>:: The base constant to load the constant from. This should be Foo when the constant Foo::Bar is being loaded.
-  # <tt>const</tt>:: The constant to load from the base constant as a string or symbol. This should be 'Bar' or :Bar when the constant Foo::Bar is being loaded.
-  def self.load_default_class_file(base, const)
-    require "#{to_underscore("#{base.name}::#{const}")}"
-    base.const_get(const) if base.const_defined?(const)
-  end
-
   # The <tt>[]</tt> method is a shorthand for the <tt>SQLTree::Parser.parse</tt>
   # method to parse an SQL query and return a SQL syntax tree.
   def self.[](query, options = {})
     SQLTree::Parser.parse(query)
   end
-
-  # Convert a string/symbol in camelcase (SQLTree::Parser) to underscores (sql_tree/parser)
-  # This function can be used to load the file (using require) in which the given constant is defined.
-  # <tt>str</tt>:: The string to convert in the following format: <tt>ModuleName::ClassName</tt>
-  def self.to_underscore(str)
-    str.to_s.gsub(/::/, '/').gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').gsub(/([a-z\d])([A-Z])/,'\1_\2').tr("-", "_").downcase
-  end
-
-  # Convert a string/symbol in underscores (<tt>sql_tree/parser</tt>) to camelcase
-  # (<tt>SqlTree::Parser</tt>). This can be used to find the class that is defined in a given filename.
-  # <tt>str</tt>:: The string to convert in the following format: <tt>module_name/class_name</tt>
-  def self.to_camelcase(str)
-    str.to_s.gsub(/\/(.?)/) { "::" + $1.upcase }.gsub(/(^|_)(.)/) { $2.upcase }
-  end
 end
+
+require 'sql_tree/token'
+require 'sql_tree/tokenizer'
+require 'sql_tree/node'
+require 'sql_tree/parser'

lib/sql_tree/node.rb

@@ -1,11 +1,5 @@
 module SQLTree::Node
 
-  # Auto-loades files for Node subclasses that reside in the
-  # node directory, based on the classname.
-  def self.const_missing(const)
-    SQLTree.load_default_class_file(SQLTree::Node, const)
-  end
-
   # The SQLTree::Node::Base class is the superclass for all node
   # types that are used to represent SQL queries.
   #
@@ -105,4 +99,22 @@ def self.[](sql, options = {})
       self.parse(parser)
     end
   end
-end
+end
+
+require 'sql_tree/node/expression'
+
+require 'sql_tree/node/select_query'
+require 'sql_tree/node/select_declaration'
+require 'sql_tree/node/table_reference'
+require 'sql_tree/node/source'
+require 'sql_tree/node/join'
+require 'sql_tree/node/ordering'
+
+require 'sql_tree/node/insert_query'
+require 'sql_tree/node/update_query'
+require 'sql_tree/node/delete_query'
+require 'sql_tree/node/set_query'
+
+require 'sql_tree/node/begin_statement'
+require 'sql_tree/node/commit_statement'
+require 'sql_tree/node/rollback_statement'

lib/sql_tree/token.rb

@@ -145,7 +145,7 @@ def inspect # :nodoc:
   # 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 INSERT INTO VALUES DELETE UPDATE
-                SET BEGIN COMMIT TO INTERVAL}
+                SET BEGIN COMMIT ROLLBACK TO INTERVAL COUNT}
 
   # Create a token for all the reserved keywords in SQL
   KEYWORDS.each { |kw| const_set(kw, Class.new(SQLTree::Token::Keyword)) }