sequel 4.26.0 → 5.37.0

data/lib/sequel/dataset/sql.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 module Sequel
   class Dataset
     # ---------------------
@@ -15,7 +17,7 @@ module Sequel
     
     # Returns an INSERT SQL query string.  See +insert+.
     #
-    #   DB[:items].insert_sql(:a=>1)
+    #   DB[:items].insert_sql(a: 1)
     #   # => "INSERT INTO items (a) VALUES (1)"
     def insert_sql(*values)
       return static_sql(@opts[:sql]) if @opts[:sql]
@@ -26,9 +28,9 @@ module Sequel
 
       case values.size
       when 0
-        return insert_sql({})
+        return insert_sql(OPTS)
       when 1
-        case vals = values.at(0)
+        case vals = values[0]
         when Hash
           values = []
           vals.each do |k,v| 
@@ -39,19 +41,21 @@ module Sequel
           values = vals
         end
       when 2
-        if (v0 = values.at(0)).is_a?(Array) && ((v1 = values.at(1)).is_a?(Array) || v1.is_a?(Dataset) || v1.is_a?(LiteralString))
+        if (v0 = values[0]).is_a?(Array) && ((v1 = values[1]).is_a?(Array) || v1.is_a?(Dataset) || v1.is_a?(LiteralString))
           columns, values = v0, v1
           raise(Error, "Different number of values and columns given to insert_sql") if values.is_a?(Array) and columns.length != values.length
         end
       end
 
       if values.is_a?(Array) && values.empty? && !insert_supports_empty_values? 
-        columns = [columns().last]
-        values = [DEFAULT]
+        columns, values = insert_empty_columns_values
+      elsif values.is_a?(Dataset) && hoist_cte?(values) && supports_cte?(:insert)
+        ds, values = hoist_cte(values)
+        return ds.clone(:columns=>columns, :values=>values).send(:_insert_sql)
       end
       clone(:columns=>columns, :values=>values).send(:_insert_sql)
     end
-    
+
     # Append a literal representation of a value to the given SQL string.
     # 
     # If an unsupported object is given, an +Error+ is raised.
@@ -62,7 +66,7 @@ module Sequel
           literal_symbol_append(sql, v)
         else 
           unless l = db.literal_symbol(v)
-            l = ''
+            l = String.new
             literal_symbol_append(l, v)
             db.literal_symbol_set(v, l)
           end
@@ -111,9 +115,6 @@ module Sequel
     # Returns an array of insert statements for inserting multiple records.
     # This method is used by +multi_insert+ to format insert statements and
     # expects a keys array and and an array of value arrays.
-    #
-    # This method should be overridden by descendants if the support
-    # inserting multiple records in a single SQL statement.
     def multi_insert_sql(columns, values)
       case multi_insert_sql_strategy
       when :values
@@ -122,14 +123,14 @@ module Sequel
         [insert_sql(columns, sql)]
       when :union
         c = false
-        sql = LiteralString.new('')
-        u = UNION_ALL_SELECT
+        sql = LiteralString.new
+        u = ' UNION ALL SELECT '
         f = empty_from_sql
         values.each do |v|
           if c
             sql << u
           else
-            sql << SELECT << SPACE
+            sql << 'SELECT '
             c = true
           end
           expression_list_append(sql, v)
@@ -154,8 +155,9 @@ module Sequel
         static_sql(opts[:sql])
       else
         check_truncation_allowed!
+        check_not_limited!(:truncate)
         raise(InvalidOperation, "Can't truncate filtered datasets") if opts[:where] || opts[:having]
-        t = ''
+        t = String.new
         source_list_append(t, opts[:from])
         _truncate_sql(t)
       end
@@ -163,7 +165,7 @@ module Sequel
 
     # Formats an UPDATE statement using the given values.  See +update+.
     #
-    #   DB[:items].update_sql(:price => 100, :category => 'software')
+    #   DB[:items].update_sql(price: 100, category: 'software')
     #   # => "UPDATE items SET price = 100, category = 'software'
     #
     # Raises an +Error+ if the dataset is grouped or includes more
@@ -171,6 +173,15 @@ module Sequel
     def update_sql(values = OPTS)
       return static_sql(opts[:sql]) if opts[:sql]
       check_modification_allowed!
+      check_not_limited!(:update)
+
+      case values
+      when LiteralString
+        # nothing
+      when String
+        raise Error, "plain string passed to Dataset#update is not supported, use Sequel.lit to use a literal string"
+      end
+
       clone(:values=>values).send(:_update_sql)
     end
     
@@ -197,12 +208,14 @@ module Sequel
     #            being an array of symbol/strings for the appropriate branch.
     def self.def_sql_method(mod, type, clauses)
       priv = type == :update || type == :insert
+      cacheable = type == :select || type == :delete
 
       lines = []
       lines << 'private' if priv
       lines << "def #{'_' if priv}#{type}_sql"
       lines << 'if sql = opts[:sql]; return static_sql(sql) end' unless priv
-      lines << 'check_modification_allowed!' if type == :delete
+      lines << "if sql = cache_get(:_#{type}_sql); return sql end" if cacheable
+      lines << 'check_modification_allowed!' << 'check_not_limited!(:delete)' if type == :delete
       lines << 'sql = @opts[:append_sql] || sql_string_origin'
 
       if clauses.all?{|c| c.is_a?(Array)}
@@ -215,6 +228,7 @@ module Sequel
         lines.concat(clause_methods(type, clauses).map{|x| "#{x}(sql)"})
       end
 
+      lines << "cache_set(:_#{type}_sql, sql) if cache_sql?" if cacheable
       lines << 'sql'
       lines << 'end'
 
@@ -226,121 +240,26 @@ module Sequel
     def_sql_method(self, :select, %w'with select distinct columns from join where group having compounds order limit lock')
     def_sql_method(self, :update, %w'update table set where')
 
-    # Map of emulated function names to native function names.
-    EMULATED_FUNCTION_MAP = {}
-
     WILDCARD = LiteralString.new('*').freeze
