Commit d8f98c51 authored by Marcus D. Hanwell's avatar Marcus D. Hanwell
Browse files

Removed MySQL, PostgreSQL ifdefs

The URL logic probably needs moving into the relevant modules.

Change-Id: I38df0c41995ee56ed5c9ebed3eb4e8ce4fe757a5
parent 2cad2031
......@@ -39,34 +39,6 @@
/* Whether we are building MPI support. */
#cmakedefine VTK_USE_MPI
/* Should VTK use PostgreSQL? */
#cmakedefine VTK_USE_POSTGRES
/* Should VTK use MySQL? */
#cmakedefine VTK_USE_MYSQL
/* Should VTK use ODBC? */
#cmakedefine VTK_USE_ODBC
#cmakedefine VTK_ODBC_TEST_DSN
#ifdef VTK_ODBC_TEST_DSN
# undef VTK_ODBC_TEST_DSN
# define VTK_ODBC_TEST_DSN "@VTK_ODBC_TEST_DSN@"
#endif
/* Is a test PostgreSQL database URL defined? */
#cmakedefine VTK_PSQL_TEST_URL
#ifdef VTK_PSQL_TEST_URL
# undef VTK_PSQL_TEST_URL
# define VTK_PSQL_TEST_URL "@VTK_PSQL_TEST_URL@"
#endif
/* Is a test MySQL database URL defined? */
#cmakedefine VTK_MYSQL_TEST_URL
#ifdef VTK_MYSQL_TEST_URL
# undef VTK_MYSQL_TEST_URL
# define VTK_MYSQL_TEST_URL "@VTK_MYSQL_TEST_URL@"
#endif
/* Debug leaks support. */
#cmakedefine VTK_DEBUG_LEAKS
......
......@@ -27,18 +27,6 @@ PURPOSE. See the above copyright notice for more information.
#include "vtkSQLiteDatabase.h"
#ifdef VTK_USE_POSTGRES
#include "vtkPostgreSQLDatabase.h"
#endif // VTK_USE_POSTGRES
#ifdef VTK_USE_MYSQL
#include "vtkMySQLDatabase.h"
#endif // VTK_USE_MYSQL
#ifdef VTK_USE_ODBC
#include "vtkODBCDatabase.h"
#endif // VTK_USE_ODBC
#include "vtkCriticalSection.h"
#include "vtkObjectFactory.h"
#include "vtkStdString.h"
......@@ -423,30 +411,6 @@ vtkSQLDatabase* vtkSQLDatabase::CreateFromURL( const char* URL )
return 0;
}
#ifdef VTK_USE_POSTGRES
if ( protocol == "psql" )
{
db = vtkPostgreSQLDatabase::New();
db->ParseURL( URL );
}
#endif // VTK_USE_POSTGRES
#ifdef VTK_USE_MYSQL
if ( protocol == "mysql" )
{
db = vtkMySQLDatabase::New();
db->ParseURL( URL );
}
#endif // VTK_USE_MYSQL
#ifdef VTK_USE_ODBC
if ( protocol == "odbc" )
{
db = vtkODBCDatabase::New();
db->ParseURL( URL );
}
#endif // VTK_USE_ODBC
// Now try to look at registered callback to try and find someone who can
// provide us with the required implementation.
if (!db && vtkSQLDatabase::Callbacks)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment