Merge pull request #22 from pacoweb/refactor_fix

pacoweb · web-flow · commit 2536ddaf670b · 2024-06-04T22:07:18.000+02:00
Fix Azure Sql Server connection error
diff --git a/extension.js b/extension.js
@@ -49,7 +49,7 @@ async function handleCommand(context, getScriptFunc, clipboard = false, identity
             });
         }
     } catch (reason) {
-        vscode.window.showErrorMessage(reason);
+        vscode.window.showErrorMessage(reason.message);
     }
 }
 
diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
 	"displayName": "Extra Sql Script As",
 	"description": "This extension adds several missing options to the context menu of the object tree: Script Table as INSERT, Script Table as UPDATE...",
 	"publisher": "pacoweb",
-	"version": "0.6.2",
+	"version": "0.6.3",
 	"license": "https://raw.githubusercontent.com/pacoweb/extraSqlScriptAs/master/LICENSE",
 	"icon": "images/default_icon.png",
 	"repository": {
diff --git a/scriptInsertAs.js b/scriptInsertAs.js
@@ -17,7 +17,7 @@ async function getSqlScriptAsInsertAsync(connectionProfile, tableCatalog, tableS
 {
     let queryText = sqlUtils.getColumnInfoQuerySql(tableCatalog, tableSchema, tableName);
 
-    let results = await sqlUtils.getResultsFromQuerySql(connectionProfile, "MSSQL", queryText);
+    let results = await sqlUtils.getResultsFromQuerySql(connectionProfile, "MSSQL", queryText, tableCatalog);
 
     if (!results || results.rowCount === 0) {
         throw "No se han obtenido resultados de la consulta";
diff --git a/scriptSelectAs.js b/scriptSelectAs.js
@@ -8,7 +8,7 @@ async function getSqlScriptAsSelectAsync(connectionProfile, tableCatalog, tableS
 {
     let queryText = sqlUtils.getColumnInfoQuerySql(tableCatalog, tableSchema, tableName);
 
-    let results = await sqlUtils.getResultsFromQuerySql(connectionProfile, "MSSQL", queryText);
+    let results = await sqlUtils.getResultsFromQuerySql(connectionProfile, "MSSQL", queryText, tableCatalog);
 
     if (!results || results.rowCount === 0) {
         throw "No se han obtenido resultados de la consulta";
diff --git a/scriptSqlUtils.js b/scriptSqlUtils.js
@@ -44,8 +44,14 @@ function getColumnInfoQuerySql(tableCatalog, tableSchema, tableName)
         ORDER BY COL.ORDINAL_POSITION`;
 }
 
-async function getResultsFromQuerySql(connectionProfile, providerText, queryText) 
+async function getResultsFromQuerySql(connectionProfile, providerText, queryText, tableCatalog) 
 {
+    //FIX AZURE DATA PROVIDER, WHEN DEFAULT DATABASE IS NOT SET USE ALWAYS MASTER IN CONNECTION PROFILE OPTIONS
+    if(tableCatalog 
+        && connectionProfile.options.database != tableCatalog){
+            connectionProfile.options.database = tableCatalog;
+    }
+    
     let connectionResult = await azdata.connection.connect(connectionProfile, false, false);
     let connectionUri = await azdata.connection.getUriForConnection(connectionResult.connectionId);
 
diff --git a/scriptUpdateAs.js b/scriptUpdateAs.js
@@ -16,7 +16,7 @@ async function getSqlScriptAsUpdateAsync(connectionProfile, tableCatalog, tableS
 {
     let queryText = sqlUtils.getColumnInfoQuerySql(tableCatalog, tableSchema, tableName);
 
-    let results = await sqlUtils.getResultsFromQuerySql(connectionProfile, "MSSQL", queryText);
+    let results = await sqlUtils.getResultsFromQuerySql(connectionProfile, "MSSQL", queryText, tableCatalog);
 
     if (!results || results.rowCount === 0) {
         throw "No se han obtenido resultados de la consulta";

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ async function handleCommand(context, getScriptFunc, clipboard = false, identity`
`49`	`49`	`});`
`50`	`50`	`}`
`51`	`51`	`} catch (reason) {`
`52`		`- vscode.window.showErrorMessage(reason);`
	`52`	`+ vscode.window.showErrorMessage(reason.message);`
`53`	`53`	`}`
`54`	`54`	`}`
`55`	`55`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ async function getSqlScriptAsInsertAsync(connectionProfile, tableCatalog, tableS`
`17`	`17`	`{`
`18`	`18`	`let queryText = sqlUtils.getColumnInfoQuerySql(tableCatalog, tableSchema, tableName);`
`19`	`19`
`20`		`- let results = await sqlUtils.getResultsFromQuerySql(connectionProfile, "MSSQL", queryText);`
	`20`	`+ let results = await sqlUtils.getResultsFromQuerySql(connectionProfile, "MSSQL", queryText, tableCatalog);`
`21`	`21`
`22`	`22`	`if (!results \|\| results.rowCount === 0) {`
`23`	`23`	`throw "No se han obtenido resultados de la consulta";`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ async function getSqlScriptAsSelectAsync(connectionProfile, tableCatalog, tableS`
`8`	`8`	`{`
`9`	`9`	`let queryText = sqlUtils.getColumnInfoQuerySql(tableCatalog, tableSchema, tableName);`
`10`	`10`
`11`		`- let results = await sqlUtils.getResultsFromQuerySql(connectionProfile, "MSSQL", queryText);`
	`11`	`+ let results = await sqlUtils.getResultsFromQuerySql(connectionProfile, "MSSQL", queryText, tableCatalog);`
`12`	`12`
`13`	`13`	`if (!results \|\| results.rowCount === 0) {`
`14`	`14`	`throw "No se han obtenido resultados de la consulta";`
Original file line number	Diff line number	Diff line change
`@@ -44,8 +44,14 @@ function getColumnInfoQuerySql(tableCatalog, tableSchema, tableName)`
`44`	`44`	ORDER BY COL.ORDINAL_POSITION`;
`45`	`45`	`}`
`46`	`46`
`47`		`-async function getResultsFromQuerySql(connectionProfile, providerText, queryText)`
	`47`	`+async function getResultsFromQuerySql(connectionProfile, providerText, queryText, tableCatalog)`
`48`	`48`	`{`
	`49`	`+ //FIX AZURE DATA PROVIDER, WHEN DEFAULT DATABASE IS NOT SET USE ALWAYS MASTER IN CONNECTION PROFILE OPTIONS`
	`50`	`+ if(tableCatalog`
	`51`	`+ && connectionProfile.options.database != tableCatalog){`
	`52`	`+ connectionProfile.options.database = tableCatalog;`
	`53`	`+ }`
	`54`	`+`
`49`	`55`	`let connectionResult = await azdata.connection.connect(connectionProfile, false, false);`
`50`	`56`	`let connectionUri = await azdata.connection.getUriForConnection(connectionResult.connectionId);`
`51`	`57`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ async function getSqlScriptAsUpdateAsync(connectionProfile, tableCatalog, tableS`
`16`	`16`	`{`
`17`	`17`	`let queryText = sqlUtils.getColumnInfoQuerySql(tableCatalog, tableSchema, tableName);`
`18`	`18`
`19`		`- let results = await sqlUtils.getResultsFromQuerySql(connectionProfile, "MSSQL", queryText);`
	`19`	`+ let results = await sqlUtils.getResultsFromQuerySql(connectionProfile, "MSSQL", queryText, tableCatalog);`
`20`	`20`
`21`	`21`	`if (!results \|\| results.rowCount === 0) {`
`22`	`22`	`throw "No se han obtenido resultados de la consulta";`