X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=sql%2Fpackage.lisp;h=ff6ec173a1a40f5b3a5358dda5ae4e10ec2df541;hb=f246c3c7b48792a869cb1bae0637a2f00a0920bd;hp=4db6fe7d1edebcf4c10eb19fce46441a0043b04c;hpb=1dda729b250779079efbdc1d3f6bbb3ae4a20ba4;p=clsql.git

diff --git a/sql/package.lisp b/sql/package.lisp
index 4db6fe7..ff6ec17 100644
--- a/sql/package.lisp
+++ b/sql/package.lisp
@@ -29,7 +29,7 @@
 
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
-  (defpackage #:clsql-sys
+  (defpackage #:clsql
     (:use #:common-lisp #:clsql-base
 	  #+clsql-sbcl-mop #:sb-mop
 	  #+clsql-cmucl-mop #:mop
@@ -201,8 +201,6 @@
        #:write-large-object
        #:read-large-object
        #:delete-large-object
-       #:do-query
-       #:map-query
        #:describe-table
        #:create-large-object
        #:write-large-object
@@ -248,6 +246,86 @@
        #:db-type-default-case
        #:convert-to-db-default-case
        #:database-underlying-type
+
+       ;; 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
        ))
    (:export
     ;; "Private" exports for use by interface packages
@@ -289,7 +367,7 @@
     #:database-underlying-type
    
    .
-   ;; Shared exports for re-export by CLSQL. 
+   ;; Shared exports for re-export by CLSQL-USER. 
    ;; I = Implemented, D = Documented
    ;;  name                                 file       ID
    ;;====================================================
@@ -373,7 +451,10 @@
        #:set-sequence-position             ; table      xx
        ;;OODDL
        #:view-table                        ; metaclass  x
+       #:universal-time    		   ; objects    xx 
+       #:bigint
        ;;OODML
+       #:*db-auto-sync*                    ; objects    xx              
        #:add-to-relation                   ; objects    x
        #:remove-from-relation              ; objects    x
        #:read-sql-value                    ; objects    x
@@ -387,6 +468,7 @@
        #:sql-and-qualifier
        #:sql-escape
        #:sql-query
+       #:sql-object-query
        #:sql-any
        #:sql-all
        #:sql-not
@@ -422,6 +504,9 @@
        #:sql-view-class
        #:sql_slot-value
 
+       #:do-query
+       #:map-query
+
        . 
        #1#
        ))
@@ -433,15 +518,9 @@
 (setf *packages-for-warn-on-redefinition* 
       (delete "SQL" *packages-for-warn-on-redefinition* :test 'string=))
 
-(defpackage #:clsql
-  (:use #:common-lisp)
-  (:import-from #:clsql-sys . #2#)
-  (:export . #2#)
-  (:documentation "This is the SQL-Interface package of CLSQL."))
-
 (defpackage #:clsql-user
   (:use #:common-lisp)
-  (:import-from #:clsql-sys . #2#)
+  (:import-from #:clsql . #2#)
   (:export . #2#)
   (:documentation "This is the user package with CLSQL symbols."))