ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-13 03:28:33 -05:00
Code Issues Packages Projects Releases Wiki Activity

ML - Bug fixing (#13018)

Browse Source 
* Fixing couple of bugs
This commit is contained in:
Leila Lali
2020-10-26 17:36:37 -07:00
committed by GitHub
parent 20ed569a71
commit eec6f64d62
10 changed files with 121 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
extensions/machine-learning/src/prediction/interfaces.ts
View File

@@ -6,6 +6,7 @@
export interface TableColumn {
columnName: string;
dataType?: string;
maxLength?: number;
}
export interface PredictColumn extends TableColumn {

3
extensions/machine-learning/src/prediction/predictService.ts
View File

@@ -127,7 +127,8 @@ export class PredictService {
result.rows.forEach(row => {
list.push({
columnName: row[0].displayValue,
dataType: row[1].displayValue.toLocaleUpperCase()
dataType: row[1].displayValue.toLocaleUpperCase(),
maxLength: row[2].isNull ? undefined : +row[2].displayValue.toLocaleUpperCase()
});
});
}

12
extensions/machine-learning/src/prediction/queries.ts
View File

@@ -5,10 +5,11 @@
import * as utils from '../common/utils';
import { PredictColumn, DatabaseTable } from './interfaces';
import * as constants from '../common/constants';
export function getTableColumnsScript(databaseTable: DatabaseTable): string {
return `
SELECT COLUMN_NAME,DATA_TYPE
SELECT COLUMN_NAME,DATA_TYPE,CHARACTER_MAXIMUM_LENGTH
FROM INFORMATION_SCHEMA.COLUMNS
WHERE TABLE_NAME='${utils.doubleEscapeSingleQuotes(databaseTable.tableName)}'
AND TABLE_SCHEMA='${utils.doubleEscapeSingleQuotes(databaseTable.schema)}'
@@ -57,13 +58,13 @@ export function getPredictScriptWithModelBytes(
modelBytes: string,
columns: PredictColumn[],
outputColumns: PredictColumn[],
databaseNameTable: DatabaseTable): string {
sourceTable: DatabaseTable): string {
return `
WITH predict_input
AS (
SELECT TOP 1000
${getInputColumnNames(columns, 'pi')}
FROM [${utils.doubleEscapeSingleBrackets(databaseNameTable.databaseName)}].[${databaseNameTable.schema}].[${utils.doubleEscapeSingleBrackets(databaseNameTable.tableName)}] AS pi
FROM [${utils.doubleEscapeSingleBrackets(sourceTable.databaseName)}].[${sourceTable.schema}].[${utils.doubleEscapeSingleBrackets(sourceTable.tableName)}] AS pi
)
SELECT
${getPredictColumnNames(columns, 'predict_input')},
@@ -78,11 +79,14 @@ ${getOutputParameters(outputColumns)}
export function getEscapedColumnName(tableName: string, columnName: string): string {
return `[${utils.doubleEscapeSingleBrackets(tableName)}].[${utils.doubleEscapeSingleBrackets(columnName)}]`;
}
export function getInputColumnNames(columns: PredictColumn[], tableName: string) {
return columns.map(c => {
const column = getEscapedColumnName(tableName, c.columnName);
let columnName = c.dataType !== c.paramType ? `CAST(${column} AS ${c.paramType})`
const maxLength = c.maxLength !== undefined ? c.maxLength : constants.varcharDefaultLength;
let paramType = c.paramType === constants.varcharMax ? `VARCHAR(${maxLength})` : c.paramType;
let columnName = c.dataType !== c.paramType ? `CAST(${column} AS ${paramType})`
: `${column}`;
return `${columnName} AS ${c.paramName}`;
}).join(',\n ');