Skip to content

Support filtering DSN by scope #1461

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bkline wants to merge 1 commit into
base: master
Choose a base branch
from
+31 −5
Open

Support filtering DSN by scope #1461

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 31 additions & 5 deletions src/pyodbcmodule.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -574,10 +574,30 @@ static PyObject* mod_drivers(PyObject* self)
}


static PyObject* mod_datasources(PyObject* self)
static PyObject* mod_datasources(PyObject* self, PyObject* args, PyObject* kwargs)
{
UNUSED(self);

static char* kwlist[] = { "scope", NULL };
const char* scope = NULL;

if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|$s", kwlist, &scope))
return 0;

SQLUSMALLINT nDirectionFirst;

if (scope == NULL)
nDirectionFirst = SQL_FETCH_FIRST;
else if (strcmp(scope, "user") == 0)
nDirectionFirst = SQL_FETCH_FIRST_USER;
else if (strcmp(scope, "system") == 0)
nDirectionFirst = SQL_FETCH_FIRST_SYSTEM;
else
{
PyErr_SetString(PyExc_ValueError, "scope must be 'user' or 'system'");
return 0;
}

if (henv == SQL_NULL_HANDLE && !AllocateEnv())
return 0;

Expand All @@ -597,7 +617,7 @@ static PyObject* mod_datasources(PyObject* self)
SWORD cbDSN;
SWORD cbDesc;

SQLUSMALLINT nDirection = SQL_FETCH_FIRST;
SQLUSMALLINT nDirection = nDirectionFirst;

SQLRETURN ret;

Expand Down Expand Up @@ -768,9 +788,15 @@ static char drivers_doc[] =
"Returns a list of installed drivers.";

static char datasources_doc[] =
"dataSources() --> { DSN : Description }\n" \
"dataSources(*, scope=None) --> { DSN : Description }\n" \
"\n" \
"Returns a dictionary mapping available DSNs to their descriptions.\n" \
"\n" \
"Returns a dictionary mapping available DSNs to their descriptions.";
"scope\n" \
" An optional keyword-only argument to filter the returned DSNs.\n" \
" If set to 'user', only user DSNs are returned.\n" \
" If set to 'system', only system DSNs are returned.\n" \
" If not set, all DSNs are returned.";

static char setdecimalsep_doc[] =
"setDecimalSeparator(string) -> None\n" \
Expand All @@ -792,7 +818,7 @@ static PyMethodDef pyodbc_methods[] =
{ "getDecimalSeparator", (PyCFunction)mod_getdecimalsep, METH_NOARGS, getdecimalsep_doc },
{ "TimestampFromTicks", (PyCFunction)mod_timestampfromticks, METH_VARARGS, timestampfromticks_doc },
{ "drivers", (PyCFunction)mod_drivers, METH_NOARGS, drivers_doc },
{ "dataSources", (PyCFunction)mod_datasources, METH_NOARGS, datasources_doc },
{ "dataSources", (PyCFunction)mod_datasources, METH_VARARGS|METH_KEYWORDS, datasources_doc },
{ 0, 0, 0, 0 }
};

Expand Down