sequel 3.21.0 → 3.32.0

data/lib/sequel/dataset/sql.rb

@@ -1,7 +1,7 @@
 module Sequel
   class Dataset
     # ---------------------
-    # :section: User Methods relating to SQL Creation
+    # :section: 3 - User Methods relating to SQL Creation
     # These are methods you can call to see what SQL will be generated by the dataset.
     # ---------------------
     
@@ -20,7 +20,7 @@ module Sequel
     #   DB.select(1).where(DB[:items].exists)
     #   # SELECT 1 WHERE (EXISTS (SELECT * FROM items))
     def exists
-      LiteralString.new("EXISTS (#{select_sql})")
+      SQL::PlaceholderLiteralString.new("EXISTS ?", [self], true)
     end
     
     # Returns an INSERT SQL query string.  See +insert+.
@@ -61,7 +61,10 @@ module Sequel
         end
       end
 
-      columns = columns.map{|k| literal(String === k ? k.to_sym : k)}
+      if values.is_a?(Array) && values.empty? && !insert_supports_empty_values? 
+        columns = [columns().last]
+        values = ['DEFAULT'.lit]
+      end
       clone(:columns=>columns, :values=>values)._insert_sql
     end
     
@@ -75,41 +78,47 @@ module Sequel
     #   DB[:items].literal(:x + 1 > :y) => "((x + 1) > y)"
     #
     # If an unsupported object is given, an +Error+ is raised.
-    def literal(v)
+    def literal_append(sql, v)
       case v
-      when String
-        return v if v.is_a?(LiteralString)
-        v.is_a?(SQL::Blob) ? literal_blob(v) : literal_string(v)
       when Symbol
-        literal_symbol(v)
+        literal_symbol_append(sql, v)
+      when String
+        case v
+        when LiteralString
+          sql << v
+        when SQL::Blob
+          literal_blob_append(sql, v)
+        else
+          literal_string_append(sql, v)
+        end
       when Integer
-        literal_integer(v)
+        sql << literal_integer(v)
       when Hash
-        literal_hash(v)
+        literal_hash_append(sql, v)
       when SQL::Expression
-        literal_expression(v)
+        literal_expression_append(sql, v)
       when Float
-        literal_float(v)
+        sql << literal_float(v)
       when BigDecimal
-        literal_big_decimal(v)
+        sql << literal_big_decimal(v)
       when NilClass
-        literal_nil
+        sql << literal_nil
       when TrueClass
-        literal_true
+        sql << literal_true
       when FalseClass
-        literal_false
+        sql << literal_false
       when Array
-        literal_array(v)
+        literal_array_append(sql, v)
       when Time
-        literal_time(v)
+        sql << (v.is_a?(SQLTime) ? literal_sqltime(v) : literal_time(v))
       when DateTime
-        literal_datetime(v)
+        sql << literal_datetime(v)
       when Date
-        literal_date(v)
+        sql << literal_date(v)
       when Dataset
-        literal_dataset(v)
+        literal_dataset_append(sql, v)
       else
-        literal_other(v)
+        literal_other_append(sql, v)
       end
     end
     
@@ -163,7 +172,7 @@ module Sequel
     end
     
     # ---------------------
-    # :section: Internal Methods relating to SQL Creation
+    # :section: 9 - Internal Methods relating to SQL Creation
     # These methods, while public, are not designed to be used directly by the end user.
     # ---------------------
     
@@ -173,80 +182,234 @@ module Sequel
       clauses.map{|clause| :"#{type}_#{clause}_sql"}.freeze
     end
 
+    ALL = ' ALL'.freeze
     AND_SEPARATOR = " AND ".freeze
+    APOS = "'".freeze
+    APOS_RE = /'/.freeze
+    ARRAY_EMPTY = '(NULL)'.freeze
+    AS = ' AS '.freeze
+    ASC = ' ASC'.freeze
+    BACKSLASH_RE = /\\/.freeze
     BOOL_FALSE = "'f'".freeze
     BOOL_TRUE = "'t'".freeze
-    COMMA_SEPARATOR = ', '.freeze
-    COLUMN_REF_RE1 = /\A(((?!__).)+)__(((?!___).)+)___(.+)\z/.freeze
-    COLUMN_REF_RE2 = /\A(((?!___).)+)___(.+)\z/.freeze
-    COLUMN_REF_RE3 = /\A(((?!__).)+)__(.+)\z/.freeze
+    BRACKET_CLOSE =  ']'.freeze
+    BRACKET_OPEN = '['.freeze
+    CASE_ELSE = " ELSE ".freeze
+    CASE_END = " END)".freeze
+    CASE_OPEN = '(CASE'.freeze
+    CASE_THEN = " THEN ".freeze
+    CASE_WHEN = " WHEN ".freeze
+    CAST_OPEN = 'CAST('.freeze
+    COLUMN_ALL = '.*'.freeze
+    COLUMN_REF_RE1 = /\A((?:(?!__).)+)__((?:(?!___).)+)___(.+)\z/.freeze
+    COLUMN_REF_RE2 = /\A((?:(?!___).)+)___(.+)\z/.freeze
+    COLUMN_REF_RE3 = /\A((?:(?!__).)+)__(.+)\z/.freeze
+    COMMA = ', '.freeze
+    COMMA_SEPARATOR = COMMA
+    CONDITION_FALSE = '(1 = 0)'.freeze
+    CONDITION_TRUE = '(1 = 1)'.freeze
     COUNT_FROM_SELF_OPTS = [:distinct, :group, :sql, :limit, :compounds]
     COUNT_OF_ALL_AS_COUNT = SQL::Function.new(:count, LiteralString.new('*'.freeze)).as(:count)
     DATASET_ALIAS_BASE_NAME = 't'.freeze
+    DEFAULT_VALUES = " DEFAULT VALUES".freeze
+    DELETE = 'DELETE'.freeze
+    DELETE_CLAUSE_METHODS = clause_methods(:delete, %w'delete from where')
+    DESC = ' DESC'.freeze
+    DISTINCT = " DISTINCT".freeze
+    DOT = '.'.freeze
+    DOUBLE_APOS = "''".freeze
+    DOUBLE_QUOTE = '""'.freeze
+    EQUAL = ' = '.freeze
+    EXTRACT = 'extract('.freeze
     FOR_UPDATE = ' FOR UPDATE'.freeze
