Changeset e4e21ee in tol

Timestamp:

Jun 3, 2013, 6:24:27 PM (13 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

2c813bc

Parents:

f737237

Message:

refs #1692, implementing function handler for mysql, postgres & odbc.

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@5900 be4846ae-f051-483a-831f-b64e7d08527f

Location:

tol/dbdrivers

Files:

• libtolmysql.c (modified) (1 diff)
• libtolodbc.c (modified) (1 diff)
• libtolpgsql.c (modified) (1 diff)

tol/dbdrivers/libtolmysql.c

@@ -133 +133 @@
 }
 
+DLLEXPORT(int) mysql_GetDBMSName(mysqld *dbd, char *dbmsName, size_t size)
+{
+  const char* mysqlName = "mysql";
+  strncpy(dbmsName, mysqlName, size);
+  return 1;
+}
+
+DLLEXPORT(int) mysql_GetDBMSVersion(mysqld *dbd, char *dbmsVersion, size_t size)
+{
+  strncpy(dbmsVersion, dbd->desc->server_version, size);
+  return 1;
+}
+
+DLLEXPORT(int) mysql_GetDataBaseName(mysqld *dbd, char *database, size_t size)
+{
+  const char* unknownName = "unknown";
+  strncpy(database, unknownName, size);
+  return 1;
+}
+
 //--------------------------------------------------------------------
 /*! Opens a query (executing it).

tol/dbdrivers/libtolodbc.c

@@ -325 +325 @@
 }
 
+DLLEXPORT(int) odbc_GetDBMSName(odbcd *dbd, char *dbmsName, size_t size)
+{
+  SQLSMALLINT BufferLength = (SQLSMALLINT)size;
+  SQLSMALLINT ActualLength;
+  
+  SQLRETURN status = SQLGetInfo(dbd->hdbc, SQL_DBMS_NAME,
+                                dbmsName, BufferLength, &ActualLength);
+  return checkSQLRet(status, dbd->hdbc, __LINE__, GET_DIAG_DBC);
+}
+
+DLLEXPORT(int) odbc_GetDBMSVersion(odbcd *dbd, char *dbmsVersion, size_t size)
+{
+  SQLSMALLINT BufferLength = (SQLSMALLINT)size;
+  SQLSMALLINT ActualLength;
+  
+  SQLRETURN status = SQLGetInfo(dbd->hdbc, SQL_DBMS_VER,
+                                dbmsVersion, BufferLength, &ActualLength);
+  return checkSQLRet(status, dbd->hdbc, __LINE__, GET_DIAG_DBC);
+}
+
+DLLEXPORT(int) odbc_GetDataBaseName(odbcd *dbd, char *database, size_t size)
+{
+  SQLSMALLINT BufferLength = (SQLSMALLINT)size;
+  SQLSMALLINT ActualLength;
+  
+  SQLRETURN status = SQLGetInfo(dbd->hdbc, SQL_DATABASE_NAME,
+                                database, BufferLength, &ActualLength);
+  return checkSQLRet(status, dbd->hdbc, __LINE__, GET_DIAG_DBC);
+}
+
 //-------------------------------------------------------------------
 /*! \return Returns 1 if the connection has been successfully 

tol/dbdrivers/libtolpgsql.c

@@ -135 +135 @@
   PQfinish(dbd->conn);
   dbd->conn = NULL;
+  return 1;
+}
+
+DLLEXPORT(int) postgres_GetDBMSName(pgsqld *dbd, char *dbmsName, size_t size)
+{
+  const char* pgsqlName = "postgres";
+  strncpy(dbmsName, pgsqlName, sizeof(pgsqlName)-1);
+  return 1;
+}
+
+DLLEXPORT(int) postgres_GetDBMSVersion(pgsqld *dbd, char *dbmsVersion, size_t size)
+{
+  int version = PQserverVersion(dbd->conn);
+  int major = version / 10000;
+  int min_rev = version - major*10000;
+  int minor = (min_rev) / 100;
+  int revision = (min_rev - minor*100);
+  snprintf(dbmsVersion, size, "%d.%d.%d", major, minor, revision);
+  return 1;
+}
+
+DLLEXPORT(int) postgres_GetDataBaseName(pgsqld *dbd, char *database, size_t size)
+{
+  strncpy(database, PQdb(dbd->conn), size);
   return 1;
 }