Merge branch 'master' of https://github.com/desoi/ace into desoi-master

Conflicts:
	Makefile.dryice.js

demo/kitchen-sink/demo.js

@@ -114,6 +114,7 @@ var modes = [
     new Mode("markdown", "Markdown", require("ace/mode/markdown").Mode, ["md", "markdown"]),
     new Mode("ocaml", "OCaml", require("ace/mode/ocaml").Mode, ["ml", "mli"]),
     new Mode("perl", "Perl", require("ace/mode/perl").Mode, ["pl", "pm"]),
+    new Mode("pgsql", "pgSQL",require("ace/mode/pgsql").Mode, ["pgsql", "sql"]),
     new Mode("php", "PHP",require("ace/mode/php").Mode, ["php"]),
     new Mode("powershell", "Powershell", require("ace/mode/powershell").Mode, ["ps1"]),
     new Mode("python", "Python", require("ace/mode/python").Mode, ["py"]),
@@ -242,6 +243,14 @@ var docs = [
     new WrappedDoc(
         "latex", "LaTeX",
         require("ace/requirejs/text!./docs/latex.tex")
+    ),
+    new WrappedDoc(
+        "sql", "SQL",
+        require("ace/requirejs/text!./docs/sql.sql")
+    ),
+    new WrappedDoc(
+        "pgsql", "pgSQL",
+        require("ace/requirejs/text!./docs/pgsql.pgsql")
     )
 ];
 

demo/kitchen-sink/docs/pgsql.pgsql

@@ -0,0 +1,100 @@
+
+BEGIN;
+
+/**
+* Samples from PostgreSQL src/tutorial/basics.source
+*/
+CREATE TABLE weather (
+	city		varchar(80),
+	temp_lo		int,		-- low temperature
+	temp_hi		int,		-- high temperature
+	prcp		real,		-- precipitation
+	"date"		date
+);
+
+CREATE TABLE cities (
+	name		varchar(80),
+	location	point
+);
+
+
+INSERT INTO weather
+    VALUES ('San Francisco', 46, 50, 0.25, '1994-11-27');
+
+INSERT INTO cities
+    VALUES ('San Francisco', '(-194.0, 53.0)');
+
+INSERT INTO weather (city, temp_lo, temp_hi, prcp, "date")
+    VALUES ('San Francisco', 43, 57, 0.0, '1994-11-29');
+
+INSERT INTO weather (date, city, temp_hi, temp_lo)
+    VALUES ('1994-11-29', 'Hayward', 54, 37);
+
+
+SELECT city, (temp_hi+temp_lo)/2 AS temp_avg, "date" FROM weather;
+
+SELECT city, temp_lo, temp_hi, prcp, "date", location
+    FROM weather, cities
+    WHERE city = name;
+
+
+
+/**
+* Dollar quotes starting at the end of the line are colored as SQL unless
+* a special language tag is used. Pearl and Python are currently implemented
+* but lots of others are possible.
+*/
+create or replace function blob_content_chunked(
+    in p_data bytea, 
+    in p_chunk integer)
+returns setof bytea as $$
+-- Still SQL comments
+declare
+	v_size integer = octet_length(p_data);
+begin
+	for i in 1..v_size by p_chunk loop
+		return next substring(p_data from i for p_chunk);
+	end loop;
+end;
+$$ language plpgsql stable;
+
+
+-- pl/perl
+CREATE FUNCTION perl_max (integer, integer) RETURNS integer AS $perl$
+    # perl comment...
+    my ($x,$y) = @_;
+    if (! defined $x) {
+        if (! defined $y) { return undef; }
+        return $y;
+    }
+    if (! defined $y) { return $x; }
+    if ($x > $y) { return $x; }
+    return $y;
+$perl$ LANGUAGE plperl;
+
+-- pl/python
+CREATE FUNCTION usesavedplan() RETURNS trigger AS $python$
+    # python comment...
+    if SD.has_key("plan"):
+        plan = SD["plan"]
+    else:
+        plan = plpy.prepare("SELECT 1")
+        SD["plan"] = plan
+$python$ LANGUAGE plpythonu;
+
+
+-- psql commands
+\df cash*
+
+
+-- Some string samples.
+select 'don''t do it now;' || 'maybe later';
+select E'dont\'t do it';
+select length('some other''s stuff' || $$cat in hat's stuff $$);
+
+select $$ strings
+over multiple 
+lines - use dollar quotes
+$$;
+
+END;