-    ALL = ' ALL'.freeze
-    AND_SEPARATOR = " AND ".freeze
-    APOS = "'".freeze
-    APOS_RE = /'/.freeze
-    ARRAY_EMPTY = '(NULL)'.freeze
-    AS = ' AS '.freeze
-    ASC = ' ASC'.freeze
-    BACKSLASH = "\\".freeze
-    BITCOMP_CLOSE = ") - 1)".freeze
-    BITCOMP_OPEN = "((0 - ".freeze
-    BITWISE_METHOD_MAP = {:& =>:BITAND, :| => :BITOR, :^ => :BITXOR}
-    BOOL_FALSE = "'f'".freeze
-    BOOL_TRUE = "'t'".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
-    COLON = ':'.freeze
-    COLUMN_REF_RE1 = Sequel::COLUMN_REF_RE1
-    COLUMN_REF_RE2 = Sequel::COLUMN_REF_RE2
-    COLUMN_REF_RE3 = Sequel::COLUMN_REF_RE3
-    COMMA = ', '.freeze
-    COMMA_SEPARATOR = COMMA
-    CONDITION_FALSE = '(1 = 0)'.freeze
-    CONDITION_TRUE = '(1 = 1)'.freeze
-    COUNT_FROM_SELF_OPTS = [:distinct, :group, :sql, :limit, :offset, :compounds]
     COUNT_OF_ALL_AS_COUNT = SQL::Function.new(:count, WILDCARD).as(:count)
-    DATASET_ALIAS_BASE_NAME = 't'.freeze
     DEFAULT = LiteralString.new('DEFAULT').freeze
-    DEFAULT_VALUES = " DEFAULT VALUES".freeze
-    DELETE = 'DELETE'.freeze
-    DESC = ' DESC'.freeze
-    DISTINCT = " DISTINCT".freeze
-    DOT = '.'.freeze
-    DOUBLE_APOS = "''".freeze
-    DOUBLE_QUOTE = '""'.freeze
-    EQUAL = ' = '.freeze
-    EMPTY_PARENS = '()'.freeze
-    ESCAPE = " ESCAPE ".freeze
-    EXTRACT = 'extract('.freeze
+
     EXISTS = ['EXISTS '.freeze].freeze
-    FILTER = " FILTER (WHERE ".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_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_DISTINCT = "DISTINCT ".freeze
-    GROUP_BY = " GROUP BY ".freeze
-    HAVING = " HAVING ".freeze
-    INSERT = "INSERT".freeze
-    INTO = " INTO ".freeze
+    BITWISE_METHOD_MAP = {:& =>:BITAND, :| => :BITOR, :^ => :BITXOR}.freeze
+    COUNT_FROM_SELF_OPTS = [:distinct, :group, :sql, :limit, :offset, :compounds].freeze
     IS_LITERALS = {nil=>'NULL'.freeze, true=>'TRUE'.freeze, false=>'FALSE'.freeze}.freeze
+    QUALIFY_KEYS = [:select, :where, :having, :order, :group].freeze
+
     IS_OPERATORS = ::Sequel::SQL::ComplexExpression::IS_OPERATORS
-    LATERAL = 'LATERAL '.freeze
     LIKE_OPERATORS = ::Sequel::SQL::ComplexExpression::LIKE_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
-    QUALIFY_KEYS = [:select, :where, :having, :order, :group]
-    QUESTION_MARK = '?'.freeze
-    QUESTION_MARK_RE = /\?/.freeze
-    QUOTE = '"'.freeze
-    QUOTE_RE = /"/.freeze
-    RETURNING = " RETURNING ".freeze
-    SELECT = 'SELECT'.freeze
-    SET = ' SET '.freeze
-    SPACE = ' '.freeze
-    SQL_WITH = "WITH ".freeze
-    SPACE_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
     REGEXP_OPERATORS = ::Sequel::SQL::ComplexExpression::REGEXP_OPERATORS
-    UNDERSCORE = '_'.freeze
-    UPDATE = 'UPDATE'.freeze
-    USING = ' USING ('.freeze
-    UNION_ALL_SELECT = ' UNION ALL SELECT '.freeze
-    VALUES = " VALUES ".freeze
-    WHERE = " WHERE ".freeze
-    WITH_ORDINALITY = " WITH ORDINALITY".freeze
-    WITHIN_GROUP = " WITHIN GROUP (ORDER BY ".freeze
-
-    DATETIME_SECFRACTION_ARG = RUBY_VERSION >= '1.9.0' ? 1000000 : 86400000000
 
     [:literal, :quote_identifier, :quote_schema_table].each do |meth|
       class_eval(<<-END, __FILE__, __LINE__ + 1)
         def #{meth}(*args, &block)
-          s = ''
+          s = ''.dup
           #{meth}_append(s, *args, &block)
           s
         end
@@ -356,18 +275,18 @@ module Sequel
     # Append literalization of array to SQL string.
     def array_sql_append(sql, a)
       if a.empty?
-        sql << ARRAY_EMPTY
+        sql << '(NULL)'
       else
-        sql << PAREN_OPEN
+        sql << '('
         expression_list_append(sql, a)
-        sql << PAREN_CLOSE
+        sql << ')'
       end
     end
 
     # Append literalization of boolean constant to SQL string.
     def boolean_constant_sql_append(sql, constant)
       if (constant == true || constant == false) && !supports_where_true?
-        sql << (constant == true ? CONDITION_TRUE : CONDITION_FALSE)
+        sql << (constant == true ? '(1 = 1)' : '(1 = 0)')
       else
         literal_append(sql, constant)
       end
@@ -375,30 +294,30 @@ module Sequel
 
     # Append literalization of case expression to SQL string.
     def case_expression_sql_append(sql, ce)
-      sql << CASE_OPEN
+      sql << '(CASE'
       if ce.expression?
-        sql << SPACE
+        sql << ' '
         literal_append(sql, ce.expression)
       end
-      w = CASE_WHEN
-      t = CASE_THEN
+      w = " WHEN "
+      t = " THEN "
       ce.conditions.each do |c,r|
         sql << w
         literal_append(sql, c)
         sql << t
         literal_append(sql, r)
       end
-      sql << CASE_ELSE
+      sql << " ELSE "
       literal_append(sql, ce.default)
-      sql << CASE_END
+      sql << " END)"
     end
 
     # Append literalization of cast expression to SQL string.
     def cast_sql_append(sql, expr, type)
-      sql << CAST_OPEN
+      sql << 'CAST('
       literal_append(sql, expr)
-      sql << AS << db.cast_type_literal(type).to_s
-      sql << PAREN_CLOSE
+      sql << ' AS ' << db.cast_type_literal(type).to_s
+      sql << ')'
     end
 
     # Append literalization of column all selection to SQL string.
@@ -410,21 +329,21 @@ module Sequel
     def complex_expression_sql_append(sql, op, args)
       case op
       when *IS_OPERATORS
-        r = args.at(1)
+        r = args[1]
         if r.nil? || supports_is_true?
           raise(InvalidOperation, 'Invalid argument used for IS operator') unless val = IS_LITERALS[r]
