Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: knex/knex
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: vellotis/knex
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 5 commits
  • 7 files changed
  • 1 contributor

Commits on Jul 28, 2015

  1. Provide Pool2 a ping method to test connection 

    #892

This is how it should be done for Pool2. Every client must implement its ping method for the used driver. At the moment only mysql/2, maria and pg native drivers are capable of doing this kind of check.
    @vellotis
    vellotis committed Jul 28, 2015
    Configuration menu
    Copy the full SHA
    22117c4 View commit details
    Browse the repository at this point in the history

Commits on Aug 19, 2015

  1. Add sub-classed errors 

    - BaseError
  - DatabaseError
    - QueryError
    - ConnectionError
    @vellotis
    vellotis committed Aug 19, 2015
    Configuration menu
    Copy the full SHA
    cbcf0c9 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'remotes/origin/ft-add-knex-errors' 

    Conflicts:
	lib/dialects/mysql/index.js
	src/dialects/mysql/index.js
    @vellotis
    vellotis committed Aug 19, 2015
    Configuration menu
    Copy the full SHA
    8ce65ee View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2016

  1. Update to latest tgriesser/knex/master 

    Merge remote-tracking branch 'remotes/tgriesser/master' into ft-add-knex-errors

# Conflicts:
#	lib/client.js
#	lib/dialects/mysql/index.js
#	lib/util/make-knex.js
#	src/dialects/mysql/index.js
#	src/util/make-knex.js
    @vellotis
    vellotis committed Feb 25, 2016
    Configuration menu
    Copy the full SHA
    66d8971 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'remotes/origin/ft-add-knex-errors' 

    # Conflicts:
#	lib/client.js
#	lib/dialects/maria/index.js
#	lib/dialects/mysql/index.js
#	lib/dialects/postgres/index.js
#	src/dialects/maria/index.js
    @vellotis
    vellotis committed Feb 25, 2016
    Configuration menu
    Copy the full SHA
    41497d0 View commit details
    Browse the repository at this point in the history
Loading