Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed TDS connections with domain. Closes #65. #68

Merged
merged 1 commit into from
Mar 2, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 9 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -335,6 +335,14 @@
"required": false,
"description": "Database name"
},
"domain": {
"type": [
"string",
"null"
],
"description": "Connection domain (for MSSQL/Azure only)",
"required": false
},
"username": {
"type": "string",
"description": "Database username"
Expand Down Expand Up @@ -520,4 +528,4 @@
"vscode-languageclient": "^3.5.0",
"vscode-languageserver": "^3.5.0"
}
}
}
1 change: 1 addition & 0 deletions src/api/dialect/mssql.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ export default class MSSQL implements ConnectionDialect {
const config: any = {
password: this.credentials.password,
server: this.credentials.server,
domain: this.credentials.domain,
userName: this.credentials.username,
};
config.options = {
Expand Down
1 change: 1 addition & 0 deletions src/api/interface/connection-credentials.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ export default interface ConnectionCredentials {
server: string;
port: number;
database?: string;
domain?: string;
username: string;
password?: string;
askForPassword?: boolean;
Expand Down
7 changes: 6 additions & 1 deletion src/languageserver/http-server/views/js/components/setup.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ export default class Setup extends React.Component {
cb: () => {
const newState = Object.assign({}, this.state)
newState.data.port = dialectDefaultPorts[this.state.data.dialect] || 3306
newState.fields.domain.show = this.state.data.dialect !== 'MSSQL' ? 'hidden' : undefined
this.setState(newState, this.validateFields)
}
},
Expand Down Expand Up @@ -144,6 +145,11 @@ export default class Setup extends React.Component {
show: undefined,
label: 'Password',
},
domain: {
show: 'hidden',
label: 'Domain',
info: 'For MSSQL/Azure only'
},
connectionTimeout: {
label: 'Connection Timeout',
info: 'in seconds',
Expand Down Expand Up @@ -344,7 +350,6 @@ export default class Setup extends React.Component {
}))}
</div>
</div>
<pre>{JSON.stringify(this.state, null, 2)}</pre>
</div>
</div>
</form>
Expand Down
7 changes: 7 additions & 0 deletions static/release-notes/v0.12.x.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,13 @@

If you like the project, consider a donation. It helps to keep the project under development.

## v0.12.1

#### Improvements & Fixes

- Added support for Windows Server domains. Issue #67, issue #65


## v0.12.0

#### New Features
Expand Down