-          sql << PAREN_OPEN
-          literal_append(sql, args.at(0))
-          sql << SPACE << op.to_s << SPACE
-          sql << val << PAREN_CLOSE
+          sql << '('
+          literal_append(sql, args[0])
+          sql << ' ' << op.to_s << ' '
+          sql << val << ')'
         elsif op == :IS
           complex_expression_sql_append(sql, :"=", args)
         else
-          complex_expression_sql_append(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[0], nil)])
         end
       when :IN, :"NOT IN"
-        cols = args.at(0)
-        vals = args.at(1)
+        cols = args[0]
+        vals = args[1]
         col_array = true if cols.is_a?(Array)
         if vals.is_a?(Array)
           val_array = true
@@ -448,44 +367,48 @@ module Sequel
             # 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.
-            sql << PAREN_OPEN
+            sql << '('
             literal_append(sql, cols)
-            sql << SPACE << op.to_s << SPACE
+            sql << ' ' << op.to_s << ' '
             if val_array
               array_sql_append(sql, vals)
             else
               literal_append(sql, vals)
             end
-            sql << PAREN_CLOSE
+            sql << ')'
           end
         else
-          sql << PAREN_OPEN
+          sql << '('
           literal_append(sql, cols)
-          sql << SPACE << op.to_s << SPACE
+          sql << ' ' << op.to_s << ' '
           literal_append(sql, vals)
-          sql << PAREN_CLOSE
+          sql << ')'
         end
       when :LIKE, :'NOT LIKE'
-        sql << PAREN_OPEN
-        literal_append(sql, args.at(0))
-        sql << SPACE << op.to_s << SPACE
-        literal_append(sql, args.at(1))
-        sql << ESCAPE
-        literal_append(sql, BACKSLASH)
-        sql << PAREN_CLOSE
+        sql << '('
+        literal_append(sql, args[0])
+        sql << ' ' << op.to_s << ' '
+        literal_append(sql, args[1])
+        if requires_like_escape?
+          sql << " ESCAPE "
+          literal_append(sql, "\\")
+        end
+        sql << ')'
       when :ILIKE, :'NOT ILIKE'
         complex_expression_sql_append(sql, (op == :ILIKE ? :LIKE : :"NOT LIKE"), args.map{|v| Sequel.function(:UPPER, v)})
+      when :**
+        function_sql_append(sql, Sequel.function(:power, *args))
       when *TWO_ARITY_OPERATORS
         if REGEXP_OPERATORS.include?(op) && !supports_regexp?
           raise InvalidOperation, "Pattern matching via regular expressions is not supported on #{db.database_type}"
         end
-        sql << PAREN_OPEN
-        literal_append(sql, args.at(0))
-        sql << SPACE << op.to_s << SPACE
-        literal_append(sql, args.at(1))
-        sql << PAREN_CLOSE
+        sql << '('
+        literal_append(sql, args[0])
+        sql << ' ' << op.to_s << ' '
+        literal_append(sql, args[1])
+        sql << ')'
       when *N_ARITY_OPERATORS
-        sql << PAREN_OPEN
+        sql << '('
         c = false
         op_str = " #{op} "
         args.each do |a|
@@ -493,19 +416,19 @@ module Sequel
           literal_append(sql, a)
           c ||= true
         end
-        sql << PAREN_CLOSE
+        sql << ')'
       when :NOT
-        sql << NOT_SPACE
-        literal_append(sql, args.at(0))
+        sql << 'NOT '
+        literal_append(sql, args[0])
       when :NOOP
-        literal_append(sql, args.at(0))
+        literal_append(sql, args[0])
       when :'B~'
-        sql << TILDE
-        literal_append(sql, args.at(0))
+        sql << '~'
+        literal_append(sql, args[0])
       when :extract
-        sql << EXTRACT << args.at(0).to_s << FROM
-        literal_append(sql, args.at(1))
-        sql << PAREN_CLOSE
+        sql << 'extract(' << args[0].to_s << ' FROM '
+        literal_append(sql, args[1])
+        sql << ')'
       else
         raise(InvalidOperation, "invalid operator #{op}")
       end
@@ -519,6 +442,11 @@ module Sequel
     # Append literalization of delayed evaluation to SQL string,
     # causing the delayed evaluation proc to be evaluated.
     def delayed_evaluation_sql_append(sql, delay)
+      # Delayed evaluations are used specifically so the SQL
+      # can differ in subsequent calls, so we definitely don't
+      # want to cache the sql in this case.
+      disable_sql_caching!
+
       if recorder = @opts[:placeholder_literalizer]
         recorder.use(sql, lambda{delay.call(self)}, nil)
       else
@@ -540,11 +468,11 @@ module Sequel
         name = native_function_name(name) 
       end
 
-      sql << LATERAL if opts[:lateral]
+      sql << 'LATERAL ' if opts[:lateral]
 
       case name
       when SQL::Identifier
-        if supports_quoted_function_names? && opts[:quoted] != false
+        if supports_quoted_function_names? && opts[:quoted]
           literal_append(sql, name)
         else
           sql << name.value.to_s
@@ -553,7 +481,7 @@ module Sequel
         if supports_quoted_function_names? && opts[:quoted] != false
           literal_append(sql, name)
         else
-          sql << split_qualifiers(name).join(DOT)
+          sql << split_qualifiers(name).join('.')
         end
       else
         if supports_quoted_function_names? && opts[:quoted]
@@ -563,34 +491,51 @@ module Sequel
         end
       end
 
-      sql << PAREN_OPEN
+      sql << '('
+      if filter = opts[:filter]
+        filter = filter_expr(filter, &opts[:filter_block])
+      end
       if opts[:*]
-        sql << WILDCARD
+        if filter && !supports_filtered_aggregates?
+          literal_append(sql, Sequel.case({filter=>1}, nil))
+          filter = nil
+        else
+          sql <<  '*'
+        end
       else
-        sql << FUNCTION_DISTINCT if opts[:distinct]
-        expression_list_append(sql, f.args)
+        sql << "DISTINCT " if opts[:distinct]
+        if filter && !supports_filtered_aggregates?
+          expression_list_append(sql, f.args.map{|arg| Sequel.case({filter=>arg}, nil)})
+          filter = nil
+        else
+          expression_list_append(sql, f.args)
+        end
+        if order = opts[:order]
+          sql << " ORDER BY "
+          expression_list_append(sql, order)
+        end
       end
-      sql << PAREN_CLOSE
+      sql << ')'
 
       if group = opts[:within_group]
