Skip to content

Commit 21487d1

Browse files
kburtramkburtram
committed
Merge master and rebuild lib
2 parents 3c4e704 + 73eb69a commit 21487d1

18 files changed

+8866
-3535
lines changed

‎lib/codeConverter.d.ts‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import * as sqlops from 'sqlops';
2-
import * as proto from './protocol';
3-
import * as types from './types';
4-
export interface Ic2p {
5-
asConnectionParams(connectionUri: string, connectionInfo: sqlops.ConnectionInfo): proto.ConnectParams;
6-
asExecutionPlanOptions(planOptions: sqlops.ExecutionPlanOptions): types.ExecutionPlanOptions;
7-
asScriptingParams(connectionUri: string, operation: sqlops.ScriptOperation, metadata: sqlops.ObjectMetadata, paramDetails: sqlops.ScriptingParamDetails): types.ScriptingParams;
8-
}
9-
export declare const c2p: Ic2p;
1+
import * as azdata from 'azdata';
2+
import * as proto from './protocol';
3+
import * as types from './types';
4+
export interface Ic2p {
5+
asConnectionParams(connectionUri: string, connectionInfo: azdata.ConnectionInfo): proto.ConnectParams;
6+
asExecutionPlanOptions(planOptions: azdata.ExecutionPlanOptions): types.ExecutionPlanOptions;
7+
asScriptingParams(connectionUri: string, operation: azdata.ScriptOperation, metadata: azdata.ObjectMetadata, paramDetails: azdata.ScriptingParamDetails): types.ScriptingParams;
8+
}
9+
export declare const c2p: Ic2p;

‎lib/codeConverter.js‎

