Changes to address pr comments.

Author: bdrodes

cpp/ql/lib/semmle/code/cpp/models/Models.qll

@@ -9,7 +9,6 @@ private import implementations.Iterator
 private import implementations.MemberFunction
 private import implementations.Memcpy
 private import implementations.Memset
-private import implementations.ODBC
 private import implementations.Printf
 private import implementations.Pure
 private import implementations.Strcat
@@ -36,6 +35,7 @@ private import implementations.Accept
 private import implementations.Poll
 private import implementations.Select
 private import implementations.MySql
+private import implementations.ODBC
 private import implementations.SqLite3
 private import implementations.PostgreSql
 private import implementations.System

cpp/ql/lib/semmle/code/cpp/models/implementations/ODBC.qll

@@ -18,7 +18,7 @@ private import semmle.code.cpp.models.interfaces.FunctionInputsAndOutputs
  */
 private class ODBCExecutionFunction extends SqlExecutionFunction {
   ODBCExecutionFunction() {
-    exists(string s | s in ["SQLExecDirect", "SQLPrepare"] and this.hasName(s))
+    this.hasGlobalName(["SQLExecDirect", "SQLPrepare"])
   }
 
   override predicate hasSqlArgument(FunctionInput input) { input.isParameterDeref(1) }