Index: AXimpl/SqlQueryConnection.cls.xml
===================================================================
diff -u -r55703 -r74271
--- AXimpl/SqlQueryConnection.cls.xml	(.../SqlQueryConnection.cls.xml)	(revision 55703)
+++ AXimpl/SqlQueryConnection.cls.xml	(.../SqlQueryConnection.cls.xml)	(revision 74271)
@@ -13,10 +13,8 @@
 <ReturnType>TECH.ResultSet</ReturnType>
 <Implementation><![CDATA[
     Set ..AxCon=##class(%SQLGatewayConnection).%New()
-    #dim AXServer As %String = ##class(TECH.Config.ConfigMgr).Instance().GetString("AXimpl.SqlGatewayConnection_ConnectionDataSourceName")
-    
-    Do ##class(TECH.Exceptions.StatusException).ThrowIndienNietOK(..AxCon.Connect(AXServer,"",""))
-    
+	Do ..ConnectToSqlGC()
+	
     try {
 	    Set res=##class(TECH.ResultSet).%New("%DynamicQueryGW:SQLGW")
     	Do res.Prepare(SqlStatement,,..AxCon)
@@ -34,10 +32,8 @@
 <ReturnType>TECH.ResultSet</ReturnType>
 <Implementation><![CDATA[
     Set ..AxCon=##class(%SQLGatewayConnection).%New()
-    #dim AXServer As %String = ##class(TECH.Config.ConfigMgr).Instance().GetString("AXimpl.SqlGatewayConnection_ConnectionDataSourceName")
-    
-    Do ##class(TECH.Exceptions.StatusException).ThrowIndienNietOK(..AxCon.Connect(AXServer,"",""))
-    
+	Do ..ConnectToSqlGC()
+	
     try {
 	    Set res=##class(TECH.ResultSet).%New("%DynamicQueryGW:SQLGW")
 
@@ -55,6 +51,27 @@
 <Implementation><![CDATA[	Do ..AxCon.Disconnect()
 ]]></Implementation>
 </Method>
+
+<Method name="ConnectToSqlGC">
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim ConfigMgr As TECH.Config.ConfigMgr = ##class(TECH.Config.ConfigMgr).Instance()
+	#dim AXServer As %String = ConfigMgr.GetString("AXimpl.SqlGatewayConnection_ConnectionDataSourceName")
+
+	#dim HeeftSqlLoginNodig As %Boolean = $$$Not(##class(TECH.StringUtils).Equals(AXServer, "AX", "AX2"))
+	
+	#dim SqlUserName As %String = ""
+	#dim SqlPasswd As %String = ""
+	
+	If HeeftSqlLoginNodig {
+		Set SqlUserName = ConfigMgr.GetString("AXimpl.SqlGatewayConnection_ConnectionDataSource_SqlUser")
+		Set SqlPasswd = ConfigMgr.GetString("AXimpl.SqlGatewayConnection_ConnectionDataSource_SqlPassword")
+	}
+	
+	#dim scConnect As %Status = ..AxCon.Connect(AXServer,SqlUserName,SqlPasswd)
+	Do ##class(TECH.Exceptions.StatusException).ThrowIndienNietOK(scConnect)
+]]></Implementation>
+</Method>
 </Class>