+    FORMAT_DATE = "'%Y-%m-%d'".freeze
+    FORMAT_DATE_STANDARD = "DATE '%Y-%m-%d'".freeze
+    FORMAT_OFFSET = "%+03i%02i".freeze
+    FORMAT_TIMESTAMP_RE = /%[Nz]/.freeze
+    FORMAT_TIMESTAMP_USEC = ".%06d".freeze
+    FORMAT_USEC = '%N'.freeze
+    FRAME_ALL = "ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING".freeze
+    FRAME_ROWS = "ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW".freeze
+    FROM = ' FROM '.freeze
+    FUNCTION_EMPTY = '()'.freeze
+    GROUP_BY = " GROUP BY ".freeze
+    HAVING = " HAVING ".freeze
+    INSERT = "INSERT".freeze
+    INSERT_CLAUSE_METHODS = clause_methods(:insert, %w'insert into columns values')
+    INTO = " INTO ".freeze
     IS_LITERALS = {nil=>'NULL'.freeze, true=>'TRUE'.freeze, false=>'FALSE'.freeze}.freeze
     IS_OPERATORS = ::Sequel::SQL::ComplexExpression::IS_OPERATORS
+    LIMIT = " LIMIT ".freeze
     N_ARITY_OPERATORS = ::Sequel::SQL::ComplexExpression::N_ARITY_OPERATORS
+    NOT_SPACE = 'NOT '.freeze
     NULL = "NULL".freeze
+    NULLS_FIRST = " NULLS FIRST".freeze
+    NULLS_LAST = " NULLS LAST".freeze
+    OFFSET = " OFFSET ".freeze
+    ON = ' ON '.freeze
+    ON_PAREN = " ON (".freeze
+    ORDER_BY = " ORDER BY ".freeze
+    ORDER_BY_NS = "ORDER BY ".freeze
+    OVER = ' OVER '.freeze
+    PAREN_CLOSE = ')'.freeze
+    PAREN_OPEN = '('.freeze
+    PAREN_SPACE_OPEN = ' ('.freeze
+    PARTITION_BY = "PARTITION BY ".freeze
+    QUAD_BACKSLASH = "\\\\\\\\".freeze
     QUALIFY_KEYS = [:select, :where, :having, :order, :group]
     QUESTION_MARK = '?'.freeze
-    DELETE_CLAUSE_METHODS = clause_methods(:delete, %w'from where')
-    INSERT_CLAUSE_METHODS = clause_methods(:insert, %w'into columns values')
-    SELECT_CLAUSE_METHODS = clause_methods(:select, %w'with distinct columns from join where group having compounds order limit lock')
-    UPDATE_CLAUSE_METHODS = clause_methods(:update, %w'table set where')
+    QUESTION_MARK_RE = /\?/.freeze
+    QUOTE = '"'.freeze
+    QUOTE_RE = /"/.freeze
+    RETURNING = " RETURNING ".freeze
+    SELECT = 'SELECT'.freeze
+    SELECT_CLAUSE_METHODS = clause_methods(:select, %w'with select distinct columns from join where group having compounds order limit lock')
+    SET = ' SET '.freeze
+    SPACE = ' '.freeze
+    SQL_WITH = "WITH ".freeze
+    TILDE = '~'.freeze
     TIMESTAMP_FORMAT = "'%Y-%m-%d %H:%M:%S%N%z'".freeze
     STANDARD_TIMESTAMP_FORMAT = "TIMESTAMP #{TIMESTAMP_FORMAT}".freeze
     TWO_ARITY_OPERATORS = ::Sequel::SQL::ComplexExpression::TWO_ARITY_OPERATORS
+    UNDERSCORE = '_'.freeze
+    UPDATE = 'UPDATE'.freeze
+    UPDATE_CLAUSE_METHODS = clause_methods(:update, %w'update table set where')
+    USING = ' USING ('.freeze
+    VALUES = " VALUES ".freeze
+    WHERE = " WHERE ".freeze
     WILDCARD = LiteralString.new('*').freeze
-    SQL_WITH = "WITH ".freeze
+
+    PUBLIC_APPEND_METHODS = (<<-END).split.map{|x| x.to_sym}
+      literal
+      aliased_expression_sql
+      array_sql
+      boolean_constant_sql
+      case_expression_sql
+      cast_sql
+      column_all_sql
+      complex_expression_sql
+      constant_sql
+      function_sql
+      join_clause_sql
+      join_on_clause_sql
+      join_using_clause_sql
+      negative_boolean_constant_sql
+      ordered_expression_sql
+      placeholder_literal_string_sql
+      qualified_identifier_sql
+      quote_identifier
+      quote_schema_table
+      quoted_identifier
+      subscript_sql
+      window_sql
+      window_function_sql
+    END
+    PRIVATE_APPEND_METHODS = (<<-END).split.map{|x| x.to_sym}
+      argument_list
+      as_sql
+      column_list
+      compound_dataset_sql
+      expression_list
+      literal_array
+      literal_blob
+      literal_dataset
+      literal_expression
+      literal_hash
+      literal_other
+      literal_string
+      literal_symbol
+      source_list
+      subselect_sql
+      table_ref
+    END
+    def self.def_append_methods(meths)
+      meths.each do |meth|
+        class_eval(<<-END, __FILE__, __LINE__ + 1)
+          def #{meth}(*args, &block)
+            s = ''
+            #{meth}_append(s, *args, &block)
+            s
+          end
+        END
+      end
+    end
+    def_append_methods(PUBLIC_APPEND_METHODS + PRIVATE_APPEND_METHODS)
+    private *PRIVATE_APPEND_METHODS
 
     # SQL fragment for AliasedExpression
-    def aliased_expression_sql(ae)
-      as_sql(literal(ae.expression), ae.aliaz)
+    def aliased_expression_sql_append(sql, ae)
+      literal_append(sql, ae.expression)
+      as_sql_append(sql, ae.aliaz)
     end
 
     # SQL fragment for Array
-    def array_sql(a)
-      a.empty? ? '(NULL)' : "(#{expression_list(a)})"     
+    def array_sql_append(sql, a)
+      if a.empty?
+        sql << ARRAY_EMPTY
+      else
+        sql << PAREN_OPEN
+        expression_list_append(sql, a)
+        sql << PAREN_CLOSE
+      end
     end
 
     # SQL fragment for BooleanConstants
-    def boolean_constant_sql(constant)
-      literal(constant)
+    def boolean_constant_sql_append(sql, constant)
+      if (constant == true || constant == false) && !supports_where_true?
+        sql << (constant == true ? CONDITION_TRUE : CONDITION_FALSE)
+      else
+        literal_append(sql, constant)
+      end
     end
 
     # SQL fragment for CaseExpression