-        sql << WITHIN_GROUP
+        sql << " WITHIN GROUP (ORDER BY "
         expression_list_append(sql, group)
-        sql << PAREN_CLOSE
+        sql << ')'
       end
 
-      if filter = opts[:filter]
-        sql << FILTER
-        literal_append(sql, filter_expr(filter, &opts[:filter_block]))
-        sql << PAREN_CLOSE
+      if filter
+        sql << " FILTER (WHERE "
+        literal_append(sql, filter)
+        sql << ')'
       end
 
       if window = opts[:over]
-        sql << OVER
+        sql << ' OVER '
         window_sql_append(sql, window.opts)
       end
 
       if opts[:with_ordinality]
-        sql << WITH_ORDINALITY
+        sql << " WITH ORDINALITY"
       end
     end
 
@@ -599,7 +544,7 @@ module Sequel
       table = jc.table
       table_alias = jc.table_alias
       table_alias = nil if table == table_alias && !jc.column_aliases
-      sql << SPACE << join_type_sql(jc.join_type) << SPACE
+      sql << ' ' << join_type_sql(jc.join_type) << ' '
       identifier_append(sql, table)
       as_sql_append(sql, table_alias, jc.column_aliases) if table_alias
     end
@@ -607,33 +552,50 @@ module Sequel
     # Append literalization of JOIN ON clause to SQL string.
     def join_on_clause_sql_append(sql, jc)
       join_clause_sql_append(sql, jc)
-      sql << ON
+      sql << ' ON '
       literal_append(sql, filter_expr(jc.on))
     end
 
     # Append literalization of JOIN USING clause to SQL string.
     def join_using_clause_sql_append(sql, jc)
       join_clause_sql_append(sql, jc)
-      sql << USING
+      sql << ' USING ('
       column_list_append(sql, jc.using)
-      sql << PAREN_CLOSE
+      sql << ')'
     end
     
     # Append literalization of negative boolean constant to SQL string.
     def negative_boolean_constant_sql_append(sql, constant)
-      sql << NOT_SPACE
+      sql << 'NOT '
       boolean_constant_sql_append(sql, constant)
     end
 
     # Append literalization of ordered expression to SQL string.
     def ordered_expression_sql_append(sql, oe)
+      if emulate = requires_emulating_nulls_first?
+        case oe.nulls
+        when :first
+          null_order = 0
+        when :last
+          null_order = 2
+        end
+
+        if null_order
+          literal_append(sql, Sequel.case({{oe.expression=>nil}=>null_order}, 1))
+          sql << ", "
+        end
+      end
+
       literal_append(sql, oe.expression)
-      sql << (oe.descending ? DESC : ASC)
-      case oe.nulls
-      when :first
-        sql << NULLS_FIRST
-      when :last
-        sql << NULLS_LAST
+      sql << (oe.descending ? ' DESC' : ' ASC')
+
+      unless emulate
+        case oe.nulls
+        when :first
+          sql << " NULLS FIRST"
+        when :last
+          sql << " NULLS LAST"
+        end
       end
     end
 
@@ -641,13 +603,13 @@ module Sequel
     def placeholder_literal_string_sql_append(sql, pls)
       args = pls.args
       str = pls.str
