X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=sql%2Fpackage.lisp;h=20555d6e28dd82bf1d77df89a5ec0429c844dfba;hp=5ee30377951fc3b5808271d91506b2c4e990144b;hb=3ac9e8d4881eebebe5cfbbf786d5268997046519;hpb=b3c7fcd23a62240f0f1deb0c4f895cbd981ef5f4

diff --git a/sql/package.lisp b/sql/package.lisp
index 5ee3037..20555d6 100644
--- a/sql/package.lisp
+++ b/sql/package.lisp
@@ -2,16 +2,10 @@
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;
-;;;; Name:          package.cl
-;;;; Purpose:       Package definition for CLSQL (high-level) interface
-;;;; Programmers:   Kevin M. Rosenberg based on
-;;;;                Original code by Pierre R. Mai 
-;;;; Date Started:  Feb 2002
+;;;; Name:          package.lisp
+;;;; Purpose:       Package definition for SQL interface
 ;;;;
-;;;; $Id: package.lisp,v 1.5 2003/07/23 19:33:38 kevin Exp $
-;;;;
-;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
-;;;; and Copyright (c) 1999-2001 by Pierre R. Mai
+;;;; This file is part of CLSQL.
 ;;;;
 ;;;; CLSQL users are granted the rights to distribute and use this software
 ;;;; as governed by the terms of the Lisp Lesser GNU Public License
