Home Explore Help
Sign In
n4u
/
mysql-otp
2
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Minor typos in docs and tests

Viktor Söderqvist 10 years ago
parent
d91025839a
commit
d7f6890efe
4 changed files with 11 additions and 16 deletions
Split View Show Diff Stats
  1. 9 7
      Makefile
  2. 1 1
      src/mysql.app.src
  3. 1 1
      src/mysql.erl
  4. 0 7
      test/mysql_tests.erl

+ 9 - 7
Makefile
View File 

@@ -17,11 +17,16 @@ EDOC_OPTS = {stylesheet_file,"priv/edoc-style.css"},{todo,true}
 
 
 include erlang.mk
 
 
-.PHONY: gh-pages eunit-coverage
 
+.PHONY: gh-pages eunit eunit-report
 
+
 
+eunit:
 
+	@mkdir -p .eunit
 
+	@rm -f .eunit/index.html # make sure we don't get an old one if cover=false
 
+	@rebar eunit | tee .eunit/output
 
 
 # Update the local 'gh-pages' branch with pregenerated output files
 
 # (trick from https://groups.google.com/forum/#!topic/github/XYxkdzxpgCo)
 
-gh-pages: docs eunit-coverage
 
+gh-pages: docs eunit-report
 
 	@if [ $$(git name-rev --name-only HEAD) != master ] ; then \
 
 	  echo "Not on master. Aborting." ; \
 
 	  false ; \
 
@@ -39,16 +44,13 @@ gh-pages: docs eunit-coverage
 
 
 # Build eunit.html containing the coverage report and the eunit output in the
 
 # doc directory.
 
-eunit-coverage:
 
-	@mkdir -p .eunit
 
-	@rm -f .eunit/index.html # make sure we don't get an old one if cover=false
 
-	@rebar eunit | tee .eunit/output
 
+eunit-report: eunit
 
 	@(echo '<!DOCTYPE html>' ; \
 
 	 cat .eunit/index.html | sed 's!</body></html>!!' ; \
 
 	 echo '<h3>Output of <code>make eunit</code></h3><pre>' ; \
 
 	 sed 's/&/\&amp;/g; s/</\&lt;/g; s/>/\&gt;/g;' .eunit/output ; \
 
 	 echo '</pre>' ; \
 
-	 echo '<p><em>Generated using EUnit,' ; \
 
+	 echo '<p><em>Generated using rebar and EUnit,' ; \
 
 	 date -u '+%d %h %Y %H:%M:%S UTC.' ; \
 
 	 echo '</em></p>' ; \
 
 	 echo '</body></html>') > doc/eunit.html

+ 1 - 1
src/mysql.app.src
View File 

@@ -18,6 +18,6 @@
 
 
 {application, mysql, [
 
     {description, "MySQL/OTP - Erlang MySQL client"},
 
-    {vsn, "0.7.0"},
 
+    {vsn, "0.7.1"},
 
     {modules, []}
 
 ]}.

+ 1 - 1
src/mysql.erl
View File 

@@ -91,7 +91,7 @@
 
 %%   <dd>Send ping when unused for a certain time. Possible values are `true',
 
 %%       `false' and `integer() > 0' for an explicit interval in milliseconds.
 
 %%       The default is `false'. For `true' a default ping timeout is used.
 
-%%       </dt>
 
+%%       </dd>
 
 %%   <dt>`{query_timeout, Timeout}'</dt>
 
 %%   <dd>The default time to wait for a response when executing a query or a
 
 %%       prepared statement. This can be given per query using `query/3,4' and

+ 0 - 7
test/mysql_tests.erl
View File 

@@ -127,13 +127,6 @@ connect_with_db(_Pid) ->
 
                                   {database, "otptest"}]),
 
     ?assertMatch({ok, _, [[<<"otptest">>]]},
 
                  mysql:query(Pid, "SELECT DATABASE()")),
 
-    %% Capture error log to check that we get a warning logged
 
-    {ok, ok, LoggedErrors} = error_logger_acc:capture(fun () ->
 
-        mysql:query(Pid, <<"DROP TABLE IF EXISTS dummy">>)
 
-    end),
 
-    ?assertMatch([{_, "Note 1051: Unknown table 'dummy'\n"
 
-                      " in DROP TABLE IF EXISTS dummy\n"}],
 
-                 LoggedErrors),
 
     exit(Pid, normal).
 
 
 log_warnings_test() ->