Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki

This commit is contained in:
Jacques Distler 2010-01-01 20:20:17 -06:00
commit 59c0280069

View file

@ -8,8 +8,8 @@ module Syntax
SQLite_PREDEFINED_FUNCTIONS << name SQLite_PREDEFINED_FUNCTIONS << name
end end
SQLite_PREDEFINED_FUNCTIONS = %w{abs avg coalesce count glob hex ifnull SQLite_PREDEFINED_FUNCTIONS = Set.new %w{abs avg coalesce count glob
last_insert_rowid length like load_extension lower hex ifnull last_insert_rowid length like load_extension lower
ltrim max min sum nullif ltrim max min sum nullif
quote random randomblob replace round quote random randomblob replace round
rtrim soundex sqlite_version substr total rtrim soundex sqlite_version substr total
@ -17,27 +17,27 @@ module Syntax
date time datetime julianday date time datetime julianday
strftime over} unless const_defined?(:SQLite_PREDEFINED_FUNCTIONS) strftime over} unless const_defined?(:SQLite_PREDEFINED_FUNCTIONS)
SQLite_KEYWORDS = %w{abort add after all alter analyze SQLite_KEYWORDS = Set.new %w{abort add after all alter analyze
asc attach autoincrement before by cascade asc attach autoincrement before by cascade change character
check commit conflict constraint create cross check commit conflict constraint create cross collate
current_date current_time current_timestamp database default current_date current_time current_timestamp database default
deferrable deferred delete desc detach distinct drop each deferrable deferred delete desc detach distinct drop each
escape except exclusive explain fail for foreign from escape except exclusive explain fail for foreign from
full group having if ignore immediate full group having if ignore immediate
index initially inner insert instead intersect into is index initially inner insert instead intersect into is
join key left limit natural of offset on or order join key left limit modify natural of offset on or order
outer plan pragma primary query raise references reindex outer plan pragma primary query raise references reindex
rename replace restrict right rollback row select set rename replace restrict right rollback row select set
table temp temporary to transaction trigger union table temp temporary to transaction trigger union
unique update using vacuum values view virtual unique update using vacuum values view virtual
where partition} unless const_defined?(:SQLite_KEYWORDS) where partition} unless const_defined?(:SQLite_KEYWORDS)
SQLite_DATATYPES = %w{null none text numeric integer text blob SQLite_DATATYPES = Set.new %w{null none text numeric integer
int varchar char real float text blob int varchar char real float
double} unless const_defined?(:SQLite_DATATYPES) double} unless const_defined?(:SQLite_DATATYPES)
SQLite_OPERATORS = %w{not escape isnull notnull between and SQLite_OPERATORS = Set.new %w{not escape isnull notnull between and
in exists case when then else begin end cast as collate in exists case when then else begin end cast as
like glob regexp < > || * / % + - << >> like glob regexp < > || * / % + - << >>
& | <= >= = == != <> & | <= >= = == != <>
match} unless const_defined?(:SQLite_OPERATORS) match} unless const_defined?(:SQLite_OPERATORS)