Modernize Travis and badges

Also change type of error in 0.4

Author: jiahao

.travis.yml

@@ -1,21 +1,13 @@
-language: cpp
-compiler:
-    - clang
+language: julia
+os:
+    - osx
+    - linux
+julia:
+    - release
+    - nightly
 notifications:
     email: false
-env:
-    - JULIAVERSION="juliareleases" 
-    - JULIAVERSION="julianightlies"
-before_install:
-    - sudo add-apt-repository ppa:staticfloat/julia-deps -y
-    - sudo add-apt-repository ppa:staticfloat/${JULIAVERSION} -y
-    - sudo apt-get update -qq -y
-    - sudo apt-get install libpcre3-dev julia -y
-    - git config --global user.name "Travis User"
-    - git config --global user.email "[email protected]"
-    - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
 script:
-    - julia -e 'Pkg.init(); Pkg.clone(pwd()); Pkg.build("SQLite")'
-    - julia -e 'Pkg.test("SQLite", coverage=true)'
-after_success:
-    - julia -e 'cd(Pkg.dir("SQLite")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())'
+    - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
+    - julia -e 'Pkg.clone(pwd()); Pkg.build("SQLite"); Pkg.test("SQLite"; coverage=true)';
+    - julia -e 'cd(Pkg.dir("SQLite")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())';

README.md

@@ -1,9 +1,10 @@
 SQLite.jl
 =========
 
+[![SQLite on Julia release](http://pkg.julialang.org/badges/SQLite_release.svg)](http://pkg.julialang.org/?pkg=SQLite&ver=release)
+[![SQLite on Julia nightly](http://pkg.julialang.org/badges/SQLite_nightly.svg)](http://pkg.julialang.org/?pkg=SQLite&ver=nightly)
 [![Build Status](https://travis-ci.org/quinnj/SQLite.jl.png)](https://travis-ci.org/quinnj/SQLite.jl)
 [![Coverage Status](https://img.shields.io/coveralls/quinnj/SQLite.jl.svg)](https://coveralls.io/r/quinnj/SQLite.jl)
-[![SQLite](http://pkg.julialang.org/badges/SQLite_release.svg)](http://pkg.julialang.org/?pkg=SQLite&ver=release)
 
 A Julia interface to the SQLite library and support for operations on DataFrames
 
@@ -56,7 +57,7 @@ A Julia interface to the SQLite library and support for operations on DataFrames
   Used to execute prepared `SQLiteStmt`. The 2nd method is a convenience method to pass in an SQL statement as a string which gets prepared and executed in one call. This method does not check for or return any results, hence it is only useful for database manipulation methods (i.e. ALTER, CREATE, UPDATE, DROP). To return results, see `query` below. Also consider the `create`, `drop`, and `append` methods for manipulation statements as further SQLite performance tricks are incorporated automatically.
 
 * `query(db::SQLiteDB, sql::String, values=[])`
-  
+
   An SQL statement `sql` is prepared, executed in the context of `db`, and results, if any, are returned. The return values are a `(String[],Any[])` tuple representing `(column names, result values)`.
 
   The values in `values` are used in parameter binding (see `bind` above). If your statement uses nameless parameters `values` must be a `Vector` of the values you wish to bind to your statment. If your statement uses named parameters `values` must be a Dict where the keys are of type `Symbol`. The key must match an identifier name in the statement (the name **does not** include the ':', '@' or '$' prefix).

test/runtests.jl

@@ -8,6 +8,7 @@ if VERSION < v"0.4.0-dev"
     const UInt64 = Uint64
     const UInt128 = Uint128
     const UInt = Uint
+    typealias AssertionError ErrorException
 end
 
 a = SQLiteDB()
@@ -41,9 +42,9 @@ results = query(db,"SELECT * FROM Employee;")
 @test results[1,5] == NULL
 
 query(db,"SELECT * FROM Album;")
-query(db,"SELECT a.*, b.AlbumId 
-	FROM Artist a 
-	LEFT OUTER JOIN Album b ON b.ArtistId = a.ArtistId 
+query(db,"SELECT a.*, b.AlbumId
+	FROM Artist a
+	LEFT OUTER JOIN Album b ON b.ArtistId = a.ArtistId
 	ORDER BY name;")
 
 EMPTY_RESULTSET = ResultSet(["Rows Affected"],Any[Any[0]])
@@ -168,13 +169,13 @@ end
 r = query(db, sr"SELECT LastName FROM Employee WHERE BirthDate REGEXP '^\d{4}-08'")
 @test r.values[1][1] == "Peacock"
 
-triple(x) = x * 3
-@test_throws ErrorException SQLite.register(db, triple, nargs=186)
+triple(x) = 3x
+@test_throws AssertionError SQLite.register(db, triple, nargs=186)
 SQLite.register(db, triple, nargs=1)
 r = query(db, "SELECT triple(Total) FROM Invoice ORDER BY InvoiceId LIMIT 5")
 s = query(db, "SELECT Total FROM Invoice ORDER BY InvoiceId LIMIT 5")
 for (i, j) in zip(r.values[1], s.values[1])
-    @test_approx_eq i j*3
+    @test_approx_eq i 3j
 end
 
 SQLite.@register db function add4(q)