-    def case_expression_sql(ce)
-      sql = '(CASE '
-      sql << "#{literal(ce.expression)} " if ce.expression?
-      ce.conditions.collect{ |c,r|
-        sql << "WHEN #{literal(c)} THEN #{literal(r)} "
-      }
-      sql << "ELSE #{literal(ce.default)} END)"
+    def case_expression_sql_append(sql, ce)
+      sql << CASE_OPEN
+      if ce.expression?
+        sql << SPACE
+        literal_append(sql, ce.expression)
+      end
+      w = CASE_WHEN
+      t = CASE_THEN
+      ce.conditions.each do |c,r|
+        sql << w
+        literal_append(sql, c)
+        sql << t
+        literal_append(sql, r)
+      end
+      sql << CASE_ELSE
+      literal_append(sql, ce.default)
+      sql << CASE_END
     end
 
     # SQL fragment for the SQL CAST expression
-    def cast_sql(expr, type)
-      "CAST(#{literal(expr)} AS #{db.cast_type_literal(type)})"
+    def cast_sql_append(sql, expr, type)
+      sql << CAST_OPEN
+      literal_append(sql, expr)
+      sql << AS << db.cast_type_literal(type).to_s
+      sql << PAREN_CLOSE
     end
 
     # SQL fragment for specifying all columns in a given table
-    def column_all_sql(ca)
-      "#{quote_schema_table(ca.table)}.*"
+    def column_all_sql_append(sql, ca)
+      quote_schema_table_append(sql, ca.table)
+      sql << COLUMN_ALL
     end
 
-    # SQL fragment for complex expressions
-    def complex_expression_sql(op, args)
+    def complex_expression_sql_append(sql, op, args)
       case op
       when *IS_OPERATORS
         r = args.at(1)
         if r.nil? || supports_is_true?
           raise(InvalidOperation, 'Invalid argument used for IS operator') unless v = IS_LITERALS[r]
-          "(#{literal(args.at(0))} #{op} #{v})"
+          sql << PAREN_OPEN
+          literal_append(sql, args.at(0))
+          sql << SPACE << op.to_s << SPACE
+          sql << v << PAREN_CLOSE
         elsif op == :IS
-          complex_expression_sql(:"=", args)
+          complex_expression_sql_append(sql, :"=", args)
         else
-          complex_expression_sql(:OR, [SQL::BooleanExpression.new(:"!=", *args), SQL::BooleanExpression.new(:IS, args.at(0), nil)])
+          complex_expression_sql_append(sql, :OR, [SQL::BooleanExpression.new(:"!=", *args), SQL::BooleanExpression.new(:IS, args.at(0), nil)])
         end
       when :IN, :"NOT IN"
         cols = args.at(0)
@@ -256,147 +419,219 @@ module Sequel
           val_array = true
           empty_val_array = vals == []
         end
-        if col_array
-          if empty_val_array
-            if op == :IN
-              literal(SQL::BooleanExpression.from_value_pairs(cols.to_a.map{|x| [x, x]}, :AND, true))
-            else
-              literal(1=>1)
-            end
-          elsif !supports_multiple_column_in?
+        if empty_val_array
+          literal_append(sql, empty_array_value(op, cols))
+        elsif col_array
+          if !supports_multiple_column_in?
             if val_array
               expr = SQL::BooleanExpression.new(:OR, *vals.to_a.map{|vs| SQL::BooleanExpression.from_value_pairs(cols.to_a.zip(vs).map{|c, v| [c, v]})})
-              literal(op == :IN ? expr : ~expr)
+              literal_append(sql, op == :IN ? expr : ~expr)
             else
               old_vals = vals
+              vals = vals.naked if vals.is_a?(Sequel::Dataset)
               vals = vals.to_a
               val_cols = old_vals.columns
-              complex_expression_sql(op, [cols, vals.map!{|x| x.values_at(*val_cols)}])
+              complex_expression_sql_append(sql, op, [cols, vals.map!{|x| x.values_at(*val_cols)}])
             end
           else
             # If the columns and values are both arrays, use array_sql instead of
             # literal so that if values is an array of two element arrays, it
             # will be treated as a value list instead of a condition specifier.
-            "(#{literal(cols)} #{op} #{val_array ? array_sql(vals) : literal(vals)})"
-          end
-        else
-          if empty_val_array
-            if op == :IN
-              literal(SQL::BooleanExpression.from_value_pairs([[cols, cols]], :AND, true))
+            sql << PAREN_OPEN
+            literal_append(sql, cols)
+            sql << SPACE << op.to_s << SPACE
+            if val_array
+              array_sql_append(sql, vals)
             else
-              literal(1=>1)
+              literal_append(sql, vals)
             end
-          else
-            "(#{literal(cols)} #{op} #{literal(vals)})"
+            sql << PAREN_CLOSE
           end
+        else
+          sql << PAREN_OPEN
+          literal_append(sql, cols)
+          sql << SPACE << op.to_s << SPACE
+          literal_append(sql, vals)
+          sql << PAREN_CLOSE
         end
       when *TWO_ARITY_OPERATORS
-        "(#{literal(args.at(0))} #{op} #{literal(args.at(1))})"
+        sql << PAREN_OPEN
+        literal_append(sql, args.at(0))
+        sql << SPACE << op.to_s << SPACE
+        literal_append(sql, args.at(1))
+        sql << PAREN_CLOSE
       when *N_ARITY_OPERATORS
-        "(#{args.collect{|a| literal(a)}.join(" #{op} ")})"
+        sql << PAREN_OPEN
+        c = false
+        op_str = " #{op} "
+        args.each do |a|
+          sql << op_str if c
+          literal_append(sql, a)
+          c ||= true
+        end
+        sql << PAREN_CLOSE
       when :NOT
-        "NOT #{literal(args.at(0))}"
+        sql << NOT_SPACE
+        literal_append(sql, args.at(0))
       when :NOOP
-        literal(args.at(0))
+        literal_append(sql, args.at(0))
       when :'B~'
-        "~#{literal(args.at(0))}"
+        sql << TILDE
+        literal_append(sql, args.at(0))
+      when :extract
+        sql << EXTRACT << args.at(0).to_s << FROM
+        literal_append(sql, args.at(1))
+        sql << PAREN_CLOSE
       else
         raise(InvalidOperation, "invalid operator #{op}")
       end
     end
     
     # SQL fragment for constants
-    def constant_sql(constant)
-      constant.to_s
+    def constant_sql_append(sql, constant)
+      sql << constant.to_s
     end
 
     # SQL fragment specifying an SQL function call
-    def function_sql(f)
+    def function_sql_append(sql, f)
+      sql << f.f.to_s
       args = f.args
-      "#{f.f}#{args.empty? ? '()' : literal(args)}"
+      if args.empty?
+        sql << FUNCTION_EMPTY
+      else
+        literal_append(sql, args)
+      end
     end
 
     # SQL fragment specifying a JOIN clause without ON or USING.
-    def join_clause_sql(jc)
+    def join_clause_sql_append(sql, jc)
       table = jc.table
       table_alias = jc.table_alias
       table_alias = nil if table == table_alias