Lines changed: 58 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,58 @@
1-
"use strict";
2-
Object.defineProperty(exports, "__esModule", { value: true });
3-
const sqlops = require("sqlops");
4-
function asConnectionParams(ownerUri, connInfo) {
5-
return {
6-
ownerUri,
7-
connection: {
8-
options: connInfo.options
9-
}
10-
};
11-
}
12-
function asExecutionPlanOptions(planOptions) {
13-
return {
14-
includeEstimatedExecutionPlanXml: planOptions ? planOptions.displayEstimatedQueryPlan : undefined,
15-
includeActualExecutionPlanXml: planOptions ? planOptions.displayActualQueryPlan : undefined
16-
};
17-
}
18-
function asScriptingParams(ownerURI, operation, metadata, paramDetails) {
19-
let scriptingObject = {
20-
type: metadata.metadataTypeName,
21-
schema: metadata.schema,
22-
name: metadata.name
23-
};
24-
let targetDatabaseEngineEdition = paramDetails.targetDatabaseEngineEdition;
25-
let targetDatabaseEngineType = paramDetails.targetDatabaseEngineType;
26-
let scriptCompatibilityOption = paramDetails.scriptCompatibilityOption;
27-
let scriptOptions = {
28-
scriptCreateDrop: (operation === sqlops.ScriptOperation.Delete) ? 'ScriptDrop' :
29-
(operation === sqlops.ScriptOperation.Select) ? 'ScriptSelect' : 'ScriptCreate',
30-
typeOfDataToScript: 'SchemaOnly',
31-
scriptStatistics: 'ScriptStatsNone',
32-
targetDatabaseEngineEdition: targetDatabaseEngineEdition ? targetDatabaseEngineEdition : 'SqlServerEnterpriseEdition',
33-
targetDatabaseEngineType: targetDatabaseEngineType ? targetDatabaseEngineType : 'SingleInstance',
34-
scriptCompatibilityOption: scriptCompatibilityOption ? scriptCompatibilityOption : 'Script140Compat'
35-
};
36-
return {
37-
connectionString: null,
38-
filePath: paramDetails.filePath,
39-
scriptingObjects: [scriptingObject],
40-
scriptDestination: 'ToEditor',
41-
includeObjectCriteria: null,
42-
excludeObjectCriteria: null,
43-
includeSchemas: null,
44-
excludeSchemas: null,
45-
includeTypes: null,
46-
excludeTypes: null,
47-
scriptOptions,
48-
connectionDetails: null,
49-
selectScript: null,
50-
ownerURI,
51-
operation
52-
};
53-
}
54-
exports.c2p = {
55-
asConnectionParams,
56-
asExecutionPlanOptions,
57-
asScriptingParams
58-
};
1+
"use strict";
2+
Object.defineProperty(exports, "__esModule", { value: true });
3+
const azdata = require("azdata");
4+
function asConnectionParams(ownerUri, connInfo) {
5+
return {
6+
ownerUri,
7+
connection: {
8+
options: connInfo.options
9+
}
10+
};
11+
}
12+
function asExecutionPlanOptions(planOptions) {
13+
return {
14+
includeEstimatedExecutionPlanXml: planOptions ? planOptions.displayEstimatedQueryPlan : undefined,
15+
includeActualExecutionPlanXml: planOptions ? planOptions.displayActualQueryPlan : undefined
16+
};
17+
}
18+
function asScriptingParams(ownerURI, operation, metadata, paramDetails) {
19+
let scriptingObject = {
20+
type: metadata.metadataTypeName,
21+
schema: metadata.schema,
22+
name: metadata.name
23+
};
24+
let targetDatabaseEngineEdition = paramDetails.targetDatabaseEngineEdition;
25+
let targetDatabaseEngineType = paramDetails.targetDatabaseEngineType;
26+
let scriptCompatibilityOption = paramDetails.scriptCompatibilityOption;
27+
let scriptOptions = {
28+
scriptCreateDrop: (operation === azdata.ScriptOperation.Delete) ? 'ScriptDrop' :
29+
(operation === azdata.ScriptOperation.Select) ? 'ScriptSelect' : 'ScriptCreate',
30+
typeOfDataToScript: 'SchemaOnly',
31+
scriptStatistics: 'ScriptStatsNone',
32+
targetDatabaseEngineEdition: targetDatabaseEngineEdition ? targetDatabaseEngineEdition : 'SqlServerEnterpriseEdition',
33+
targetDatabaseEngineType: targetDatabaseEngineType ? targetDatabaseEngineType : 'SingleInstance',
34+
scriptCompatibilityOption: scriptCompatibilityOption ? scriptCompatibilityOption : 'Script140Compat'
35+
};
36+
return {
37+
connectionString: null,
38+
filePath: paramDetails.filePath,
39+
scriptingObjects: [scriptingObject],
40+
scriptDestination: 'ToEditor',
41+
includeObjectCriteria: null,
42+
excludeObjectCriteria: null,
43+
includeSchemas: null,
44+
excludeSchemas: null,
45+
includeTypes: null,
46+
excludeTypes: null,
47+
scriptOptions,
48+
connectionDetails: null,
49+
selectScript: null,
50+
ownerURI,
51+
operation
52+
};
53+
}
54+
exports.c2p = {
55+
asConnectionParams,
56+
asExecutionPlanOptions,
57+
asScriptingParams
58+
};

‎lib/main.d.ts‎

