You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by ma...@apache.org on 2016/08/15 06:04:13 UTC
[1/2] kylin git commit: ODBC: sqlprepare workaround
Repository: kylin
Updated Branches:
refs/heads/master bebe9dc56 -> 5860c497e
ODBC: sqlprepare workaround
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/54833750
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/54833750
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/54833750
Branch: refs/heads/master
Commit: 548337500939ce125d5655fa5382b800d4614eab
Parents: bebe9dc
Author: Hongbin Ma <ma...@apache.org>
Authored: Thu Aug 11 21:01:55 2016 +0800
Committer: Hongbin Ma <ma...@apache.org>
Committed: Mon Aug 15 13:51:15 2016 +0800
----------------------------------------------------------------------
odbc/Driver/KO_EXEC.CPP | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/54833750/odbc/Driver/KO_EXEC.CPP
----------------------------------------------------------------------
diff --git a/odbc/Driver/KO_EXEC.CPP b/odbc/Driver/KO_EXEC.CPP
index 0f786ca..28b7f91 100644
--- a/odbc/Driver/KO_EXEC.CPP
+++ b/odbc/Driver/KO_EXEC.CPP
@@ -168,6 +168,9 @@ RETCODE SQL_API SQLPrepare ( SQLHSTMT pStmt,
RETCODE SQL_API SQLPrepareW ( SQLHSTMT pStmt,
SQLWCHAR* pStmtText,
SQLINTEGER pTextLength ) {
+
+
+
wchar_t* s;
__ODBCLOG ( _ODBCLogMsg ( LogLevel_DEBUG, "SQLPrepareW called on: %d", pStmt ) );
__CHK_HANDLE ( pStmt, SQL_HANDLE_STMT, SQL_ERROR );
@@ -196,7 +199,11 @@ RETCODE SQL_API SQLPrepareW ( SQLHSTMT pStmt,
// MARK as prepared
// set the flag
( ( pODBCStmt ) pStmt )->Prepared = 1;
- return SQL_SUCCESS;
+
+
+ return _SQLExecStmtFromReq((pODBCStmt)pStmt,1);
+
+ //return SQL_SUCCESS;
}
[2/2] kylin git commit: ODBC: to support cognos use mysql as DBMS name
Posted by ma...@apache.org.
ODBC: to support cognos use mysql as DBMS name
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/5860c497
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/5860c497
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/5860c497
Branch: refs/heads/master
Commit: 5860c497e718a82a2162742320e8c566a5c0c266
Parents: 5483375
Author: Hongbin Ma <ma...@apache.org>
Authored: Mon Aug 15 13:50:55 2016 +0800
Committer: Hongbin Ma <ma...@apache.org>
Committed: Mon Aug 15 13:51:23 2016 +0800
----------------------------------------------------------------------
odbc/Driver/KO_INFO.CPP | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/5860c497/odbc/Driver/KO_INFO.CPP
----------------------------------------------------------------------
diff --git a/odbc/Driver/KO_INFO.CPP b/odbc/Driver/KO_INFO.CPP
index 21c39e6..55641ea 100644
--- a/odbc/Driver/KO_INFO.CPP
+++ b/odbc/Driver/KO_INFO.CPP
@@ -392,7 +392,7 @@ RETCODE SQL_API SQLGetInfoW ( SQLHDBC pConn,
break;
case SQL_DBMS_NAME : // 17 called
- _SQLCopyWCharData ( _DIAGCONN ( pConn ), pInfoValuePtr, pBufferLength, pStringLengthPtr, 16, "Gen ODBC Server", -1 );
+ _SQLCopyWCharData ( _DIAGCONN ( pConn ), pInfoValuePtr, pBufferLength, pStringLengthPtr, 16, "MySQL", -1 );
break;
case SQL_ODBC_SQL_CONFORMANCE : // 15
@@ -970,7 +970,7 @@ RETCODE SQL_API SQLGetInfo ( SQLHDBC pConn,
break;
case SQL_DBMS_NAME : // 17 called
- _SQLCopyCharData ( _DIAGCONN ( pConn ), pInfoValuePtr, pBufferLength, pStringLengthPtr, 16, "Gen ODBC Server", -1 );
+ _SQLCopyCharData ( _DIAGCONN ( pConn ), pInfoValuePtr, pBufferLength, pStringLengthPtr, 16, "MySQL", -1 );
break;
case SQL_ODBC_SQL_CONFORMANCE : // 15