@@ -20,92 +14,457 @@
 
 (in-package #:cl-user)
 
+;;;; This file makes the required package definitions for CLSQL's
+;;;; core packages.
+
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  #+sbcl
+  (if (find-package 'sb-mop)
+      (pushnew :clsql-sbcl-mop cl:*features*)
+      (pushnew :clsql-sbcl-pcl cl:*features*))
+  
+  #+cmu
+  (if (eq (symbol-package 'pcl:find-class)
+	  (find-package 'common-lisp))
+      (pushnew :clsql-cmucl-mop cl:*features*)
+      (pushnew :clsql-cmucl-pcl cl:*features*)))
+
+
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (defpackage #:clsql-sys
-    (:nicknames #:clsql)
-    (:use #:cl #:clsql-base-sys)
-    (:import-from 
-     #:clsql-base
+    (:use #:common-lisp
+	  #+clsql-sbcl-mop #:sb-mop
+	  #+clsql-cmucl-mop #:mop
+	  #+allegro #:mop
+	  #+lispworks #:clos
+	  #+scl #:clos
+	  #+openmcl #:openmcl-mop)
+    
+    #+allegro
+    (:shadowing-import-from 
+     #:excl)
+    #+lispworks
+    (:shadowing-import-from 
+     #:clos)
+    #+clsql-sbcl-mop 
+    (:shadowing-import-from 
+     #:sb-pcl
+     #:generic-function-lambda-list)
+    #+clsql-sbcl-pcl
+    (:shadowing-import-from 
+     #:sb-pcl
+     #:name
+     #:class-direct-slots
+     #:class-of #:class-name #:class-slots #:find-class
+     #:slot-boundp
+     #:standard-class
+     #:slot-definition-name #:finalize-inheritance
+     #:standard-direct-slot-definition
+     #:standard-effective-slot-definition #:validate-superclass
+     #:direct-slot-definition-class #:compute-effective-slot-definition
+     #:effective-slot-definition-class
+     #:slot-value-using-class
+     #:class-prototype #:generic-function-method-class #:intern-eql-specializer
+     #:make-method-lambda #:generic-function-lambda-list
+     #:class-precedence-list #:slot-definition-type
+     #:class-direct-superclasses
+     #:compute-class-precedence-list)
+    #+clsql-cmucl-mop 
+    (:shadowing-import-from 
+     #:pcl
+     #:generic-function-lambda-list)
+    #+clsql-cmucl-pcl
+    (:shadowing-import-from 
+     #:pcl
+     #:class-direct-slots
+     #:name
+     #:class-of  #:class-name #:class-slots #:find-class #:standard-class
+     #:slot-boundp
+     #:slot-definition-name #:finalize-inheritance
+     #:standard-direct-slot-definition #:standard-effective-slot-definition
+     #:validate-superclass #:direct-slot-definition-class
+     #:effective-slot-definition-class
+     #:compute-effective-slot-definition
+     #:slot-value-using-class
+     #:class-prototype #:generic-function-method-class #:intern-eql-specializer
+     #:make-method-lambda #:generic-function-lambda-list
+     #:class-precedence-list #:slot-definition-type
+     #:class-direct-superclasses
+     #:compute-class-precedence-list)
+    #+scl
+    (:shadowing-import-from 
+     #:clos
+     #:class-prototype  ;; note: make-method-lambda is not fbound
+     )
+    
+    (:export
+     ;; "Private" exports for use by interface packages
+     #:check-connection-spec
+     #:database-initialize-database-type
+     #:database-type-load-foreign
+     #:database-name-from-spec
+     #:database-connect
+     #:database-disconnect
+     #:database-query
+     #:database-execute-command
+     #:database-create-sequence
+     #:database-drop-sequence
+     #:database-sequence-next
+     #:database-set-sequence-position
+     #:database-query-result-set
+     #:database-dump-result-set
+     #:database-store-next-row
+     #:database-get-type-specifier
+     #:database-list-tables
+     #:database-table-exists-p
+     #:database-list-views
+     #:database-view-exists-p
+     #:database-list-indexes
+     #:database-list-table-indexes
+     #:database-index-exists-p
+     #:database-list-sequences
+     #:database-sequence-last
+     #:database-sequence-exists-p
+     #:database-list-attributes
+     #:database-attribute-type
+     #:database-describe-table
+     #:database-type-library-loaded
+     #:database-create
+     #:database-destroy
+     #:database-probe
+     #:database-list
+     
+     #:db-backend-has-create/destroy-db?
+     #:db-type-has-views?
+     #:db-type-has-bigint?
+     #:db-type-has-union?
+     #:db-type-has-subqueries?
+     #:db-type-has-boolean-where?
+     #:db-type-transaction-capable?
+     #:db-type-has-fancy-math?
+     #:db-type-default-case
+     #:db-type-use-column-on-drop-index? 
+     #:database-underlying-type
+
+     ;; Large objects 
+     #:database-create-large-object
+     #:database-write-large-object
+     #:database-read-large-object
+     #:database-delete-large-object
+     #:create-large-object
+     #:write-large-object
+     #:read-large-object
+     #:delete-large-object
+
+     ;; accessors for database class
+     #:name
+     #:connection-spec
+     #:transaction
+     #:transaction-level
+     #:conn-pool
+     #:command-recording-stream
+     #:result-recording-stream
+     #:record-caches
+     #:view-classes
+     #:database-type
+     #:database-state
+     #:attribute-cache
+     
+
+     ;; utils.lisp
+     #:without-interrupts
+     #:make-process-lock
+     #:with-process-lock
+     #:command-output
+     #:symbol-name-default-case
+     #:convert-to-db-default-case
+     #:ensure-keyword
+     #:getenv
+     
+     #:*loaded-database-types*
+     #:reload-database-types
+     #:*connect-if-exists*
+     #:connected-databases
+     #:database
+     #:find-database
+     #:is-database-open
+     #:database-type                     ; database   x
+
+     ;; utils.lisp
+     #:number-to-sql-string
+     #:float-to-sql-string
+     #:sql-escape-quotes
+     #:in
+     
      .
-     #1=(
+     ;; Shared exports for re-export by CLSQL package. 
+     ;; I = Implemented, D = Documented
+     ;;  name                                 file       ID
+     ;;====================================================
+     #1=(;;------------------------------------------------
+	 ;; CommonSQL API 
+	 ;;------------------------------------------------
+	 ;;FDML 
+	 #:select                            ; objects    xx
+	 #:cache-table-queries               ; 
+	 #:*cache-table-queries-default*     ; 
+	 #:delete-records                    ; sql        xx
+	 #:insert-records                    ; sql        xx
+	 #:update-records                    ; sql        xx
+	 #:execute-command                   ; sql        xx
+	 #:query                             ; sql        xx
+	 #:print-query                       ; sql        xx
+	 #:do-query                          ; sql        xx
+	 #:map-query                         ; sql        xx
+	 #:for-each-row
+	 #:loop
+
+	 ;; conditions
+	 #:sql-user-error
+	 #:sql-database-error
+	 #:sql-database-data-error
+	 #:sql-connection-error
+	 #:sql-temporary-error
+	 #:sql-error-error-id
+	 #:sql-error-secondary-error-id
+	 #:sql-error-database-message
+
+	 ;; CLSQL Extensions
+	 #:sql-condition
+	 #:sql-error
+	 #:sql-warning
+	 #:sql-database-warning
+	 
+	 ;;FDDL
+	 #:create-table                      ; table      xx
+	 #:drop-table                        ; table      xx
+	 #:list-tables                       ; table      xx
+	 #:table-exists-p                    ; table      xx 
+	 #:list-attributes                   ; table      xx
+	 #:attribute-type                    ; table      xx
+	 #:list-attribute-types		     ; table      xx
+	 #:*cache-table-queries-default*     ; table      xx 
+	 #:create-view                       ; table      xx
+	 #:drop-view                         ; table      xx
+	 #:create-index                      ; table      xx		
+	 #:drop-index                        ; table      xx		
+	 #:truncate-database
+	 ;;OODDL
+	 #:standard-db-object                ; objects    xx
+	 #:def-view-class                    ; objects    xx
+	 #:create-view-from-class            ; objects    xx
+	 #:drop-view-from-class              ; objects    xx
+	 ;;OODML
+	 #:instance-refreshed                ; objects    xx 
+	 #:update-objects-joins              ; objects    xx
+	 #:*default-update-objects-max-len*  ; objects    xx
+	 #:update-slot-from-record           ; objects    xx
+	 #:update-instance-from-records      ; objects    xx
+	 #:update-records-from-instance      ; objects    xx
+	 #:update-record-from-slot           ; objects    xx
+	 #:update-record-from-slots          ; objects    xx
+	 #:list-classes                      ; objects    xx
+	 #:delete-instance-records           ; objects    xx
+	 ;;Symbolic SQL Syntax 
+	 #:sql                               ; syntax     xx
+	 #:sql-expression                    ; syntax     xx
+	 #:sql-operation                     ; syntax     xx
+	 #:sql-operator                      ; syntax     xx  	
+	 #:disable-sql-reader-syntax         ; syntax     xx
+	 #:enable-sql-reader-syntax          ; syntax     xx
+	 #:locally-disable-sql-reader-syntax ; syntax     xx
+	 #:locally-enable-sql-reader-syntax  ; syntax     xx
+	 #:restore-sql-reader-syntax-state   ; syntax     xx
+	 
+	 ;;FDDL 
+	 #:list-views                        ; table      xx
+	 #:view-exists-p                     ; table      xx
+	 #:list-indexes                      ; table      xx
+	 #:list-table-indexes                ; table      xx
+	 #:index-exists-p                    ; table      xx
+	 #:create-sequence                   ; table      xx
+	 #:drop-sequence                     ; table      xx
+	 #:list-sequences                    ; table      xx
+	 #:sequence-exists-p                 ; table      xx
+	 #:sequence-next                     ; table      xx
+	 #:sequence-last                     ; table      xx
+	 #:set-sequence-position             ; table      xx
+	 ;;OODDL
+	 #:view-table                        ; metaclass  x
+	 #:universal-time                    ; objects    xx 
+	 #:bigint
+	 ;;OODML
+	 #:*db-auto-sync*                    ; objects    xx              
+	 #:read-sql-value                    ; objects    x
+	 #:database-output-sql-as-type       ; objects    x
+	 #:database-get-type-specifier       ; objects    x
+	 #:database-output-sql               ; sql/class  xx
+	 
+	 ;; conditions
 	 #:clsql-condition
 	 #:clsql-error
 	 #:clsql-simple-error
-	 #:clsql-warning
 	 #:clsql-simple-warning
-	 #:clsql-invalid-spec-error
-	 #:clsql-invalid-spec-error-connection-spec
-	 #:clsql-invalid-spec-error-database-type
-	 #:clsql-invalid-spec-error-template
-	 #:clsql-connect-error
-	 #:clsql-connect-error-database-type
-	 #:clsql-connect-error-connection-spec
-	 #:clsql-connect-error-errno
-	 #:clsql-connect-error-error
-	 #:clsql-sql-error
-	 #:clsql-sql-error-database
-	 #:clsql-sql-error-expression
-	 #:clsql-sql-error-errno
-	 #:clsql-sql-error-error
-	 #:clsql-database-warning
-	 #:clsql-database-warning-database
-	 #:clsql-database-warning-message
-	 #:clsql-exists-condition
-	 #:clsql-exists-condition-new-db
-	 #:clsql-exists-condition-old-db
-	 #:clsql-exists-warning
-	 #:clsql-exists-error
-	 #:clsql-closed-error
-	 #:clsql-closed-error-database
-	 
-	 #:*loaded-database-types*
-	 #:reload-database-types
-	 #:*default-database-type*
-	 #:*initialized-database-types*
-	 #:initialize-database-type
-	 
-	 #:database
-	 #:database-name
-	 #:closed-database
-	 #:database-name-from-spec
 	 
-	 ;; utils.cl
-	 #:number-to-sql-string
-	 #:float-to-sql-string
-	 #:sql-escape-quotes
-	 ))
-    (:export
-     ;; sql.cl
-     #:*connect-if-exists*
-     #:connected-databases
-     #:*default-database*
-     #:find-database
-     #:connect
-     #:disconnect
-     #:query
-     #:execute-command
-     #:map-query
-     #:do-query
-     #:for-each-row
-     
-     ;; functional.cl
-     #:insert-records
-     #:delete-records
-     #:update-records
+	 ;;-----------------------------------------------
+	 ;; Symbolic Sql Syntax 
+	 ;;-----------------------------------------------
+	 #:sql-and-qualifier
+	 #:sql-escape
+	 #:sql-query
+	 #:sql-object-query
+	 #:sql-any
+	 #:sql-all
+	 #:sql-not
+	 #:sql-union
+	 #:sql-intersection
+	 #:sql-minus
+	 #:sql-group-by
+	 #:sql-having
+	 #:sql-null
+	 #:sql-not-null
+	 #:sql-exists
+	 #:sql-*
+	 #:sql-+
+	 #:sql-/
+	 #:sql-like
+	 #:sql-uplike
+	 #:sql-and
+	 #:sql-or
+	 #:sql-in
+	 #:sql-||
+	 #:sql-is
+	 #:sql-=
+	 #:sql-==
+	 #:sql-<
+       #:sql->
+       #:sql->=
+       #:sql-<=
+       #:sql-count
+       #:sql-max
+       #:sql-min
+       #:sql-avg
+       #:sql-sum
+       #:sql-view-class
+       #:sql_slot-value
+
+
+
+       ;; time.lisp
+       #:bad-component
+       #:current-day
+     #:current-month
+     #:current-year
+     #:day-duration
+     #:db-timestring
+     #:decode-duration
+     #:decode-time
+     #:duration
+     #:duration+
+     #:duration<
+     #:duration<=
+     #:duration=
+     #:duration>
+     #:duration>=
+     #:duration-day
+     #:duration-hour
+     #:duration-minute
+     #:duration-month
+     #:duration-second
+     #:duration-year
+     #:duration-reduce 
+     #:duration-timestring
+     #:extract-roman 
+     #:format-duration
+     #:format-time
+     #:get-time
+     #:utime->time
+     #:interval-clear
+     #:interval-contained
+     #:interval-data
+     #:interval-edit
+     #:interval-end
+     #:interval-match
+     #:interval-push
+     #:interval-relation
+     #:interval-start
+     #:interval-type
+     #:make-duration
+     #:make-interval
+     #:make-time
+     #:merged-time
+     #:midnight
+     #:month-name
+     #:parse-date-time
+     #:parse-timestring
+     #:parse-yearstring
+     #:print-date
+     #:roll
+     #:roll-to
+     #:time
+     #:time+
+     #:time-
+     #:time-by-adding-duration
+     #:time-compare
+     #:time-difference
+     #:time-dow
+     #:time-element
+     #:time-max
+     #:time-min
+     #:time-mjd
+     #:time-msec
+     #:time-p
+     #:time-sec
+     #:time-well-formed
+     #:time-ymd
+     #:time<
+     #:time<=
+     #:time=
+     #:time>
+     #:time>=
+     #:timezone
+     #:universal-time
+     #:wall-time
+     #:wall-timestring
+     #:week-containing
+     #:gregorian-to-mjd
+     #:mjd-to-gregorian
+
+     ;; recording.lisp -- SQL I/O Recording 
+     #:record-sql-command
+     #:record-sql-result
+     #:add-sql-stream                 ; recording  xx
+     #:delete-sql-stream	          ; recording  xx
+     #:list-sql-streams	          ; recording  xx
+     #:sql-recording-p	          ; recording  xx
+     #:sql-stream			  ; recording  xx
+     #:start-sql-recording		  ; recording  xx
+     #:stop-sql-recording		  ; recording  xx
+
+     ;; database.lisp -- Connection
+     #:*default-database-type*	          ; clsql-base xx
+     #:*default-database*	          ; classes    xx
+     #:*initialized-database-types*
+     #:initialize-database-type
+     #:connect			          ; database   xx
+     #:disconnect		          ; database   xx
+     #:*connect-if-exists*	          ; database   xx
+     #:connected-databases	          ; database   xx
+     #:database		          ; database   xx
+     #:database-name                     ; database   xx
+     #:reconnect                         ; database
+     #:find-database                     ; database   xx
+     #:status                            ; database   xx
      #:with-database
-     
-     ;; For High-level UncommonSQL compatibility
-     #:sql-ident
-     #:list-tables
-     #:list-attributes
-     #:attribute-type
-     #:create-sequence 
-     #:drop-sequence
-     #:sequence-next
-     
-     ;; Pooled connections
+     #:with-default-database
      #:disconnect-pooled
-     #:find-or-create-connection-pool
+     #:create-database
+     #:destroy-database
+     #:probe-database
+     #:list-databases
+     
+     #:describe-table
+     #:*backend-warning-behavior*
      
      ;; Transactions
      #:with-transaction
@@ -113,20 +472,59 @@
      #:rollback-transaction
      #:add-transaction-commit-hook
      #:add-transaction-rollback-hook
-     
-     ;; Large objects (Marc B)
-     #:create-large-object
-     #:write-large-object
-     #:read-large-object
-     #:delete-large-object
-     
-     .
-     #1#
-     )
-    (:documentation "This is the INTERNAL SQL-Interface package of CLSQL."))
-  
-  )					;eval-when
+     #:commit                            ; transact   xx
+     #:rollback			  ; transact   xx
+     #:with-transaction		  ; transact   xx		.
+     #:start-transaction                 ; transact   xx
+     #:in-transaction-p                  ; transact   xx
+     #:database-start-transaction
+     #:database-abort-transaction
+     #:database-commit-transaction
+     #:transaction-level
+     #:transaction
+       ))
+  (:documentation "This is the INTERNAL SQL-Interface package of CLSQL."))
+
+
+(defpackage #:clsql
+  (:use #:common-lisp)
+  (:import-from #:clsql-sys . #1#)
+  (:export . #1#)
+  (:documentation "This is the user package with CLSQL symbols."))
 
 (defpackage #:clsql-user
-  (:use #:common-lisp #:clsql)
-  (:documentation "This is the user package for experimenting with CLSQL."))
+  (:use #:common-lisp)
+  (:import-from #:clsql-sys . #1#)
+  (:export . #1#)
+  (:documentation "This is the user package with CLSQL symbols."))
+
+  ;; This is from USQL's pcl-patch  
+  #+(or clsql-sbcl-pcl clsql-cmucl-pcl)
+  (progn
+    ;; Note that this will no longer required for cmucl as of version 19a. 
+    (in-package #+cmu :pcl #+sbcl :sb-pcl)
+    (defmacro pv-binding1 ((pv calls pv-table-symbol pv-parameters slot-vars) 
+			   &body body)
+      `(pv-env (,pv ,calls ,pv-table-symbol ,pv-parameters)
+	(let (,@(mapcar #'(lambda (slot-var p) `(,slot-var (get-slots-or-nil ,p)))
+			slot-vars pv-parameters))
+	  ,@(mapcar #'(lambda (slot-var) `(declare (ignorable ,slot-var))) slot-vars)
+	  ,@body))))
+
+;; see http://thread.gmane.org/gmane.lisp.lispworks.general/681
+#+lispworks
+(setf *packages-for-warn-on-redefinition* 
+      (delete "SQL" *packages-for-warn-on-redefinition* :test 'string=))
+
+  #+sbcl
+  (if (find-package 'sb-mop)
+      (setq cl:*features* (delete :clsql-sbcl-mop cl:*features*))
+      (setq cl:*features* (delete :clsql-sbcl-pcl cl:*features*)))
+  
+  #+cmu
+  (if (find-package 'mop)
+      (setq cl:*features* (delete :clsql-cmucl-mop cl:*features*))
+      (setq cl:*features* (delete :clsql-cmucl-pcl cl:*features*)))
+
+) ;eval-when                                      
+