From cc92d162f24648d65ad872098353305a5baf91d7 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Thu, 22 Apr 2004 06:14:38 +0000 Subject: [PATCH] r9129: case fixes --- db-aodbc/aodbc-sql.lisp | 4 ++-- db-mysql/mysql-sql.lisp | 6 +++--- db-odbc/odbc-sql.lisp | 6 +++--- db-sqlite/sqlite-sql.lisp | 6 +++--- tests/utils.lisp | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/db-aodbc/aodbc-sql.lisp b/db-aodbc/aodbc-sql.lisp index 18a2384..0675324 100644 --- a/db-aodbc/aodbc-sql.lisp +++ b/db-aodbc/aodbc-sql.lisp @@ -157,11 +157,11 @@ ;;; Sequence functions (defun %sequence-name-to-table (sequence-name) - (concatenate 'string "_clsql_seq_" (sql-escape sequence-name))) + (concatenate 'string "_CLSQL_SEQ_" (sql-escape sequence-name))) (defun %table-name-to-sequence-name (table-name) (and (>= (length table-name) 11) - (string= (subseq table-name 0 11) "_clsql_seq_") + (string= (subseq table-name 0 11) "_CLSQL_SEQ_") (subseq table-name 11))) (defmethod database-create-sequence (sequence-name diff --git a/db-mysql/mysql-sql.lisp b/db-mysql/mysql-sql.lisp index 7f88875..873ab5e 100644 --- a/db-mysql/mysql-sql.lisp +++ b/db-mysql/mysql-sql.lisp @@ -261,7 +261,7 @@ (declare (ignore owner)) (remove-if #'(lambda (s) (and (>= (length s) 11) - (string= (subseq s 0 11) "_clsql_seq_"))) + (string= (subseq s 0 11) "_CLSQL_SEQ_"))) (mapcar #'car (database-query "SHOW TABLES" database nil)))) ;; MySQL 4.1 does not support views @@ -318,11 +318,11 @@ ;;; Sequence functions (defun %sequence-name-to-table (sequence-name) - (concatenate 'string "_clsql_seq_" (sql-escape sequence-name))) + (concatenate 'string "_CLSQL_SEQ_" (sql-escape sequence-name))) (defun %table-name-to-sequence-name (table-name) (and (>= (length table-name) 11) - (string= (subseq table-name 0 11) "_clsql_seq_") + (string= (subseq table-name 0 11) "_CLSQL_SEQ_") (subseq table-name 11))) (defmethod database-create-sequence (sequence-name diff --git a/db-odbc/odbc-sql.lisp b/db-odbc/odbc-sql.lisp index d4e4b80..2850454 100644 --- a/db-odbc/odbc-sql.lisp +++ b/db-odbc/odbc-sql.lisp @@ -165,11 +165,11 @@ ;;; Sequence functions (defun %sequence-name-to-table (sequence-name) - (concatenate 'string "_clsql_seq_" (sql-escape sequence-name))) + (concatenate 'string "_CLSQL_SQL__" (sql-escape sequence-name))) (defun %table-name-to-sequence-name (table-name) (and (>= (length table-name) 11) - (string= (subseq table-name 0 11) "_clsql_seq_") + (string= (subseq table-name 0 11) "_CLSQL_SEQ_") (subseq table-name 11))) (defmethod database-create-sequence (sequence-name @@ -337,7 +337,7 @@ (defun odbc-list-table-indexes (table database) (multiple-value-bind (rows col-names) (odbc-dbi:list-table-indexes - (string-downcase table) + table :db (database-odbc-conn database)) (declare (ignore col-names)) ;; INDEX_NAME is hard-coded in sixth position by ODBC driver diff --git a/db-sqlite/sqlite-sql.lisp b/db-sqlite/sqlite-sql.lisp index 9136461..9b7a8fc 100644 --- a/db-sqlite/sqlite-sql.lisp +++ b/db-sqlite/sqlite-sql.lisp @@ -188,7 +188,7 @@ ;; Query is copied from .table command of sqlite comamnd line utility. (remove-if #'(lambda (s) (and (>= (length s) 11) - (string= (subseq s 0 11) "_clsql_seq_"))) + (string= (subseq s 0 11) "_CLSQL_SEQ_"))) (mapcar #'car (database-query "SELECT name FROM sqlite_master WHERE type='table' UNION ALL SELECT name FROM sqlite_temp_master WHERE type='table' ORDER BY name" database '())))) @@ -239,11 +239,11 @@ return (third field-info))) (defun %sequence-name-to-table-name (sequence-name) - (concatenate 'string "_clsql_seq_" (sql-escape sequence-name))) + (concatenate 'string "_CLSQL_SEQ_" (sql-escape sequence-name))) (defun %table-name-to-sequence-name (table-name) (and (>= (length table-name) 11) - (string= (subseq table-name 0 11) "_clsql_seq_") + (string= (subseq table-name 0 11) "_CLSQL_SEQ_") (subseq table-name 11))) diff --git a/tests/utils.lisp b/tests/utils.lisp index 6b5d38e..7225b3e 100644 --- a/tests/utils.lisp +++ b/tests/utils.lisp @@ -24,7 +24,7 @@ :type "config")) (defvar +all-db-types+ - #-clisp '(:postgresql :postgresql-socket :sqlite :mysql :odbc + #-clisp '(:postgresql :postgresql-socket :mysql :sqlite :odbc #+allegro :aodbc) #+clisp '(:sqlite)) -- 2.34.1