-      tref = table_ref(table)
-      " #{join_type_sql(jc.join_type)} #{table_alias ? as_sql(tref, table_alias) : tref}"
+      sql << SPACE << join_type_sql(jc.join_type) << SPACE
+      table_ref_append(sql, table)
+      as_sql_append(sql, table_alias) if table_alias
     end
 
     # SQL fragment specifying a JOIN clause with ON.
-    def join_on_clause_sql(jc)
-      "#{join_clause_sql(jc)} ON #{literal(filter_expr(jc.on))}"
+    def join_on_clause_sql_append(sql, jc)
+      join_clause_sql_append(sql, jc)
+      sql << ON
+      literal_append(sql, filter_expr(jc.on))
     end
 
     # SQL fragment specifying a JOIN clause with USING.
-    def join_using_clause_sql(jc)
-      "#{join_clause_sql(jc)} USING (#{column_list(jc.using)})"
+    def join_using_clause_sql_append(sql, jc)
+      join_clause_sql_append(sql, jc)
+      sql << USING
+      column_list_append(sql, jc.using)
+      sql << PAREN_CLOSE
     end
     
     # SQL fragment for NegativeBooleanConstants
-    def negative_boolean_constant_sql(constant)
-      "NOT #{boolean_constant_sql(constant)}"
+    def negative_boolean_constant_sql_append(sql, constant)
+      sql << NOT_SPACE
+      boolean_constant_sql_append(sql, constant)
     end
 
     # SQL fragment for the ordered expression, used in the ORDER BY
     # clause.
-    def ordered_expression_sql(oe)
-      s = "#{literal(oe.expression)} #{oe.descending ? 'DESC' : 'ASC'}"
+    def ordered_expression_sql_append(sql, oe)
+      literal_append(sql, oe.expression)
+      sql << (oe.descending ? DESC : ASC)
       case oe.nulls
       when :first
-        "#{s} NULLS FIRST"
+        sql << NULLS_FIRST
       when :last
-        "#{s} NULLS LAST"
-      else
-        s
+        sql << NULLS_LAST
       end
     end
 
     # SQL fragment for a literal string with placeholders
-    def placeholder_literal_string_sql(pls)
+    def placeholder_literal_string_sql_append(sql, pls)
       args = pls.args