-      sql << PAREN_OPEN if pls.parens
+      sql << '(' if pls.parens
       if args.is_a?(Hash)
         if args.empty?
           sql << str
         else
           re = /:(#{args.keys.map{|k| Regexp.escape(k.to_s)}.join('|')})\b/
-          loop do
+          while true
             previous, q, str = str.partition(re)
             sql << previous
             literal_append(sql, args[($1||q[1..-1].to_s).to_sym]) unless q.empty?
@@ -666,19 +628,19 @@ module Sequel
       else
         i = -1
         match_len = args.length - 1
-        loop do
-          previous, q, str = str.partition(QUESTION_MARK)
+        while true
+          previous, q, str = str.partition('?')
           sql << previous
           literal_append(sql, args.at(i+=1)) unless q.empty?
           if str.empty?
             unless i == match_len
-              raise Error, "Mismatched number of placeholders (#{i+1}) and placeholder arguments (#{args.length}) when using placeholder array"
+              raise Error, "Mismatched number of placeholders (#{i+1}) and placeholder arguments (#{args.length}) when using placeholder string"
             end
             break
           end
         end
       end
-      sql << PAREN_CLOSE if pls.parens
+      sql << ')' if pls.parens
     end
 
     # Append literalization of qualified identifier to SQL string.
@@ -686,7 +648,7 @@ module Sequel
     # column/qualified.  If 2 arguments are given, the 2nd should be an SQL::QualifiedIdentifier.
     def qualified_identifier_sql_append(sql, table, column=(c = table.column; table = table.table; c))
       identifier_append(sql, table)
-      sql << DOT
+      sql << '.'
       identifier_append(sql, column)
     end
 
@@ -713,7 +675,7 @@ module Sequel
       schema, table = schema_and_table(table)
       if schema
         quote_identifier_append(sql, schema)
-        sql << DOT
+        sql << '.'
       end
       quote_identifier_append(sql, table)
     end
@@ -723,7 +685,7 @@ module Sequel
     # should be overridden by subclasses to provide quoting not matching the
     # SQL standard, such as backtick (used by MySQL and SQLite).
     def quoted_identifier_append(sql, name)
-      sql << QUOTE << name.to_s.gsub(QUOTE_RE, DOUBLE_QUOTE) << QUOTE
+      sql << '"' << name.to_s.gsub('"', '""') << '"'
     end
 
     # Split the schema information from the table, returning two strings,
@@ -753,9 +715,9 @@ module Sequel
     # Splits table_name into an array of strings.
     #
     #   ds.split_qualifiers(:s) # ['s']
-    #   ds.split_qualifiers(:t__s) # ['t', 's']
-    #   ds.split_qualifiers(Sequel.qualify(:d, :t__s)) # ['d', 't', 's']
-    #   ds.split_qualifiers(Sequel.qualify(:h__d, :t__s)) # ['h', 'd', 't', 's']
+    #   ds.split_qualifiers(Sequel[:t][:s]) # ['t', 's']
+    #   ds.split_qualifiers(Sequel[:d][:t][:s]) # ['d', 't', 's']
+    #   ds.split_qualifiers(Sequel.qualify(Sequel[:h][:d], Sequel[:t][:s])) # ['h', 'd', 't', 's']
     def split_qualifiers(table_name, *args)
       case table_name
       when SQL::QualifiedIdentifier
@@ -768,59 +730,116 @@ module Sequel
 
     # Append literalization of subscripts (SQL array accesses) to SQL string.
     def subscript_sql_append(sql, s)
-      literal_append(sql, s.f)
-      sql << BRACKET_OPEN
-      if s.sub.length == 1 && (range = s.sub.first).is_a?(Range)
+      case s.expression
+      when Symbol, SQL::Subscript, SQL::Identifier, SQL::QualifiedIdentifier
+        # nothing
+      else
+        wrap_expression = true
+        sql << '('
+      end
+      literal_append(sql, s.expression)
+      if wrap_expression
+        sql << ')['
+      else
+        sql << '['
+      end
+      sub = s.sub
+      if sub.length == 1 && (range = sub.first).is_a?(Range)
         literal_append(sql, range.begin)
-        sql << COLON
+        sql << ':'
         e = range.end
         e -= 1 if range.exclude_end? && e.is_a?(Integer)
         literal_append(sql, e)
       else
         expression_list_append(sql, s.sub)
       end
-      sql << BRACKET_CLOSE
+      sql << ']'
     end
 
     # Append literalization of windows (for window functions) to SQL string.
     def window_sql_append(sql, opts)
       raise(Error, 'This dataset does not support window functions') unless supports_window_functions?
-      sql << PAREN_OPEN
-      window, part, order, frame = opts.values_at(:window, :partition, :order, :frame)
       space = false
-      space_s = SPACE
-      if window
+      space_s = ' '
+
+      sql << '('
+
+      if window = opts[:window]
         literal_append(sql, window)
         space = true
       end
-      if part
+
+      if part = opts[:partition]
         sql << space_s if space
-        sql << PARTITION_BY
+        sql << "PARTITION BY "
         expression_list_append(sql, Array(part))
         space = true
       end
-      if order
+
+      if order = opts[:order]
         sql << space_s if space
-        sql << ORDER_BY_NS
+        sql << "ORDER BY "
         expression_list_append(sql, Array(order))
         space = true
       end
-      case frame
-        when nil
-          # nothing
-        when :all
-          sql << space_s if space
-          sql << FRAME_ALL
-        when :rows
-          sql << space_s if space
-          sql << FRAME_ROWS
-        when String
-          sql << space_s if space
+
+      if frame = opts[:frame]
+        sql << space_s if space
+
+        if frame.is_a?(String)
           sql << frame
         else
-          raise Error, "invalid window frame clause, should be :all, :rows, a string, or nil"
+          case frame
+          when :all
+            frame_type = :rows
+            frame_start = :preceding
+            frame_end = :following
+          when :rows, :range, :groups
+            frame_type = frame
+            frame_start = :preceding
+            frame_end = :current
+          when Hash
+            frame_type = frame[:type]
+            unless frame_type == :rows || frame_type == :range || frame_type == :groups
+              raise Error, "invalid window :frame :type option: #{frame_type.inspect}"
+            end
+            unless frame_start = frame[:start]
+              raise Error, "invalid window :frame :start option: #{frame_start.inspect}"
+            end
+            frame_end = frame[:end]
+            frame_exclude = frame[:exclude]
+          else
+            raise Error, "invalid window :frame option: #{frame.inspect}"
+          end
+
+          sql << frame_type.to_s.upcase << " "
+          sql << 'BETWEEN ' if frame_end
+          window_frame_boundary_sql_append(sql, frame_start, :preceding)
+          if frame_end
+            sql << " AND "
+            window_frame_boundary_sql_append(sql, frame_end, :following)
+          end
+
+          if frame_exclude
+            sql << " EXCLUDE "
+
+            case frame_exclude
+            when :current
+              sql << "CURRENT ROW"
+            when :group
+              sql << "GROUP"
+            when :ties
+              sql << "TIES"
+            when :no_others
+              sql << "NO OTHERS"
+            else
+              raise Error, "invalid window :frame :exclude option: #{frame_exclude.inspect}"
+            end
+          end
+        end
       end
-      sql << PAREN_CLOSE
+
+      sql << ')'
     end
 
     protected
@@ -828,7 +847,7 @@ module Sequel
     # Return a from_self dataset if an order or limit is specified, so it works as expected
     # with UNION, EXCEPT, and INTERSECT clauses.
     def compound_from_self
-      (@opts[:sql] || @opts[:limit] || @opts[:order]) ? from_self : self
+      (@opts[:sql] || @opts[:limit] || @opts[:order] || @opts[:offset]) ? from_self : self
     end
     
     private
@@ -884,34 +903,43 @@ module Sequel
 
     # Append aliasing expression to SQL string.
     def as_sql_append(sql, aliaz, column_aliases=nil)
-      sql << AS
+      sql << ' AS '
       quote_identifier_append(sql, aliaz)
       if column_aliases
         raise Error, "#{db.database_type} does not support derived column lists" unless supports_derived_column_lists?
-        sql << PAREN_OPEN
+        sql << '('
         identifier_list_append(sql, column_aliases)
-        sql << PAREN_CLOSE
+        sql << ')'
       end
     end
     
-    # Raise an InvalidOperation exception if deletion is not allowed
-    # for this dataset
+    # Don't allow caching SQL if specifically marked not to.
+    def cache_sql?
+      !@opts[:no_cache_sql] && !cache_get(:_no_cache_sql)
+    end
+
+    # Raise an InvalidOperation exception if deletion is not allowed for this dataset.
     def check_modification_allowed!
       raise(InvalidOperation, "Grouped datasets cannot be modified") if opts[:group]
       raise(InvalidOperation, "Joined datasets cannot be modified") if !supports_modifying_joins? && joined_dataset?
     end
 
+    # Raise error if the dataset uses limits or offsets.
+    def check_not_limited!(type)
+      return if @opts[:skip_limit_check] && type != :truncate
+      raise InvalidOperation, "Dataset##{type} not supported on datasets with limits or offsets" if opts[:limit] || opts[:offset]
+    end
+
     # Alias of check_modification_allowed!
     def check_truncation_allowed!
       check_modification_allowed!
     end
 
     # Append column list to SQL string.
-    # Converts an array of column names into a comma seperated string of 
-    # column names. If the array is empty, a wildcard (*) is returned.
+    # If the column list is empty, a wildcard (*) is appended.
     def column_list_append(sql, columns)
       if (columns.nil? || columns.empty?)
-        sql << WILDCARD
+        sql << '*'
       else
         expression_list_append(sql, columns)
       end
@@ -924,9 +952,9 @@ module Sequel
     def complex_expression_arg_pairs(args)
       case args.length
       when 1
-        args.at(0)
+        args[0]
       when 2
-        yield args.at(0), args.at(1)
+        yield args[0], args[1]
       else
         args.inject{|m, a| yield(m, a)}
       end
@@ -954,9 +982,9 @@ module Sequel
         f = BITWISE_METHOD_MAP[op]
         complex_expression_arg_pairs_append(sql, args){|a, b| Sequel.function(f, a, b)}
       when :'B~'
-        sql << BITCOMP_OPEN
-        literal_append(sql, args.at(0))
-        sql << BITCOMP_CLOSE
+        sql << "((0 - "
+        literal_append(sql, args[0])
+        sql << ") - 1)"
       end
     end
 
@@ -967,25 +995,30 @@ module Sequel
 
     # 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}"
+      :"t#{number}"
     end
     
     # The strftime format to use when literalizing the time.
     def default_timestamp_format
-      requires_sql_standard_datetimes? ? STANDARD_TIMESTAMP_FORMAT : TIMESTAMP_FORMAT
+      requires_sql_standard_datetimes? ? "TIMESTAMP '%Y-%m-%d %H:%M:%S%N%z'" : "'%Y-%m-%d %H:%M:%S%N%z'"
     end
 
     def delete_delete_sql(sql)
-      sql << DELETE
+      sql << 'DELETE'
     end
 
     def delete_from_sql(sql)
       if f = @opts[:from]
-        sql << FROM
+        sql << ' FROM '
         source_list_append(sql, f)
       end
     end
 
+    # Disable caching of SQL for the current dataset
+    def disable_sql_caching!
+      cache_set(:_no_cache_sql, true)
+    end
+
     # An SQL FROM clause to use in SELECT statements where the dataset has
     # no from tables.
     def empty_from_sql
@@ -998,10 +1031,11 @@ module Sequel
       false
     end
 
-    # Append literalization of array of expressions to SQL string.
+    # Append literalization of array of expressions to SQL string, separating them
+    # with commas.
     def expression_list_append(sql, columns)
       c = false
-      co = COMMA
+      co = ', '
       columns.each do |col|
         sql << co if c
         literal_append(sql, col)
@@ -1009,14 +1043,14 @@ module Sequel
       end
     end
 
-    # Append literalization of array of grouping elements to SQL string.
+    # Append literalization of array of grouping elements to SQL string, seperating them with commas.
     def grouping_element_list_append(sql, columns)
       c = false
-      co = COMMA
+      co = ', '
       columns.each do |col|
         sql << co if c
         if col.is_a?(Array) && col.empty?
-          sql << EMPTY_PARENS
+          sql << '()'
         else
           literal_append(sql, Array(col))
         end
@@ -1035,9 +1069,12 @@ module Sequel
     # of hours and minutes.
     def format_timestamp(v)
       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*(DATETIME_SECFRACTION_ARG) : v.usec) if supports_timestamp_usecs?
