Merge remote-tracking branch 'github.wg/master' into async-integration

Makefile

@@ -1,5 +1,5 @@
 NAME		:= epgsql
-VERSION		:= 1.4
+VERSION		:= $(shell git describe --always --tags)
 
 ERL  		:= erl
 ERLC 		:= erlc
@@ -43,7 +43,7 @@ ebin/%.beam : src/%.erl
 	$(ERLC) $(ERLC_FLAGS) -o $(dir $@) $<
 
 ebin/%.app : src/%.app.src Makefile
-	sed -e s/VERSION/$(VERSION)/g $< > $@
+	sed -e s/git/\"$(VERSION)\"/g $< > $@
 
 test_ebin/%.beam : test_src/%.erl
 	$(ERLC) $(ERLC_FLAGS) -o $(dir $@) $<

rebar.config

@@ -0,0 +1 @@
+{eunit_compile_opts, [{src_dirs, ["test_src"]}]}.

src/epgsql.app.src

@@ -1,6 +1,6 @@
 {application, epgsql,
  [{description, "PostgreSQL Client"},
-  {vsn, "VERSION"},
+  {vsn, git},
   {modules, [pgsql, pgsql_binary, pgsql_connection, pgsql_fdatetime,
              pgsql_idatetime, pgsql_sock, pgsql_types]},
   {registered, []},

test_src/pgsql_tests.erl

@@ -577,9 +577,15 @@ warning_notice_test(Module) ->
     with_connection(
       Module,
       fun(C) ->
-          {ok, _, _} = Module:squery(C, "select 'test\\n'"),
+          Q = "create function pg_temp.raise() returns void as $$
+               begin
+                 raise warning 'oops';
+               end;
+               $$ language plpgsql;
+               select pg_temp.raise()",
+          [{ok, _, _}, _] = Module:squery(C, Q),
           receive
-              {pgsql, C, {notice, #error{code = <<"22P06">>}}} -> ok
+              {pgsql, C, {notice, #error{message = <<"oops">>}}} -> ok
           after
               100 -> erlang:error(didnt_receive_notice)
           end