projects
/
umlisp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7924236
)
r9355: updates
author
Kevin M. Rosenberg
<kevin@rosenberg.net>
Thu, 13 May 2004 18:01:13 +0000
(18:01 +0000)
committer
Kevin M. Rosenberg
<kevin@rosenberg.net>
Thu, 13 May 2004 18:01:13 +0000
(18:01 +0000)
create-sql.lisp
patch
|
blob
|
history
diff --git
a/create-sql.lisp
b/create-sql.lisp
index fd513c4660064e31f37da3f01102ecab463a0764..6e50a0fe6f4bbd7cb359f6c3dbb32b152c5911a8 100644
(file)
--- a/
create-sql.lisp
+++ b/
create-sql.lisp
@@
-196,24
+196,19
@@
(sql-create-indexes conn +custom-index-cols+)
(sql-create-special-tables conn)))
(sql-create-indexes conn +custom-index-cols+)
(sql-create-special-tables conn)))
-(defun create-umls-db (&
optional (extension ".trans"
))
+(defun create-umls-db (&
key (extension ".trans") (skip-translation nil
))
"SQL Databases: initializes entire database via SQL copy commands.
This is much faster that using create-umls-db-insert."
"SQL Databases: initializes entire database via SQL copy commands.
This is much faster that using create-umls-db-insert."
- (ignore-errors
- (clsql:destroy-database (list *umls-sql-host* (lookup-db-name *umls-sql-db*)
- *umls-sql-user* *umls-sql-passwd*)
- :database-type *umls-sql-type*))
- (clsql:create-database (list *umls-sql-host* (lookup-db-name *umls-sql-db*)
- *umls-sql-user* *umls-sql-passwd*)
- :database-type *umls-sql-type*)
(ensure-ucols+ufiles)
(ensure-preparse)
(ensure-ucols+ufiles)
(ensure-preparse)
- (translate-all-files extension)
+ (unless skip-translation
+ (translate-all-files extension))
(let ((copy-cmd
(ecase (umls-sql-type)
(:mysql #'mysql-copy-cmd)
(:postgresql #'pg-copy-cmd))))
(with-sql-connection (conn)
(let ((copy-cmd
(ecase (umls-sql-type)
(:mysql #'mysql-copy-cmd)
(:postgresql #'pg-copy-cmd))))
(with-sql-connection (conn)
+ (clsql:truncate-database :database conn)
(sql-drop-tables conn)
(sql-create-tables conn)
(dolist (file *umls-files*)
(sql-drop-tables conn)
(sql-create-tables conn)
(dolist (file *umls-files*)
@@
-269,11
+264,12
@@
This is much faster that using create-umls-db-insert."
nil "COPY ~a FROM '~a' using delimiters '|' with null as ''"
(table file) (umls-pathname (fil file) extension)))
nil "COPY ~a FROM '~a' using delimiters '|' with null as ''"
(table file) (umls-pathname (fil file) extension)))
-(defun mysql-copy-cmd (file extension)
+(defun mysql-copy-cmd (file extension
&key local-file
)
"Return mysql copy statement for a file"
(format
nil
"Return mysql copy statement for a file"
(format
nil
- "LOAD DATA LOCAL INFILE \"~a\" INTO TABLE ~a FIELDS TERMINATED BY \"|\""
+ "LOAD DATA ~AINFILE \"~a\" INTO TABLE ~a FIELDS TERMINATED BY \"|\""
+ (if local-file "LOCAL " "")
(umls-pathname (fil file) extension) (table file)))
(umls-pathname (fil file) extension) (table file)))