+      fmt = default_timestamp_format.gsub(/%[Nz]/) do |m|
+        if m == '%N'
+          # Ruby 1.9 supports %N in timestamp formats, but Sequel has supported %N
+          # for longer in a different way, where the . is already appended and only 6
+          # decimal places are used by default.
+          format_timestamp_usec(v.is_a?(DateTime) ? v.sec_fraction*(1000000) : v.usec) if supports_timestamp_usecs?
         else
           if supports_timestamp_timezones?
             # Would like to just use %z format, but it doesn't appear to work on Windows
@@ -1052,13 +1089,13 @@ module Sequel
     
     # Return the SQL timestamp fragment to use for the timezone offset.
     def format_timestamp_offset(hour, minute)
-      sprintf(FORMAT_OFFSET, hour, minute)
+      sprintf("%+03i%02i", 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)
-      unless (ts = timestamp_precision) == 6
+    def format_timestamp_usec(usec, ts=timestamp_precision)
+      unless ts == 6
         usec = usec/(10 ** (6 - ts))
       end
       sprintf(".%0#{ts}d", usec)
@@ -1084,7 +1121,7 @@ module Sequel
     # Append literalization of array of identifiers to SQL string.
     def identifier_list_append(sql, args)
       c = false
-      comma = COMMA
+      comma = ', '
       args.each do |a|
         sql << comma if c
         identifier_append(sql, a)
@@ -1092,14 +1129,13 @@ module Sequel
       end
     end
 
-    # Modify the identifier returned from the database based on the
-    # identifier_output_method.
+    # Upcase identifiers by default when inputting them into the database.
     def input_identifier(v)
-      (i = identifier_input_method) ? v.to_s.send(i) : v.to_s
+      v.to_s.upcase
     end
 
     def insert_into_sql(sql)
-      sql << INTO
+      sql << " INTO "
       if (f = @opts[:from]) && f.length == 1
         identifier_append(sql, unaliased_identifier(f.first))
       else
@@ -1110,30 +1146,36 @@ module Sequel
     def insert_columns_sql(sql)
       columns = opts[:columns]
       if columns && !columns.empty?
-        sql << PAREN_SPACE_OPEN
+        sql << ' ('
         identifier_list_append(sql, columns)
-        sql << PAREN_CLOSE
+        sql << ')'
       end 
     end
 
+    # The columns and values to use for an empty insert if the database doesn't support
+    # INSERT with DEFAULT VALUES.
+    def insert_empty_columns_values
+      [[columns.last], [DEFAULT]]
+    end
+    
     def insert_insert_sql(sql)
-      sql << INSERT
+      sql << "INSERT"
     end
 
     def insert_values_sql(sql)
       case values = opts[:values]
       when Array
         if values.empty?
-          sql << DEFAULT_VALUES
+          sql << " DEFAULT VALUES"
         else
-          sql << VALUES
+          sql << " VALUES "
           literal_append(sql, values)
         end
       when Dataset
-        sql << SPACE
+        sql << ' '
         subselect_sql_append(sql, values)
       when LiteralString
-        sql << SPACE << values
+        sql << ' ' << values
       else
         raise Error, "Unsupported INSERT values type, should be an Array or Dataset: #{values.inspect}"
       end
@@ -1141,7 +1183,7 @@ module Sequel
 
     def insert_returning_sql(sql)
       if opts.has_key?(:returning)
-        sql << RETURNING
+        sql << " RETURNING "
         column_list_append(sql, Array(opts[:returning]))
       end
     end
@@ -1151,7 +1193,7 @@ module Sequel
     # SQL fragment specifying a JOIN type, converts underscores to
     # spaces and upcases.
     def join_type_sql(join_type)