Lines changed: 126 additions & 126 deletions
Original file line numberDiff line numberDiff line change
@@ -1,126 +1,126 @@
1-
import { LanguageClient, ServerOptions, LanguageClientOptions as VSLanguageClientOptions, DynamicFeature, ServerCapabilities, RegistrationData, RPCMessageType, Disposable } from 'vscode-languageclient';
2-
import { Ic2p } from './codeConverter';
3-
import * as protocol from './protocol';
4-
import { Ip2c } from './protocolConverter';
5-
export interface ISqlOpsFeature {
6-
new (client: SqlOpsDataClient): any;
7-
}
8-
export interface ClientOptions extends VSLanguageClientOptions {
9-
providerId: string;
10-
features?: Array<ISqlOpsFeature>;
11-
}
12-
/**
13-
*
14-
*/
15-
export declare abstract class SqlOpsFeature<T> implements DynamicFeature<T> {
16-
protected _client: SqlOpsDataClient;
17-
private _message;
18-
protected _providers: Map<string, Disposable>;
19-
constructor(_client: SqlOpsDataClient, _message: RPCMessageType | RPCMessageType[]);
20-
readonly messages: RPCMessageType | RPCMessageType[];
21-
abstract fillClientCapabilities(capabilities: protocol.ClientCapabilities): void;
22-
abstract initialize(capabilities: ServerCapabilities): void;
23-
register(messages: RPCMessageType | RPCMessageType[], data: RegistrationData<T>): void;
24-
protected abstract registerProvider(options: T): Disposable;
25-
unregister(id: string): void;
26-
dispose(): void;
27-
}
28-
export declare class CapabilitiesFeature extends SqlOpsFeature<undefined> {
29-
private static readonly messagesTypes;
30-
constructor(client: SqlOpsDataClient);
31-
fillClientCapabilities(capabilities: protocol.ClientCapabilities): void;
32-
initialize(capabilities: ServerCapabilities): void;
33-
protected registerProvider(options: undefined): Disposable;
34-
}
35-
export declare class ConnectionFeature extends SqlOpsFeature<undefined> {
36-
private static readonly messagesTypes;
37-
constructor(client: SqlOpsDataClient);
38-
fillClientCapabilities(capabilities: protocol.ClientCapabilities): void;
39-
initialize(capabilities: ServerCapabilities): void;
40-
protected registerProvider(options: undefined): Disposable;
41-
}
42-
export declare class QueryFeature extends SqlOpsFeature<undefined> {
43-
private static readonly messagesTypes;
44-
constructor(client: SqlOpsDataClient);
45-
fillClientCapabilities(capabilities: protocol.ClientCapabilities): void;
46-
initialize(capabilities: ServerCapabilities): void;
47-
protected registerProvider(options: undefined): Disposable;
48-
}
49-
export declare class MetadataFeature extends SqlOpsFeature<undefined> {
50-
private static readonly messagesTypes;
51-
constructor(client: SqlOpsDataClient);
52-
fillClientCapabilities(capabilities: protocol.ClientCapabilities): void;
53-
initialize(capabilities: ServerCapabilities): void;
54-
protected registerProvider(options: undefined): Disposable;
55-
}
56-
export declare class AdminServicesFeature extends SqlOpsFeature<undefined> {
57-
private static readonly messagesTypes;
58-
constructor(client: SqlOpsDataClient);
59-
fillClientCapabilities(capabilities: protocol.ClientCapabilities): void;
60-
initialize(capabilities: ServerCapabilities): void;
61-
protected registerProvider(options: undefined): Disposable;
62-
}
63-
export declare class BackupFeature extends SqlOpsFeature<undefined> {
64-
private static readonly messagesTypes;
65-
constructor(client: SqlOpsDataClient);
66-
fillClientCapabilities(capabilities: protocol.ClientCapabilities): void;
67-
initialize(capabilities: ServerCapabilities): void;
68-
protected registerProvider(options: undefined): Disposable;
69-
}
70-
export declare class RestoreFeature extends SqlOpsFeature<undefined> {
71-
private static readonly messagesTypes;
72-
constructor(client: SqlOpsDataClient);
73-
fillClientCapabilities(capabilities: protocol.ClientCapabilities): void;
74-
initialize(capabilities: ServerCapabilities): void;
75-
protected registerProvider(options: undefined): Disposable;
76-
}
77-
export declare class ObjectExplorerFeature extends SqlOpsFeature<undefined> {
78-
private static readonly messagesTypes;
79-
constructor(client: SqlOpsDataClient);
80-
fillClientCapabilities(capabilities: protocol.ClientCapabilities): void;
81-
initialize(capabilities: ServerCapabilities): void;
82-
protected registerProvider(options: undefined): Disposable;
83-
}
84-
export declare class ScriptingFeature extends SqlOpsFeature<undefined> {
85-
private static readonly messagesTypes;
86-
constructor(client: SqlOpsDataClient);
87-
fillClientCapabilities(capabilities: protocol.ClientCapabilities): void;
88-
initialize(capabilities: ServerCapabilities): void;
89-
protected registerProvider(options: undefined): Disposable;
90-
}
91-
export declare class TaskServicesFeature extends SqlOpsFeature<undefined> {
92-
private static readonly messagesTypes;
93-
constructor(client: SqlOpsDataClient);
94-
fillClientCapabilities(capabilities: protocol.ClientCapabilities): void;
95-
initialize(capabilities: ServerCapabilities): void;
96-
protected registerProvider(options: undefined): Disposable;
97-
}
98-
export declare class FileBrowserFeature extends SqlOpsFeature<undefined> {
99-
private static readonly messagesTypes;
100-
constructor(client: SqlOpsDataClient);
101-
fillClientCapabilities(capabilities: protocol.ClientCapabilities): void;
102-
initialize(capabilities: ServerCapabilities): void;
103-
protected registerProvider(options: undefined): Disposable;
104-
}
105-
export declare class ProfilerFeature extends SqlOpsFeature<undefined> {
106-
private static readonly messagesTypes;
107-
constructor(client: SqlOpsDataClient);
108-
fillClientCapabilities(capabilities: protocol.ClientCapabilities): void;
109-
initialize(capabilities: ServerCapabilities): void;
110-
protected registerProvider(options: undefined): Disposable;
111-
}
112-
/**
113-
*
114-
*/
115-
export declare class SqlOpsDataClient extends LanguageClient {
116-
static readonly defaultFeatures: Array<ISqlOpsFeature>;
117-
private _sqlc2p;
118-
private _sqlp2c;
119-
private _providerId;
120-
readonly sqlc2p: Ic2p;
121-
readonly sqlp2c: Ip2c;
122-
readonly providerId: string;
123-
constructor(name: string, serverOptions: ServerOptions, clientOptions: ClientOptions, forceDebug?: boolean);
124-
constructor(id: string, name: string, serverOptions: ServerOptions, clientOptions: ClientOptions, forceDebug?: boolean);
125-
private registerSqlopsFeatures(features);
126-
}
1+
import { LanguageClient, ServerOptions, LanguageClientOptions as VSLanguageClientOptions, DynamicFeature, ServerCapabilities, RegistrationData, RPCMessageType, Disposable } from 'vscode-languageclient';
2+
import { Ic2p } from './codeConverter';
3+
import * as protocol from './protocol';
4+
import { Ip2c } from './protocolConverter';
5+
export interface ISqlOpsFeature {
6+
new (client: SqlOpsDataClient): any;
7+
}
8+
export interface ClientOptions extends VSLanguageClientOptions {
9+
providerId: string;
10+
features?: Array<ISqlOpsFeature>;
11+
}
12+
/**
13+
*
14+
*/
15+
export declare abstract class SqlOpsFeature<T> implements DynamicFeature<T> {
16+
protected _client: SqlOpsDataClient;
17+
private _message;
18+
protected _providers: Map<string, Disposable>;
19+
constructor(_client: SqlOpsDataClient, _message: RPCMessageType | RPCMessageType[]);
20+
readonly messages: RPCMessageType | RPCMessageType[];
21+
abstract fillClientCapabilities(capabilities: protocol.ClientCapabilities): void;
22+
abstract initialize(capabilities: ServerCapabilities): void;
23+
register(messages: RPCMessageType | RPCMessageType[], data: RegistrationData<T>): void;
24+
protected abstract registerProvider(options: T): Disposable;
25+
unregister(id: string): void;
26+
dispose(): void;
27+
}
28+
export declare class CapabilitiesFeature extends SqlOpsFeature<undefined> {
29+
private static readonly messagesTypes;
30+
constructor(client: SqlOpsDataClient);
31+
fillClientCapabilities(capabilities: protocol.ClientCapabilities): void;
32+
initialize(capabilities: ServerCapabilities): void;
33+
protected registerProvider(options: undefined): Disposable;
34+
}
35+
export declare class ConnectionFeature extends SqlOpsFeature<undefined> {
36+
private static readonly messagesTypes;
37+
constructor(client: SqlOpsDataClient);
38+
fillClientCapabilities(capabilities: protocol.ClientCapabilities): void;
39+
initialize(capabilities: ServerCapabilities): void;
40+
protected registerProvider(options: undefined): Disposable;
41+
}
42+
export declare class QueryFeature extends SqlOpsFeature<undefined> {
43+
private static readonly messagesTypes;
44+
constructor(client: SqlOpsDataClient);
45+
fillClientCapabilities(capabilities: protocol.ClientCapabilities): void;
46+
initialize(capabilities: ServerCapabilities): void;
47+
protected registerProvider(options: undefined): Disposable;
48+
}
49+
export declare class MetadataFeature extends SqlOpsFeature<undefined> {
50+
private static readonly messagesTypes;
51+
constructor(client: SqlOpsDataClient);
52+
fillClientCapabilities(capabilities: protocol.ClientCapabilities): void;
53+
initialize(capabilities: ServerCapabilities): void;
54+
protected registerProvider(options: undefined): Disposable;
55+
}
56+
export declare class AdminServicesFeature extends SqlOpsFeature<undefined> {
57+
private static readonly messagesTypes;
58+
constructor(client: SqlOpsDataClient);
59+
fillClientCapabilities(capabilities: protocol.ClientCapabilities): void;
60+
initialize(capabilities: ServerCapabilities): void;
61+
protected registerProvider(options: undefined): Disposable;
62+
}
63+
export declare class BackupFeature extends SqlOpsFeature<undefined> {
64+
private static readonly messagesTypes;
65+
constructor(client: SqlOpsDataClient);
66+
fillClientCapabilities(capabilities: protocol.ClientCapabilities): void;
67+
initialize(capabilities: ServerCapabilities): void;
68+
protected registerProvider(options: undefined): Disposable;
69+
}
70+
export declare class RestoreFeature extends SqlOpsFeature<undefined> {
71+
private static readonly messagesTypes;
72+
constructor(client: SqlOpsDataClient);
73+
fillClientCapabilities(capabilities: protocol.ClientCapabilities): void;
74+
initialize(capabilities: ServerCapabilities): void;
75+
protected registerProvider(options: undefined): Disposable;
76+
}
77+
export declare class ObjectExplorerFeature extends SqlOpsFeature<undefined> {
78+
private static readonly messagesTypes;
79+
constructor(client: SqlOpsDataClient);
80+
fillClientCapabilities(capabilities: protocol.ClientCapabilities): void;
81+
initialize(capabilities: ServerCapabilities): void;
82+
protected registerProvider(options: undefined): Disposable;
83+
}
84+
export declare class ScriptingFeature extends SqlOpsFeature<undefined> {
85+
private static readonly messagesTypes;
86+
constructor(client: SqlOpsDataClient);
87+
fillClientCapabilities(capabilities: protocol.ClientCapabilities): void;
88+
initialize(capabilities: ServerCapabilities): void;
89+
protected registerProvider(options: undefined): Disposable;
90+
}
91+
export declare class TaskServicesFeature extends SqlOpsFeature<undefined> {
92+
private static readonly messagesTypes;
93+
constructor(client: SqlOpsDataClient);
94+
fillClientCapabilities(capabilities: protocol.ClientCapabilities): void;
95+
initialize(capabilities: ServerCapabilities): void;
96+
protected registerProvider(options: undefined): Disposable;
97+
}
98+
export declare class FileBrowserFeature extends SqlOpsFeature<undefined> {
99+
private static readonly messagesTypes;
100+
constructor(client: SqlOpsDataClient);
101+
fillClientCapabilities(capabilities: protocol.ClientCapabilities): void;
102+
initialize(capabilities: ServerCapabilities): void;
103+
protected registerProvider(options: undefined): Disposable;
104+
}
105+
export declare class ProfilerFeature extends SqlOpsFeature<undefined> {
106+
private static readonly messagesTypes;
107+
constructor(client: SqlOpsDataClient);
108+
fillClientCapabilities(capabilities: protocol.ClientCapabilities): void;
109+
initialize(capabilities: ServerCapabilities): void;
110+
protected registerProvider(options: undefined): Disposable;
111+
}
112+
/**
113+
*
114+
*/
115+
export declare class SqlOpsDataClient extends LanguageClient {
116+
static readonly defaultFeatures: Array<ISqlOpsFeature>;
117+
private _sqlc2p;
118+
private _sqlp2c;
119+
private _providerId;
120+
readonly sqlc2p: Ic2p;
121+
readonly sqlp2c: Ip2c;
122+
readonly providerId: string;
123+
constructor(name: string, serverOptions: ServerOptions, clientOptions: ClientOptions, forceDebug?: boolean);
124+
constructor(id: string, name: string, serverOptions: ServerOptions, clientOptions: ClientOptions, forceDebug?: boolean);
125+
private registerSqlopsFeatures(features);
126+
}

0 commit comments

Comments
 (0)