projects
/
clsql.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
86440ca
)
r9129: case fixes
author
Kevin M. Rosenberg
<kevin@rosenberg.net>
Thu, 22 Apr 2004 06:14:38 +0000
(06:14 +0000)
committer
Kevin M. Rosenberg
<kevin@rosenberg.net>
Thu, 22 Apr 2004 06:14:38 +0000
(06:14 +0000)
db-aodbc/aodbc-sql.lisp
patch
|
blob
|
history
db-mysql/mysql-sql.lisp
patch
|
blob
|
history
db-odbc/odbc-sql.lisp
patch
|
blob
|
history
db-sqlite/sqlite-sql.lisp
patch
|
blob
|
history
tests/utils.lisp
patch
|
blob
|
history
diff --git
a/db-aodbc/aodbc-sql.lisp
b/db-aodbc/aodbc-sql.lisp
index 18a23841353ad4a5846a14d5371599bd6ef0d6d4..067532429fdf50a2ae423fd232806b345e7e1bd6 100644
(file)
--- 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)
;;; 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)
(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
(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 7f88875f1cc9000fb59e9684df7381257cbfbae2..873ab5eaca579369afc1f451e0da066c8ea8b8a1 100644
(file)
--- 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)
(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
(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)
;;; 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)
(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
(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 d4e4b80cc865b2f438212b11f1165868a4c7ee60..2850454bd5072421680de040bf07ade105bbbcfc 100644
(file)
--- 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)
;;; 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)
(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
(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
(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
: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 9136461f8b95f008bcb32e205c3f2883ec89e689..9b7a8fceae594b08d404e4541d544fa0d1a23e6c 100644
(file)
--- 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)
;; 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 '()))))
(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)
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)
(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)))
(subseq table-name 11)))
diff --git
a/tests/utils.lisp
b/tests/utils.lisp
index 6b5d38e64606fe4406e1703801b81e52c2c4dabb..7225b3ebe09626fc741851b3bcf05c1bb2bfc554 100644
(file)
--- a/
tests/utils.lisp
+++ b/
tests/utils.lisp
@@
-24,7
+24,7
@@
:type "config"))
(defvar +all-db-types+
:type "config"))
(defvar +all-db-types+
- #-clisp '(:postgresql :postgresql-socket :
sqlite :mysql
:odbc
+ #-clisp '(:postgresql :postgresql-socket :
mysql :sqlite
:odbc
#+allegro :aodbc)
#+clisp '(:sqlite))
#+allegro :aodbc)
#+clisp '(:sqlite))