-      "#{join_type.to_s.gsub(UNDERSCORE, SPACE).upcase} JOIN"
+      "#{join_type.to_s.gsub('_', ' ').upcase} JOIN"
     end
 
     # Append a literalization of the array to SQL string.
@@ -1177,18 +1219,18 @@ module Sequel
 
     # Append literalization of dataset to SQL string.  Does a subselect inside parantheses.
     def literal_dataset_append(sql, v)
-      sql << LATERAL if v.opts[:lateral]
-      sql << PAREN_OPEN
+      sql << 'LATERAL ' if v.opts[:lateral]
+      sql << '('
       subselect_sql_append(sql, v)
-      sql << PAREN_CLOSE
+      sql << ')'
     end
 
     # SQL fragment for Date, using the ISO8601 format.
     def literal_date(v)
       if requires_sql_standard_datetimes?
-        v.strftime(FORMAT_DATE_STANDARD)
+        v.strftime("DATE '%Y-%m-%d'")
       else
-        v.strftime(FORMAT_DATE)
+        v.strftime("'%Y-%m-%d'")
       end
     end
 
@@ -1209,7 +1251,7 @@ module Sequel
 
     # SQL fragment for false
     def literal_false
-      BOOL_FALSE
+      "'f'"
     end
 
     # SQL fragment for Float
@@ -1229,7 +1271,7 @@ module Sequel
 
     # SQL fragment for nil
     def literal_nil
-      NULL
+      "NULL"
     end
 
     # Append a literalization of the object to the given SQL string.
@@ -1237,6 +1279,10 @@ module Sequel
     # calls +sql_literal+ if object responds to it, otherwise raises an error.
     # If a database specific type is allowed, this should be overriden in a subclass.
     def literal_other_append(sql, v)
+      # We can't be sure if v will always literalize to the same SQL, so
+      # don't cache SQL for a dataset that uses this.
+      disable_sql_caching!
+
       if v.respond_to?(:sql_literal_append)
         v.sql_literal_append(self, sql)
       elsif v.respond_to?(:sql_literal)
@@ -1248,7 +1294,7 @@ module Sequel
 
     # 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?}'")
+      v.strftime("'%H:%M:%S#{format_timestamp_usec(v.usec, sqltime_precision) if supports_timestamp_usecs?}'")
     end
 
     # Append literalization of Sequel::SQLTime to SQL string.
@@ -1258,7 +1304,7 @@ module Sequel
 
     # Append literalization of string to SQL string.
     def literal_string_append(sql, v)
-      sql << APOS << v.gsub(APOS_RE, DOUBLE_APOS) << APOS
+      sql << "'" << v.gsub("'", "''") << "'"
     end
 
     # Append literalization of symbol to SQL string.
@@ -1266,7 +1312,7 @@ module Sequel
       c_table, column, c_alias = split_symbol(v)
       if c_table
         quote_identifier_append(sql, c_table)
-        sql << DOT
+        sql << '.'
       end
       quote_identifier_append(sql, column)
       as_sql_append(sql, c_alias) if c_alias
@@ -1284,7 +1330,7 @@ module Sequel
 
     # SQL fragment for true
     def literal_true
-      BOOL_TRUE
+      "'t'"
     end
 
     # What strategy to use for import/multi_insert.  While SQL-92 defaults
@@ -1295,9 +1341,10 @@ module Sequel
       :separate
     end
 
+
     # Get the native function name given the emulated function name.
     def native_function_name(emulated_function)
-      self.class.const_get(:EMULATED_FUNCTION_MAP).fetch(emulated_function, emulated_function)
+      emulated_function
     end
 
     # Returns a qualified column name (including a table name) if the column
@@ -1321,43 +1368,43 @@ module Sequel
       end
     end
     
-    # Qualify the given expression e to the given table.
+    # Qualify the given expression to the given table.
     def qualified_expression(e, table)
-      Qualifier.new(self, table).transform(e)
+      Qualifier.new(table).transform(e)
     end
 
     def select_columns_sql(sql)
-      sql << SPACE
+      sql << ' '
       column_list_append(sql, @opts[:select])
     end
 
     def select_distinct_sql(sql)
       if distinct = @opts[:distinct]
-        sql << DISTINCT
+        sql << " DISTINCT"
         unless distinct.empty?
-          sql << ON_PAREN
+          sql << " ON ("
           expression_list_append(sql, distinct)
-          sql << PAREN_CLOSE
+          sql << ')'
         end
       end
     end
 
     # Modify the sql to add a dataset to the via an EXCEPT, INTERSECT, or UNION clause.
     # 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.
+    # work on all databases.
     def select_compounds_sql(sql)
       return unless c = @opts[:compounds]
       c.each do |type, dataset, all|
-        sql << SPACE << type.to_s.upcase
-        sql << ALL if all
-        sql << SPACE
+        sql << ' ' << type.to_s.upcase
+        sql << ' ALL' if all
+        sql << ' '
         compound_dataset_sql_append(sql, dataset)
       end
     end
 
     def select_from_sql(sql)
       if f = @opts[:from]
-        sql << FROM
+        sql << ' FROM '
         source_list_append(sql, f)
       elsif f = empty_from_sql
         sql << f
@@ -1366,19 +1413,19 @@ module Sequel
 
     def select_group_sql(sql)
       if group = @opts[:group]
-        sql << GROUP_BY
+        sql << " GROUP BY "
         if go = @opts[:group_options]
           if go == :"grouping sets"
-            sql << go.to_s.upcase << PAREN_OPEN
+            sql << go.to_s.upcase << '('
             grouping_element_list_append(sql, group)
-            sql << PAREN_CLOSE
+            sql << ')'
           elsif uses_with_rollup?
             expression_list_append(sql, group)
-            sql << SPACE_WITH << go.to_s.upcase
+            sql << " WITH " << go.to_s.upcase
           else
-            sql << go.to_s.upcase << PAREN_OPEN
+            sql << go.to_s.upcase << '('
             expression_list_append(sql, group)
-            sql << PAREN_CLOSE
+            sql << ')'
           end
         else
           expression_list_append(sql, group)
@@ -1388,7 +1435,7 @@ module Sequel
 
     def select_having_sql(sql)
       if having = @opts[:having]
-        sql << HAVING
+        sql << " HAVING "
         literal_append(sql, having)
       end
     end
@@ -1401,10 +1448,10 @@ module Sequel
 
     def select_limit_sql(sql)
       if l = @opts[:limit]