-      s = if args.is_a?(Hash)
+      sql << PAREN_OPEN if pls.parens
+      if args.is_a?(Hash)
         re = /:(#{args.keys.map{|k| Regexp.escape(k.to_s)}.join('|')})\b/
-        pls.str.gsub(re){literal(args[$1.to_sym])}
+        if RUBY_VERSION >= '1.8.7'
+          str = pls.str
+          loop do
+            previous, q, str = str.partition(re)
+            sql << previous
+            literal_append(sql, args[($1||q[1..-1].to_s).to_sym]) unless q.empty?
+            break if str.empty?
+          end
+        else
+          sql << pls.str.gsub(re){literal(args[$1.to_sym])}
+        end
       else
         i = -1
-        pls.str.gsub(QUESTION_MARK){literal(args.at(i+=1))}
+        if RUBY_VERSION >= '1.8.7'
+          str = pls.str
+          loop do
+            previous, q, str = str.partition(QUESTION_MARK)
+            sql << previous
+            literal_append(sql, args.at(i+=1)) unless q.empty?
+            break if str.empty?
+          end
+        else
+          sql << pls.str.gsub(QUESTION_MARK_RE){literal(args.at(i+=1))}
+        end
       end
-      s = "(#{s})" if pls.parens
-      s
+      sql << PAREN_CLOSE if pls.parens
     end
 
     # SQL fragment for the qualifed identifier, specifying
     # a table and a column (or schema and table).
-    def qualified_identifier_sql(qcr)
-      [qcr.table, qcr.column].map{|x| [SQL::QualifiedIdentifier, SQL::Identifier, Symbol].any?{|c| x.is_a?(c)} ? literal(x) : quote_identifier(x)}.join('.')
+    def qualified_identifier_sql_append(sql, qcr)
+      case t = qcr.table
+      when Symbol, SQL::QualifiedIdentifier, SQL::Identifier
+        literal_append(sql, t) 
+      else
+        quote_identifier_append(sql, t)
+      end
+      sql << DOT
+      case c = qcr.column
+      when Symbol, SQL::QualifiedIdentifier, SQL::Identifier
+        literal_append(sql, c) 
+      else
+        quote_identifier_append(sql, c)
+      end
     end
 
     # Adds quoting to identifiers (columns and tables). If identifiers are not
     # being quoted, returns name as a string.  If identifiers are being quoted
     # quote the name with quoted_identifier.
-    def quote_identifier(name)
-      return name if name.is_a?(LiteralString)
-      name = name.value if name.is_a?(SQL::Identifier)
-      name = input_identifier(name)
-      name = quoted_identifier(name) if quote_identifiers?
-      name
+    def quote_identifier_append(sql, name)
+      if name.is_a?(LiteralString)
+        sql << name
+      else
+        name = name.value if name.is_a?(SQL::Identifier)
+        name = input_identifier(name)
+        if quote_identifiers?
+          quoted_identifier_append(sql, name)
+        else
+          sql << name
+        end
+      end
     end
 
     # Separates the schema from the table and returns a string with them
     # quoted (if quoting identifiers)
-    def quote_schema_table(table)
+    def quote_schema_table_append(sql, table)
       schema, table = schema_and_table(table)
-      "#{"#{quote_identifier(schema)}." if schema}#{quote_identifier(table)}"
+      if schema
+        quote_identifier_append(sql, schema)
+        sql << DOT
+      end
+      quote_identifier_append(sql, table)
     end
 
     # This method quotes the given name with the SQL standard double quote. 
     # should be overridden by subclasses to provide quoting not matching the
     # SQL standard, such as backtick (used by MySQL and SQLite).
-    def quoted_identifier(name)
-      "\"#{name.to_s.gsub('"', '""')}\""
+    def quoted_identifier_append(sql, name)
+      sql << QUOTE << name.to_s.gsub(QUOTE_RE, DOUBLE_QUOTE) << QUOTE
     end
 
     # Split the schema information from the table
@@ -418,34 +653,59 @@ module Sequel
     end
 
     # SQL fragment for specifying subscripts (SQL array accesses)
-    def subscript_sql(s)
-      "#{literal(s.f)}[#{expression_list(s.sub)}]"
+    def subscript_sql_append(sql, s)
+      literal_append(sql, s.f)
+      sql << BRACKET_OPEN
+      expression_list_append(sql, s.sub)
+      sql << BRACKET_CLOSE
     end
 
     # The SQL fragment for the given window's options.
-    def window_sql(opts)
+    def window_sql_append(sql, opts)
       raise(Error, 'This dataset does not support window functions') unless supports_window_functions?
-      window = literal(opts[:window]) if opts[:window]
-      partition = "PARTITION BY #{expression_list(Array(opts[:partition]))}" if opts[:partition]
-      order = "ORDER BY #{expression_list(Array(opts[:order]))}" if opts[:order]
-      frame = case opts[:frame]
+      sql << PAREN_OPEN
+      window, part, order, frame = opts.values_at(:window, :partition, :order, :frame)
+      space = false
+      space_s = SPACE
+      if window
+        literal_append(sql, window)
+        space = true
+      end
+      if part
+        sql << space_s if space
+        sql << PARTITION_BY
+        expression_list_append(sql, Array(part))
+        space = true
+      end
+      if order
+        sql << space_s if space
+        sql << ORDER_BY_NS
+        expression_list_append(sql, Array(order))
+        space = true
+      end
+      case frame
         when nil
-          nil
+          # nothing
         when :all
-          "ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING"
+          sql << space_s if space
+          sql << FRAME_ALL
         when :rows
-          "ROWS UNBOUNDED PRECEDING"
+          sql << space_s if space
+          sql << FRAME_ROWS
         when String
-          opts[:frame]
+          sql << space_s if space
+          sql << frame
         else
           raise Error, "invalid window frame clause, should be :all, :rows, a string, or nil"
       end
-      "(#{[window, partition, order, frame].compact.join(' ')})"
+      sql << PAREN_CLOSE
     end
 
     # The SQL fragment for the given window function's function and window.
-    def window_function_sql(function, window)
-      "#{literal(function)} OVER #{literal(window)}"
+    def window_function_sql_append(sql, function, window)
+      literal_append(sql, function)
+      sql << OVER
+      literal_append(sql, window)
     end
 
     protected
@@ -517,14 +777,20 @@ module Sequel
       options_overlap(COUNT_FROM_SELF_OPTS) ? from_self : unordered
     end
 
-    # Do a simple join of the arguments (which should be strings or symbols) separated by commas
-    def argument_list(args)
-      args.join(COMMA_SEPARATOR)
+    def argument_list_append(sql, args)
+      c = false
+      comma = COMMA
+      args.each do |a|
+        sql << comma if c
+        sql << a.to_s
+        c ||= true
+      end
     end
 
     # SQL fragment for specifying an alias.  expression should already be literalized.
-    def as_sql(expression, aliaz)
-      "#{expression} AS #{quote_identifier(aliaz)}"
+    def as_sql_append(sql, aliaz)
+      sql << AS
+      quote_identifier_append(sql, aliaz)
     end
     
     # Raise an InvalidOperation exception if deletion is not allowed
@@ -536,36 +802,81 @@ module Sequel
 
     # Prepare an SQL statement by calling all clause methods for the given statement type.
     def clause_sql(type)
-      sql = type.to_s.upcase
+      sql = @opts[:append_sql] || ''
       send("#{type}_clause_methods").each{|x| send(x, sql)}
       sql
     end
 
     # Converts an array of column names into a comma seperated string of 
     # column names. If the array is empty, a wildcard (*) is returned.
-    def column_list(columns)
-      (columns.nil? || columns.empty?) ? WILDCARD : expression_list(columns)
+    def column_list_append(sql, columns)
+      if (columns.nil? || columns.empty?)
+        sql << WILDCARD
+      else
+        expression_list_append(sql, columns)
+      end
     end
-    
+
+    # Yield each two pair of arguments to the block, which should
+    # return a string representing the SQL code for those
+    # two arguments.  If more than 2 arguments are provided, all
+    # calls to the block # after the first will have a LiteralString
+    # as the first argument, representing the application of the block to
+    # the previous arguments.
+    def complex_expression_arg_pairs(args)
+      case args.length
+      when 1
+        literal(args.at(0))
+      when 2
+        yield args.at(0), args.at(1)
+      else
+        args.inject{|m, a| LiteralString.new(yield(m, a))}
+      end
+    end
+
+    # The SQL to use for the dataset used in a UNION/INTERSECT/EXCEPT clause. 
+    def compound_dataset_sql_append(sql, ds)
+      subselect_sql_append(sql, ds)
+    end
+
     # The alias to use for datasets, takes a number to make sure the name is unique.
     def dataset_alias(number)
       :"#{DATASET_ALIAS_BASE_NAME}#{number}"
     end
     
+    # The strftime format to use when literalizing the time.
+    def default_timestamp_format
+      requires_sql_standard_datetimes? ? STANDARD_TIMESTAMP_FORMAT : TIMESTAMP_FORMAT
+    end
+
     # The order of methods to call to build the DELETE SQL statement
     def delete_clause_methods
       DELETE_CLAUSE_METHODS
     end
 
+    def delete_delete_sql(sql)
+      sql << DELETE
+    end
+
     # Converts an array of expressions into a comma separated string of
     # expressions.
-    def expression_list(columns)
-      columns.map{|i| literal(i)}.join(COMMA_SEPARATOR)
+    def expression_list_append(sql, columns)
+      c = false
+      co = COMMA
+      columns.each do |col|
+        sql << co if c
+        literal_append(sql, col)
+        c ||= true
+      end
     end
     
-    # The strftime format to use when literalizing the time.
-    def default_timestamp_format
-      requires_sql_standard_datetimes? ? STANDARD_TIMESTAMP_FORMAT : TIMESTAMP_FORMAT
+    def empty_array_value(op, cols)
+      if Sequel.empty_array_handle_nulls
+        c = Array(cols)
+        SQL::BooleanExpression.from_value_pairs(c.zip(c), :AND, op == :IN)
+      else
+        {1 => ((op == :IN) ? 0 : 1)}
+      end
     end
     
     # Format the timestamp based on the default_timestamp_format, with a couple
@@ -573,9 +884,9 @@ module Sequel
     # database supports them), and override %z to always use a numeric offset
     # of hours and minutes.
     def format_timestamp(v)
-      v2 = Sequel.application_to_database_timestamp(v)
-      fmt = default_timestamp_format.gsub(/%[Nz]/) do |m|
-        if m == '%N'
+      v2 = db.from_application_timestamp(v)
+      fmt = default_timestamp_format.gsub(FORMAT_TIMESTAMP_RE) do |m|
+        if m == FORMAT_USEC
           format_timestamp_usec(v.is_a?(DateTime) ? v.sec_fraction*(RUBY_VERSION < '1.9.0' ? 86400000000 : 1000000) : v.usec) if supports_timestamp_usecs?
         else
           if supports_timestamp_timezones?
@@ -591,13 +902,13 @@ module Sequel
     
     # Return the SQL timestamp fragment to use for the timezone offset.
     def format_timestamp_offset(hour, minute)
-      sprintf("%+03i%02i", hour, minute)
+      sprintf(FORMAT_OFFSET, hour, minute)
     end
 
     # Return the SQL timestamp fragment to use for the fractional time part.
     # Should start with the decimal point.  Uses 6 decimal places by default.
     def format_timestamp_usec(usec)
-      sprintf(".%06d", usec)
+      sprintf(FORMAT_TIMESTAMP_USEC, usec)
     end
 
     # Modify the identifier returned from the database based on the
@@ -608,7 +919,8 @@ module Sequel
 
     # SQL fragment specifying the table to insert INTO
     def insert_into_sql(sql)
-      sql << " INTO #{source_list(@opts[:from])}"
+      sql << INTO
+      source_list_append(sql, @opts[:from])
     end
 
     # The order of methods to call to build the INSERT SQL statement
@@ -619,27 +931,61 @@ module Sequel
     # SQL fragment specifying the columns to insert into
     def insert_columns_sql(sql)
       columns = opts[:columns]
-      sql << " (#{columns.join(COMMA_SEPARATOR)})" if columns && !columns.empty?
+      if columns && !columns.empty?
+        sql << PAREN_SPACE_OPEN
+        c = false
+        co = COMMA
+        columns.each do |col|
+          sql << co if c
+          if col.is_a?(String) && !col.is_a?(LiteralString)
+            quote_identifier_append(sql, col)
+          else
+            literal_append(sql, col)
+          end
+          c ||= true
+        end
+        sql << PAREN_CLOSE
+      end 
+    end
+
+    def insert_insert_sql(sql)
+      sql << INSERT
     end
 
     # SQL fragment specifying the values to insert.
     def insert_values_sql(sql)
       case values = opts[:values]
       when Array
-        sql << (values.empty? ? " DEFAULT VALUES" : " VALUES #{literal(values)}")
+        if values.empty?
+          sql << DEFAULT_VALUES
+        else
+          sql << VALUES
+          literal_append(sql, values)
+        end
       when Dataset
-        sql << " #{subselect_sql(values)}"
+        sql << SPACE
+        subselect_sql_append(sql, values)
       when LiteralString
-        sql << " #{values}"
+        sql << SPACE << values
       else
         raise Error, "Unsupported INSERT values type, should be an Array or Dataset: #{values.inspect}"
       end
     end
 
+    # SQL fragment specifying the values to return.
+    def insert_returning_sql(sql)
+      if opts.has_key?(:returning)
+        sql << RETURNING
+        column_list_append(sql, Array(opts[:returning]))
+      end
+    end
+    alias delete_returning_sql insert_returning_sql
+    alias update_returning_sql insert_returning_sql
+
     # SQL fragment specifying a JOIN type, converts underscores to
     # spaces and upcases.
     def join_type_sql(join_type)
-      "#{join_type.to_s.gsub('_', ' ').upcase} JOIN"
+      "#{join_type.to_s.gsub(UNDERSCORE, SPACE).upcase} JOIN"
     end
 
     # Whether this dataset is a joined dataset
@@ -648,8 +994,12 @@ module Sequel
     end
 
     # SQL fragment for Array.  Treats as an expression if an array of all two pairs, or as a SQL array otherwise.
-    def literal_array(v)
-      Sequel.condition_specifier?(v) ? literal_expression(SQL::BooleanExpression.from_value_pairs(v)) : array_sql(v)
+    def literal_array_append(sql, v)
+      if Sequel.condition_specifier?(v)
+        literal_expression_append(sql, SQL::BooleanExpression.from_value_pairs(v))
+      else
+        array_sql_append(sql, v)
+      end
     end
 
     # SQL fragment for BigDecimal
@@ -659,18 +1009,24 @@ module Sequel
     end
 
     # SQL fragment for SQL::Blob
-    def literal_blob(v)
-      literal_string(v)
+    def literal_blob_append(sql, v)
+      literal_string_append(sql, v)
     end
 
     # SQL fragment for Dataset.  Does a subselect inside parantheses.
-    def literal_dataset(v)
-      "(#{subselect_sql(v)})"
+    def literal_dataset_append(sql, v)
+      sql << PAREN_OPEN
+      subselect_sql_append(sql, v)
+      sql << PAREN_CLOSE
     end
 
     # SQL fragment for Date, using the ISO8601 format.
     def literal_date(v)
-      v.strftime("#{'DATE ' if requires_sql_standard_datetimes?}'%Y-%m-%d'")
+      if requires_sql_standard_datetimes?
+        v.strftime(FORMAT_DATE_STANDARD)
+      else
+        v.strftime(FORMAT_DATE)
+      end
     end
 
     # SQL fragment for DateTime
@@ -679,8 +1035,8 @@ module Sequel
     end
 
     # SQL fragment for SQL::Expression, result depends on the specific type of expression.
-    def literal_expression(v)
-      v.to_s(self)
+    def literal_expression_append(sql, v)
+      v.to_s_append(self, sql)
     end
 
     # SQL fragment for false
@@ -694,8 +1050,8 @@ module Sequel
     end
 
     # SQL fragment for Hash, treated as an expression
-    def literal_hash(v)
-      literal_expression(SQL::BooleanExpression.from_value_pairs(v))
+    def literal_hash_append(sql, v)
+      literal_expression_append(sql, SQL::BooleanExpression.from_value_pairs(v))
     end
 
     # SQL fragment for Integer
@@ -714,17 +1070,24 @@ module Sequel
     # provided and should add that method to Sequel::Dataset, allowing for adapters
     # to provide customized literalizations.
     # If a database specific type is allowed, this should be overriden in a subclass.
-    def literal_other(v)
-      if v.respond_to?(:sql_literal)
-        v.sql_literal(self)
+    def literal_other_append(sql, v)
+      if v.respond_to?(:sql_literal_append)
+        v.sql_literal_append(self, sql)
+      elsif v.respond_to?(:sql_literal)
+        sql << v.sql_literal(self)
       else
         raise Error, "can't express #{v.inspect} as a SQL literal"
       end
     end
 
+    # SQL fragment for Sequel::SQLTime, containing just the time part
+    def literal_sqltime(v)
+      v.strftime("'%H:%M:%S#{format_timestamp_usec(v.usec) if supports_timestamp_usecs?}'")
+    end
+
     # SQL fragment for String.  Doubles \ and ' by default.
-    def literal_string(v)
-      "'#{v.gsub(/\\/, "\\\\\\\\").gsub(/'/, "''")}'"
+    def literal_string_append(sql, v)
+      sql << APOS << v.gsub(BACKSLASH_RE, QUAD_BACKSLASH).gsub(APOS_RE, DOUBLE_APOS) << APOS
     end
 
     # Converts a symbol into a column name. This method supports underscore
@@ -735,10 +1098,14 @@ module Sequel
     #   dataset.literal(:abc___a) #=> "abc AS a"
     #   dataset.literal(:items__abc) #=> "items.abc"
     #   dataset.literal(:items__abc___a) #=> "items.abc AS a"
-    def literal_symbol(v)
+    def literal_symbol_append(sql, v)
       c_table, column, c_alias = split_symbol(v)
-      qc = "#{"#{quote_identifier(c_table)}." if c_table}#{quote_identifier(column)}"
-      c_alias ? as_sql(qc, c_alias) : qc
+      if c_table
+        quote_identifier_append(sql, c_table)
+        sql << DOT
+      end
+      quote_identifier_append(sql, column)
+      as_sql_append(sql, c_alias) if c_alias
     end
 
     # SQL fragment for Time
@@ -774,59 +1141,7 @@ module Sequel
     
     # Qualify the given expression e to the given table.
     def qualified_expression(e, table)
-      case e
-      when Symbol
-        t, column, aliaz = split_symbol(e)
-        if t
-          e
-        elsif aliaz
-          SQL::AliasedExpression.new(SQL::QualifiedIdentifier.new(table, SQL::Identifier.new(column)), aliaz)
-        else
-          SQL::QualifiedIdentifier.new(table, e)
-        end
-      when Array
-        e.map{|a| qualified_expression(a, table)}
-      when Hash
-        h = {}
-        e.each{|k,v| h[qualified_expression(k, table)] = qualified_expression(v, table)}
-        h
-      when SQL::Identifier
-        SQL::QualifiedIdentifier.new(table, e)
-      when SQL::OrderedExpression
-        SQL::OrderedExpression.new(qualified_expression(e.expression, table), e.descending, :nulls=>e.nulls)
-      when SQL::AliasedExpression
-        SQL::AliasedExpression.new(qualified_expression(e.expression, table), e.aliaz)
-      when SQL::CaseExpression
-        args = [qualified_expression(e.conditions, table), qualified_expression(e.default, table)]
-        args << qualified_expression(e.expression, table) if e.expression?
-        SQL::CaseExpression.new(*args)
-      when SQL::Cast
-        SQL::Cast.new(qualified_expression(e.expr, table), e.type)
-      when SQL::Function
-        SQL::Function.new(e.f, *qualified_expression(e.args, table))
-      when SQL::ComplexExpression 
-        SQL::ComplexExpression.new(e.op, *qualified_expression(e.args, table))
-      when SQL::Subscript 
-        SQL::Subscript.new(qualified_expression(e.f, table), qualified_expression(e.sub, table))
-      when SQL::WindowFunction
-        SQL::WindowFunction.new(qualified_expression(e.function, table), qualified_expression(e.window, table))
-      when SQL::Window
-        o = e.opts.dup
-        o[:partition] = qualified_expression(o[:partition], table) if o[:partition]
-        o[:order] = qualified_expression(o[:order], table) if o[:order]
-        SQL::Window.new(o)
-      when SQL::PlaceholderLiteralString
-        args = if e.args.is_a?(Hash)
-          h = {}
-          e.args.each{|k,v| h[k] = qualified_expression(v, table)}
-          h
-        else
-          qualified_expression(e.args, table)
-        end
-        SQL::PlaceholderLiteralString.new(e.str, args, e.parens)
-      else
-        e
-      end
+      Qualifier.new(self, table).transform(e)
     end
 
     # The order of methods to call to build the SELECT SQL statement
@@ -836,13 +1151,19 @@ module Sequel
 
     # Modify the sql to add the columns selected
     def select_columns_sql(sql)
-      sql << " #{column_list(@opts[:select])}"
+      sql << SPACE
+      column_list_append(sql, @opts[:select])
     end
 
     # Modify the sql to add the DISTINCT modifier
     def select_distinct_sql(sql)
       if distinct = @opts[:distinct]
-        sql << " DISTINCT#{" ON (#{expression_list(distinct)})" unless distinct.empty?}"
+        sql << DISTINCT
+        unless distinct.empty?
+          sql << ON_PAREN
+          expression_list_append(sql, distinct)
+          sql << PAREN_CLOSE
+        end
       end
     end
 
@@ -850,60 +1171,94 @@ module Sequel
     # This uses a subselect for the compound datasets used, because using parantheses doesn't
     # work on all databases.  I consider this an ugly hack, but can't I think of a better default.
     def select_compounds_sql(sql)
-      return unless @opts[:compounds]
-      @opts[:compounds].each do |type, dataset, all|
-        compound_sql = subselect_sql(dataset)
-        sql << " #{type.to_s.upcase}#{' ALL' if all} #{compound_sql}"
+      return unless c = @opts[:compounds]
+      c.each do |type, dataset, all|
+        sql << SPACE << type.to_s.upcase
+        sql << ALL if all
+        sql << SPACE
+        compound_dataset_sql_append(sql, dataset)
       end
     end
 
     # Modify the sql to add the list of tables to select FROM
     def select_from_sql(sql)
-      sql << " FROM #{source_list(@opts[:from])}" if @opts[:from]
+      if f = @opts[:from]
+        sql << FROM
+        source_list_append(sql, f)
+      end
     end
     alias delete_from_sql select_from_sql
 
     # Modify the sql to add the expressions to GROUP BY
     def select_group_sql(sql)
-      sql << " GROUP BY #{expression_list(@opts[:group])}" if @opts[:group]
+      if group = @opts[:group]
+        sql << GROUP_BY
+        if go = @opts[:group_options]
+          sql << go.to_s.upcase
+          sql << PAREN_OPEN
+        end
+        expression_list_append(sql, group)
+        sql << PAREN_CLOSE if go
+      end
     end
 
     # Modify the sql to add the filter criteria in the HAVING clause
     def select_having_sql(sql)
-      sql << " HAVING #{literal(@opts[:having])}" if @opts[:having]
+      if having = @opts[:having]
+        sql << HAVING
+        literal_append(sql, having)
+      end
     end
 
     # Modify the sql to add the list of tables to JOIN to
     def select_join_sql(sql)
-      @opts[:join].each{|j| sql << literal(j)} if @opts[:join]
+      if js = @opts[:join]
+        js.each{|j| literal_append(sql, j)}
+      end
     end
 
     # Modify the sql to limit the number of rows returned and offset
     def select_limit_sql(sql)
-      sql << " LIMIT #{literal(@opts[:limit])}" if @opts[:limit]
-      sql << " OFFSET #{literal(@opts[:offset])}" if @opts[:offset]
+      if l = @opts[:limit]
+        sql << LIMIT
+        literal_append(sql, l)
+      end
+      if o = @opts[:offset]
+        sql << OFFSET
+        literal_append(sql, o)
+      end
     end
   
     # Modify the sql to support the different types of locking modes.
     def select_lock_sql(sql)
-      case @opts[:lock]
+      case l = @opts[:lock]
       when :update
         sql << FOR_UPDATE
       when String
-        sql << " #{@opts[:lock]}"
+        sql << SPACE << l
       end
     end
 
     # Modify the sql to add the expressions to ORDER BY
     def select_order_sql(sql)
-      sql << " ORDER BY #{expression_list(@opts[:order])}" if @opts[:order]
+      if o = @opts[:order]
+        sql << ORDER_BY
+        expression_list_append(sql, o)
+      end
     end
     alias delete_order_sql select_order_sql
     alias update_order_sql select_order_sql
 
+    def select_select_sql(sql)
+      sql << SELECT
+    end
+
     # Modify the sql to add the filter criteria in the WHERE clause
     def select_where_sql(sql)
-      sql << " WHERE #{literal(@opts[:where])}" if @opts[:where]
+      if w = @opts[:where]
+        sql << WHERE
+        literal_append(sql, w)
+      end
     end
     alias delete_where_sql select_where_sql
     alias update_where_sql select_where_sql
@@ -912,8 +1267,26 @@ module Sequel
     def select_with_sql(sql)
       ws = opts[:with]
       return if !ws || ws.empty?
-      sql.replace("#{select_with_sql_base}#{ws.map{|w| "#{quote_identifier(w[:name])}#{"(#{argument_list(w[:args])})" if w[:args]} AS #{literal_dataset(w[:dataset])}"}.join(COMMA_SEPARATOR)} #{sql}")
+      sql << select_with_sql_base
+      c = false
+      comma = COMMA
+      ws.each do |w|
+        sql << comma if c
+        quote_identifier_append(sql, w[:name])
+        if args = w[:args]
+         sql << PAREN_OPEN
+         argument_list_append(sql, args)
+         sql << PAREN_CLOSE
+        end
+        sql << AS
+        literal_dataset_append(sql, w[:dataset])
+        c ||= true
+      end
+      sql << SPACE
     end
+    alias delete_with_sql select_with_sql
+    alias insert_with_sql select_with_sql
+    alias update_with_sql select_with_sql
     
     # The base keyword to use for the SQL WITH clause
     def select_with_sql_base
@@ -921,9 +1294,15 @@ module Sequel
     end
 
     # Converts an array of source names into into a comma separated list.
-    def source_list(source)
-      raise(Error, 'No source specified for query') if source.nil? || source.empty?
-      source.map{|s| table_ref(s)}.join(COMMA_SEPARATOR)
+    def source_list_append(sql, sources)
+      raise(Error, 'No source specified for query') if sources.nil? || sources == []
+      c = false
+      co = COMMA
+      sources.each do |s|
+        sql << co if c
+        table_ref_append(sql, s)
+        c ||= true
+      end
     end
     
     # Splits the symbol into three parts.  Each part will
@@ -932,13 +1311,13 @@ module Sequel
     # For columns, these parts are the table, column, and alias.
     # For tables, these parts are the schema, table, and alias.
     def split_symbol(sym)
-      s = sym.to_s
-      if m = COLUMN_REF_RE1.match(s)
-        [m[1], m[3], m[5]]
-      elsif m = COLUMN_REF_RE2.match(s)
-        [nil, m[1], m[3]]
-      elsif m = COLUMN_REF_RE3.match(s)
-        [m[1], m[3], nil]
+      case s = sym.to_s
+      when COLUMN_REF_RE1
+        [$1, $2, $3]
+      when COLUMN_REF_RE2
+        [nil, $1, $2]
+      when COLUMN_REF_RE3
+        [$1, $2, nil]
       else
         [nil, s, nil]
       end
@@ -948,18 +1327,35 @@ module Sequel
     # can be a PlaceholderLiteralString in addition to a String,
     # we literalize nonstrings.
     def static_sql(sql)
-      sql.is_a?(String) ? sql : literal(sql)
+      if append_sql = @opts[:append_sql]
+        if sql.is_a?(String)
+          append_sql << sql
+        else
+          literal_append(append_sql, sql)
+        end
+      else
+        if sql.is_a?(String)
+          sql
+        else
+          literal(sql)
+        end
+      end
     end
 
     # SQL fragment for a subselect using the given database's SQL.
-    def subselect_sql(ds)
-      ds.sql
+    def subselect_sql_append(sql, ds)
+      ds.clone(:append_sql=>sql).sql
     end
 
     # SQL fragment specifying a table name.
-    def table_ref(t)
-      t.is_a?(String) ? quote_identifier(t) : literal(t)
+    def table_ref_append(sql, t)
+      if t.is_a?(String)
+        quote_identifier_append(sql, t)
+      else
+        literal_append(sql, t)
+      end
     end
+    alias identifier_append table_ref_append
     
     # The order of methods to call to build the UPDATE SQL statement
     def update_clause_methods
@@ -969,25 +1365,38 @@ module Sequel
     # SQL fragment specifying the tables from with to delete.
     # Includes join table if modifying joins is allowed.
     def update_table_sql(sql)
-      sql << " #{source_list(@opts[:from])}"
+      sql << SPACE
+      source_list_append(sql, @opts[:from])
       select_join_sql(sql) if supports_modifying_joins?
     end
 
     # The SQL fragment specifying the columns and values to SET.
     def update_set_sql(sql)
       values = opts[:values]
-      set = if values.is_a?(Hash)
+      sql << SET
+      if values.is_a?(Hash)
         values = opts[:defaults].merge(values) if opts[:defaults]
         values = values.merge(opts[:overrides]) if opts[:overrides]
-        # get values from hash
-        values.map do |k, v|
-          "#{k.is_a?(String) && !k.is_a?(LiteralString) ? quote_identifier(k) : literal(k)} = #{literal(v)}"
-        end.join(COMMA_SEPARATOR)
+        c = false
+        eq = EQUAL
+        values.each do |k, v|
+          sql << COMMA if c
+          if k.is_a?(String) && !k.is_a?(LiteralString)
+            quote_identifier_append(sql, k)
+          else
+            literal_append(sql, k)
+          end
+          sql << eq
+          literal_append(sql, v)
+          c ||= true
+        end
       else
-        # copy values verbatim
-        values
+        sql << values
       end
-      sql << " SET #{set}"
+    end
+
+    def update_update_sql(sql)
+      sql << UPDATE
     end
   end
 end