summaryrefslogtreecommitdiffstats
path: root/kexi/kexidb/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'kexi/kexidb/drivers')
-rw-r--r--kexi/kexidb/drivers/mySQL/mysqldriver.cpp6
-rw-r--r--kexi/kexidb/drivers/mySQL/mysqlkeywords.cpp4
-rw-r--r--kexi/kexidb/drivers/pqxx/pqxxconnection.h4
-rw-r--r--kexi/kexidb/drivers/pqxx/pqxxconnection_p.h4
-rw-r--r--kexi/kexidb/drivers/pqxx/pqxxcursor.cpp4
-rw-r--r--kexi/kexidb/drivers/pqxx/pqxxcursor.h4
-rw-r--r--kexi/kexidb/drivers/pqxx/pqxxdriver.cpp2
-rw-r--r--kexi/kexidb/drivers/pqxx/pqxxdriver.h4
-rw-r--r--kexi/kexidb/drivers/pqxx/pqxxpreparedstatement.h4
-rw-r--r--kexi/kexidb/drivers/sqlite/sqlitedriver.cpp8
10 files changed, 22 insertions, 22 deletions
diff --git a/kexi/kexidb/drivers/mySQL/mysqldriver.cpp b/kexi/kexidb/drivers/mySQL/mysqldriver.cpp
index 0f2bcf9b..0d2fe99b 100644
--- a/kexi/kexidb/drivers/mySQL/mysqldriver.cpp
+++ b/kexi/kexidb/drivers/mySQL/mysqldriver.cpp
@@ -63,9 +63,9 @@ MySqlDriver::MySqlDriver(TQObject *parent, const char *name, const TQStringList
beh->ROW_ID_FIELD_NAME="LAST_INSERT_ID()";
beh->ROW_ID_FIELD_RETURNS_LAST_AUTOINCREMENTED_VALUE=true;
- beh->_1ST_ROW_READ_AHEAD_RETQUIRED_TO_KNOW_IF_THE_RESULT_IS_EMPTY=false;
- beh->USING_DATABASE_RETQUIRED_TO_CONNECT=false;
- beh->TQUOTATION_MARKS_FOR_IDENTIFIER='`';
+ beh->_1ST_ROW_READ_AHEAD_REQUIRED_TO_KNOW_IF_THE_RESULT_IS_EMPTY=false;
+ beh->USING_DATABASE_REQUIRED_TO_CONNECT=false;
+ beh->QUOTATION_MARKS_FOR_IDENTIFIER='`';
beh->SQL_KEYWORDS = keywords;
initSQLKeywords(331);
diff --git a/kexi/kexidb/drivers/mySQL/mysqlkeywords.cpp b/kexi/kexidb/drivers/mySQL/mysqlkeywords.cpp
index 89aad061..e06adb5e 100644
--- a/kexi/kexidb/drivers/mySQL/mysqlkeywords.cpp
+++ b/kexi/kexidb/drivers/mySQL/mysqlkeywords.cpp
@@ -177,7 +177,7 @@ namespace KexiDB {
"MASTER_SSL_KEY",
"MASTER_USER",
"MAX_CONNECTIONS_PER_HOUR",
- "MAX_TQUERIES_PER_HOUR",
+ "MAX_QUERIES_PER_HOUR",
"MAX_ROWS",
"MAX_UPDATES_PER_HOUR",
"MEDIUM",
@@ -246,7 +246,7 @@ namespace KexiDB {
"REPAIR",
"REPEATABLE",
"REPLICATION",
- "RETQUIRE",
+ "REQUIRE",
"RESET",
"RESTORE",
"RETURNS",
diff --git a/kexi/kexidb/drivers/pqxx/pqxxconnection.h b/kexi/kexidb/drivers/pqxx/pqxxconnection.h
index 7e7cdf69..2773e08d 100644
--- a/kexi/kexidb/drivers/pqxx/pqxxconnection.h
+++ b/kexi/kexidb/drivers/pqxx/pqxxconnection.h
@@ -17,8 +17,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef PTQXXCONNECTION_H
-#define PTQXXCONNECTION_H
+#ifndef PQXXCONNECTION_H
+#define PQXXCONNECTION_H
#include <tqstringlist.h>
diff --git a/kexi/kexidb/drivers/pqxx/pqxxconnection_p.h b/kexi/kexidb/drivers/pqxx/pqxxconnection_p.h
index 2d33e410..3adf09d9 100644
--- a/kexi/kexidb/drivers/pqxx/pqxxconnection_p.h
+++ b/kexi/kexidb/drivers/pqxx/pqxxconnection_p.h
@@ -27,8 +27,8 @@
// Copyright: See COPYING file that comes with this distribution
//
//
-#ifndef PTQXXSQLCONNECTIONINTERNAL_H
-#define PTQXXSQLCONNECTIONINTERNAL_H
+#ifndef PQXXSQLCONNECTIONINTERNAL_H
+#define PQXXSQLCONNECTIONINTERNAL_H
#include <kexidb/connection_p.h>
#include <pqxx/pqxx>
diff --git a/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp b/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp
index 3b5de6f9..4ae03ced 100644
--- a/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp
+++ b/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp
@@ -44,7 +44,7 @@ static TQByteArray pgsqlByteaToByteArray(const pqxx::result::field& r)
pqxxSqlCursor::pqxxSqlCursor(KexiDB::Connection* conn, const TQString& statement, uint options):
Cursor(conn,statement, options)
{
-// KexiDBDrvDbg << "PTQXXSQLCURSOR: constructor for query statement" << endl;
+// KexiDBDrvDbg << "PQXXSQLCURSOR: constructor for query statement" << endl;
my_conn = static_cast<pqxxSqlConnection*>(conn)->d->pqxxsql;
m_options = Buffered;
m_res = 0;
@@ -57,7 +57,7 @@ pqxxSqlCursor::pqxxSqlCursor(KexiDB::Connection* conn, const TQString& statement
pqxxSqlCursor::pqxxSqlCursor(Connection* conn, QuerySchema& query, uint options )
: Cursor( conn, query, options )
{
-// KexiDBDrvDbg << "PTQXXSQLCURSOR: constructor for query schema" << endl;
+// KexiDBDrvDbg << "PQXXSQLCURSOR: constructor for query schema" << endl;
my_conn = static_cast<pqxxSqlConnection*>(conn)->d->pqxxsql;
m_options = Buffered;
m_res = 0;
diff --git a/kexi/kexidb/drivers/pqxx/pqxxcursor.h b/kexi/kexidb/drivers/pqxx/pqxxcursor.h
index 8a61978d..0a0fb2d5 100644
--- a/kexi/kexidb/drivers/pqxx/pqxxcursor.h
+++ b/kexi/kexidb/drivers/pqxx/pqxxcursor.h
@@ -17,8 +17,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef KEXIDB_CURSOR_PTQXX_H
-#define KEXIDB_CURSOR_PTQXX_H
+#ifndef KEXIDB_CURSOR_PQXX_H
+#define KEXIDB_CURSOR_PQXX_H
#include <kexidb/cursor.h>
#include <kexidb/connection.h>
diff --git a/kexi/kexidb/drivers/pqxx/pqxxdriver.cpp b/kexi/kexidb/drivers/pqxx/pqxxdriver.cpp
index 8967bc5e..fea3fa57 100644
--- a/kexi/kexidb/drivers/pqxx/pqxxdriver.cpp
+++ b/kexi/kexidb/drivers/pqxx/pqxxdriver.cpp
@@ -47,7 +47,7 @@ pqxxSqlDriver::pqxxSqlDriver( TQObject *parent, const char *name, const TQString
beh->AUTO_INCREMENT_FIELD_OPTION = "";
beh->AUTO_INCREMENT_PK_FIELD_OPTION = "PRIMARY KEY";
beh->ALWAYS_AVAILABLE_DATABASE_NAME = "template1";
- beh->TQUOTATION_MARKS_FOR_IDENTIFIER = '"';
+ beh->QUOTATION_MARKS_FOR_IDENTIFIER = '"';
beh->SQL_KEYWORDS = keywords;
initSQLKeywords(233);
diff --git a/kexi/kexidb/drivers/pqxx/pqxxdriver.h b/kexi/kexidb/drivers/pqxx/pqxxdriver.h
index 8ea7b1fa..c7a0fed9 100644
--- a/kexi/kexidb/drivers/pqxx/pqxxdriver.h
+++ b/kexi/kexidb/drivers/pqxx/pqxxdriver.h
@@ -17,8 +17,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef KEXIDB_DRIVER_PTQXX_H
-#define KEXIDB_DRIVER_PTQXX_H
+#ifndef KEXIDB_DRIVER_PQXX_H
+#define KEXIDB_DRIVER_PQXX_H
#include <tqstringlist.h>
diff --git a/kexi/kexidb/drivers/pqxx/pqxxpreparedstatement.h b/kexi/kexidb/drivers/pqxx/pqxxpreparedstatement.h
index 1421f5a4..232454d3 100644
--- a/kexi/kexidb/drivers/pqxx/pqxxpreparedstatement.h
+++ b/kexi/kexidb/drivers/pqxx/pqxxpreparedstatement.h
@@ -22,8 +22,8 @@
// Description:
//
//
-#ifndef PTQXXPREPAREDSTATEMENT_H
-#define PTQXXPREPAREDSTATEMENT_H
+#ifndef PQXXPREPAREDSTATEMENT_H
+#define PQXXPREPAREDSTATEMENT_H
#include <kexidb/preparedstatement.h>
#include <kexidb/connection_p.h>
diff --git a/kexi/kexidb/drivers/sqlite/sqlitedriver.cpp b/kexi/kexidb/drivers/sqlite/sqlitedriver.cpp
index fc356558..d0b7cf45 100644
--- a/kexi/kexidb/drivers/sqlite/sqlitedriver.cpp
+++ b/kexi/kexidb/drivers/sqlite/sqlitedriver.cpp
@@ -66,11 +66,11 @@ SQLiteDriver::SQLiteDriver( TQObject *parent, const char *name, const TQStringLi
beh->AUTO_INCREMENT_FIELD_OPTION = ""; //not available
beh->AUTO_INCREMENT_TYPE = "INTEGER";
beh->AUTO_INCREMENT_PK_FIELD_OPTION = "PRIMARY KEY";
- beh->AUTO_INCREMENT_RETQUIRES_PK = true;
+ beh->AUTO_INCREMENT_REQUIRES_PK = true;
beh->ROW_ID_FIELD_NAME = "OID";
- beh->_1ST_ROW_READ_AHEAD_RETQUIRED_TO_KNOW_IF_THE_RESULT_IS_EMPTY=true;
- beh->TQUOTATION_MARKS_FOR_IDENTIFIER='"';
- beh->SELECT_1_SUBTQUERY_SUPPORTED = true;
+ beh->_1ST_ROW_READ_AHEAD_REQUIRED_TO_KNOW_IF_THE_RESULT_IS_EMPTY=true;
+ beh->QUOTATION_MARKS_FOR_IDENTIFIER='"';
+ beh->SELECT_1_SUBQUERY_SUPPORTED = true;
beh->SQL_KEYWORDS = keywords;
initSQLKeywords(29);
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-13 01:18:38 +0000