Skip to content

Commit

Permalink
Merge pull request #8 from naxmefy/feature/update-dependencies
Browse files Browse the repository at this point in the history
Feature/update dependencies
  • Loading branch information
naxmefy committed Dec 4, 2019
2 parents 77797fe + 1d0f682 commit 8420d42
Show file tree
Hide file tree
Showing 13 changed files with 1,266 additions and 1,610 deletions.
2,817 changes: 1,236 additions & 1,581 deletions package-lock.json

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
},
"scripts": {
"build": "tsc",
"lint": "tslint src",
"lint:fix": "npm run tslint -- --fix",
"prepublish": "npm run build",
"lint": "tslint --project .",
"lint:fix": "npm run lint -- --fix",
"postinstall": "npm run build",
"maven": "node-java-maven",
"pretest": "npm run maven",
"test": "mocha",
Expand Down Expand Up @@ -59,14 +59,14 @@
"@types/should": "^8.3.0",
"co-mocha": "^1.2.0",
"java": "^0.12.0",
"mocha": "^3.3.0",
"mocha": "^6.2.2",
"node-java-maven": "^0.0.12",
"nyc": "^10.3.2",
"nyc": "^14.1.1",
"should": "^11.2.1",
"ts-node": "^3.0.4",
"tslint": "^5.2.0",
"tslint": "^5.20.1",
"tslint-config-standard": "^5.0.2",
"typescript": "^2.3.2"
"typescript": "^3.7.3"
},
"dependencies": {
"@types/bluebird": "^3.5.3",
Expand Down
4 changes: 2 additions & 2 deletions src/CallableStatement.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as Promise from 'bluebird'

import {Java} from './Java'
import {IPreparedStatement, PreparedStatement} from './PreparedStatement'
import { Java } from './Java'
import { IPreparedStatement, PreparedStatement } from './PreparedStatement'

export interface ICallableStatement extends IPreparedStatement {
registerOutParameterSync (index: number, type: string): void
Expand Down
6 changes: 3 additions & 3 deletions src/Connection.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import * as Promise from 'bluebird'

import {IStatement, Statement} from './Statement'
import {IPreparedStatement, PreparedStatement} from './PreparedStatement'
import {CallableStatement, ICallableStatement} from './CallableStatement'
import { IStatement, Statement } from './Statement'
import { IPreparedStatement, PreparedStatement } from './PreparedStatement'
import { CallableStatement, ICallableStatement } from './CallableStatement'

export interface IConnection {
setAutoCommitSync (autoCommit: boolean): void
Expand Down
2 changes: 1 addition & 1 deletion src/Holdabilities.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Java } from './Java'

export function Holdabilities() {
export function Holdabilities () {
const java = Java.getInstance().java
const holdability: string[] = []

Expand Down
8 changes: 4 additions & 4 deletions src/JDBC.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import * as debug from 'debug'
import * as Promise from 'bluebird'

import {isEmpty} from 'lodash'
import {Connection, IConnection} from './Connection'
import {Java} from './Java'
import {Statement} from './Statement'
import { isEmpty } from 'lodash'
import { Connection, IConnection } from './Connection'
import { Java } from './Java'
import { Statement } from './Statement'

export interface IJDBCConfig {
className: string
Expand Down
6 changes: 3 additions & 3 deletions src/Java.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import * as j from 'java'
import * as deasync from 'deasync'
import * as debug from 'debug'

import {EventEmitter} from 'events'
import { EventEmitter } from 'events'

declare module 'java' {
export interface NodeAPI {
Expand All @@ -21,7 +21,7 @@ export class Java {

public mavenClasspath: string[] = []
public mavenDependencies: {} = {}

protected _debug: debug.IDebugger = debug('jdbc:Java')

constructor (useXrs: boolean = true, useMaven: boolean = true) {
Expand Down Expand Up @@ -53,7 +53,7 @@ export class Java {
this.addClasspath(this.mavenClasspath)
} catch (err) {
if (err.code !== 'MODULE_NOT_FOUND') {
throw err
throw err
} else {
this._debug('node-jave-maven not found. useMaven is ignored.')
}
Expand Down
4 changes: 2 additions & 2 deletions src/PreparedStatement.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as Promise from 'bluebird'

import {IResultSet, ResultSet} from './ResultSet'
import {Java} from './Java'
import { IResultSet, ResultSet } from './ResultSet'
import { Java } from './Java'

export interface IPreparedStatement {
setStringSync (index: number, value: string): void
Expand Down
2 changes: 1 addition & 1 deletion src/ResultSet.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as Promise from 'bluebird'
import * as _ from 'lodash'
import {IColumnMetaData, IResultSetMetaData, ResultSetMetaData} from './ResultSetMetaData'
import { IColumnMetaData, IResultSetMetaData, ResultSetMetaData } from './ResultSetMetaData'

export interface IResultSet {
nextSync (): IResultSet
Expand Down
4 changes: 2 additions & 2 deletions src/ResultSetMetaData.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {Holdabilities} from './Holdabilities'
import {Types} from './Types'
import { Holdabilities } from './Holdabilities'
import { Types } from './Types'

export interface IResultSetMetaData {
getColumnCountSync (): number
Expand Down
2 changes: 1 addition & 1 deletion src/Statement.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as Promise from 'bluebird'
import {IResultSet, ResultSet} from './ResultSet'
import { IResultSet, ResultSet } from './ResultSet'

export interface IStatement {
executeUpdate (sql: string): number
Expand Down
2 changes: 1 addition & 1 deletion src/Types.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {Java} from './Java'
import { Java } from './Java'

export function Types () {
const java = Java.getInstance().java
Expand Down
5 changes: 3 additions & 2 deletions test/mocha.opts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
--recursive
--extension ts
--colors
--compilers ts:ts-node/register
--require ts-node/register
--require should
--require test/spec_helper
--file test/spec_helper

0 comments on commit 8420d42

Please sign in to comment.