Merge pull request #8185 from j-sheppard/master

Update knex.d.ts MariaConnectionConfig to support all properties
This commit is contained in:
Horiuchi_H
2016-02-22 12:35:16 +09:00
+29 -5
View File
@@ -413,12 +413,36 @@ declare module "knex" {
debug?: boolean;
}
// Config object for mariasql: https://github.com/mscdex/node-mariasql#client-methods
interface MariaSqlConnectionConfig {
host: string;
user: string;
password: string;
db: string;
debug?: boolean;
user?: string;
password?: string;
host?: string;
port?: number;
unixSocket?: string;
protocol?: string;
db?: string;
keepQueries?: boolean;
multiStatements?: boolean;
connTimeout?: number;
pingInterval?: number;
secureAuth?: boolean;
compress?: boolean;
ssl?: boolean|MariaSslConfiguration;
local_infile?: boolean;
read_default_file?: string;
read_default_group?: string;
charset?: string;
streamHWM?: number;
}
interface MariaSslConfiguration {
key?: string;
cert?: string;
ca?: string;
capath?: string;
cipher?: string;
rejectUnauthorized?: boolean;
}
/** Used with SQLite3 adapter */