-        sql << LIMIT
+        sql << " LIMIT "
         literal_append(sql, l)
         if o = @opts[:offset]
-          sql << OFFSET
+          sql << " OFFSET "
           literal_append(sql, o)
         end
       elsif @opts[:offset]
@@ -1415,9 +1462,9 @@ module Sequel
     def select_lock_sql(sql)
       case l = @opts[:lock]
       when :update
-        sql << FOR_UPDATE
+        sql << ' FOR UPDATE'
       when String
-        sql << SPACE << l
+        sql << ' ' << l
       end
     end
 
@@ -1425,13 +1472,13 @@ module Sequel
     # in the adapter, as many databases do not support just a plain offset with
     # no limit.
     def select_only_offset_sql(sql)
-      sql << OFFSET
+      sql << " OFFSET "
       literal_append(sql, @opts[:offset])
     end
   
     def select_order_sql(sql)
       if o = @opts[:order]
-        sql << ORDER_BY
+        sql << " ORDER BY "
         expression_list_append(sql, o)
       end
     end
@@ -1439,56 +1486,70 @@ module Sequel
     alias update_order_sql select_order_sql
 
     def select_select_sql(sql)
-      sql << SELECT
+      sql << 'SELECT'
     end
 
     def select_where_sql(sql)
       if w = @opts[:where]
-        sql << WHERE
+        sql << " WHERE "
         literal_append(sql, w)
       end
     end
     alias delete_where_sql select_where_sql
     alias update_where_sql select_where_sql
     
+    def select_window_sql(sql)
+      if ws = @opts[:window]
+        sql << " WINDOW "
+        c = false
+        co = ', '
+        as = ' AS '
+        ws.map do |name, window|
+          sql << co if c
+          literal_append(sql, name)
+          sql << as
+          literal_append(sql, window)
+          c ||= true
+        end
+      end
+    end
+
     def select_with_sql(sql)
       return unless supports_cte?
       ws = opts[:with]
       return if !ws || ws.empty?
       sql << select_with_sql_base
       c = false
-      comma = COMMA
+      comma = ', '
       ws.each do |w|
         sql << comma if c
-        quote_identifier_append(sql, w[:name])
-        if args = w[:args]
-         sql << PAREN_OPEN
-         identifier_list_append(sql, args)
-         sql << PAREN_CLOSE
-        end
-        sql << AS
+        select_with_sql_prefix(sql, w)
         literal_dataset_append(sql, w[:dataset])
         c ||= true
       end
-      sql << SPACE
+      sql << ' '
     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
-      SQL_WITH
+      "WITH "
     end
 
-    # Whether the symbol cache should be skipped when literalizing the dataset
-    def skip_symbol_cache?
-      @skip_symbol_cache
+    def select_with_sql_prefix(sql, w)
+      quote_identifier_append(sql, w[:name])
+      if args = w[:args]
+       sql << '('
+       identifier_list_append(sql, args)
+       sql << ')'
+      end
+      sql << ' AS '
     end
 
-    # Set the dataset to skip the symbol cache
-    def skip_symbol_cache!
-      @skip_symbol_cache = true
+    # Whether the symbol cache should be skipped when literalizing the dataset
+    def skip_symbol_cache?
+      @opts[:skip_symbol_cache]
     end
 
     # Append literalization of array of sources/tables to SQL string, raising an Error if there
@@ -1504,11 +1565,17 @@ module Sequel
     end
 
     # The string that is appended to to create the SQL query, the empty
-    # string by default
+    # string by default.
     def sql_string_origin
-      ''
+      String.new
     end
     
+    # The precision to use for SQLTime instances (time column values without dates).
+    # Defaults to timestamp_precision.
+    def sqltime_precision
+      timestamp_precision
+    end
+
     # SQL to use if this dataset uses static SQL.  Since static SQL
     # can be a PlaceholderLiteralString in addition to a String,
     # we literalize nonstrings.  If there is an append_sql for this
@@ -1529,9 +1596,19 @@ module Sequel
       end
     end
 
-    # Append literalization of the subselect to SQL String.
+    # Append literalization of the subselect to SQL string.
     def subselect_sql_append(sql, ds)
-      ds.clone(:append_sql=>sql).sql
+      sds = subselect_sql_dataset(sql, ds)
+      sds.sql
+      unless sds.send(:cache_sql?)
+        # If subquery dataset does not allow caching SQL,
+        # then this dataset should not allow caching SQL.
+        disable_sql_caching!
+      end
+    end
+
+    def subselect_sql_dataset(sql, ds)
+      ds.clone(:append_sql=>sql)
     end
 
     # The number of decimal digits of precision to use in timestamps.
@@ -1540,13 +1617,13 @@ module Sequel
     end
 
     def update_table_sql(sql)
-      sql << SPACE
+      sql << ' '
       source_list_append(sql, @opts[:from])
       select_join_sql(sql) if supports_modifying_joins?
     end
 
     def update_set_sql(sql)
-      sql << SET
+      sql << ' SET '
       values = @opts[:values]
       if values.is_a?(Hash)
         update_sql_values_hash(sql, values)
@@ -1557,9 +1634,9 @@ module Sequel
 
     def update_sql_values_hash(sql, values)
       c = false
-      eq = EQUAL
+      eq = ' = '
       values.each do |k, v|
-        sql << COMMA if c
+        sql << ', ' if c
         if k.is_a?(String) && !k.is_a?(LiteralString)
           quote_identifier_append(sql, k)
         else
@@ -1572,7 +1649,37 @@ module Sequel
     end
 
     def update_update_sql(sql)
-      sql << UPDATE
+      sql << 'UPDATE'
+    end
+
+    def window_frame_boundary_sql_append(sql, boundary, direction)
+      case boundary
+      when :current
+       sql << "CURRENT ROW"
+      when :preceding
+        sql << "UNBOUNDED PRECEDING"
+      when :following
+        sql << "UNBOUNDED FOLLOWING"
+      else
+        if boundary.is_a?(Array)
+          offset, direction = boundary
+          unless boundary.length == 2 && (direction == :preceding || direction == :following)
+            raise Error, "invalid window :frame boundary (:start or :end) option: #{boundary.inspect}"
+          end
+        else
+          offset = boundary
+        end
+
+        case offset
+        when Numeric, String, SQL::Cast
+          # nothing
+        else
+          raise Error, "invalid window :frame boundary (:start or :end) option: #{boundary.inspect}"
+        end
+
+        literal_append(sql, offset)
+        sql << (direction == :preceding ? " PRECEDING" : " FOLLOWING")
+      end
     end
   end
 end