From: Kevin M. Rosenberg Date: Mon, 13 May 2002 03:58:01 +0000 (+0000) Subject: r2012: *** empty log message *** X-Git-Tag: v3.8.6~1098 X-Git-Url: http://git.kpe.io/?p=clsql.git;a=commitdiff_plain;h=2ff1828bd374a19b74f46e562feb20fa31397842 r2012: *** empty log message *** --- diff --git a/interfaces/oracle/alien-resources.cl b/interfaces/oracle/alien-resources.cl index 2c44b22..c2bdf9d 100644 --- a/interfaces/oracle/alien-resources.cl +++ b/interfaces/oracle/alien-resources.cl @@ -1,14 +1,13 @@ ;;; -*- Mode: Lisp -*- -;;; $Id: alien-resources.cl,v 1.1 2002/05/13 03:52:24 kevin Exp $ +;;; $Id: alien-resources.cl,v 1.2 2002/05/13 03:57:09 kevin Exp $ -;;; MaiSQL --- Common Lisp Interface Layer to SQL Databases ;;; This is copyrighted software. See documentation for terms. ;;; ;;; oracle-sql.lisp --- SQL-Interface implementation for Oracle ;;; ;;; derived from postgresql.lisp -(in-package :MAISQL-ORACLE) +(in-package :clsql-oracle) (declaim (optimize (speed 3) (debug 1))) diff --git a/interfaces/oracle/clsql-oracle.system b/interfaces/oracle/clsql-oracle.system index be78d8f..cc6426e 100644 --- a/interfaces/oracle/clsql-oracle.system +++ b/interfaces/oracle/clsql-oracle.system @@ -1,7 +1,7 @@ ;;; -*- Mode: Lisp -*- ;;;; This is copyrighted software. See documentation for terms. ;;;; -;;;; $Id: clsql-oracle.system,v 1.1 2002/05/13 03:52:24 kevin Exp $ +;;;; $Id: clsql-oracle.system,v 1.2 2002/05/13 03:58:01 kevin Exp $ (in-package :cl-user) @@ -26,7 +26,7 @@ (:file "oracle-objects" :depends-on ("oracle-sql")) ) - :depends-on (:uncommonsql) + :depends-on (:clsql-base) ) diff --git a/interfaces/oracle/oracle-constants.cl b/interfaces/oracle/oracle-constants.cl index 206f08f..2c9f56c 100644 --- a/interfaces/oracle/oracle-constants.cl +++ b/interfaces/oracle/oracle-constants.cl @@ -1,7 +1,7 @@ ;;; -*- Mode: Lisp -*- -;;; $Id: oracle-constants.cl,v 1.1 2002/05/13 03:52:24 kevin Exp $ +;;; $Id: oracle-constants.cl,v 1.2 2002/05/13 03:57:09 kevin Exp $ -(in-package :MAISQL-ORACLE) +(in-package :clsql-oracle) (defconstant +oci-default+ #x00) ; default value for parameters and attributes (defconstant +oci-threaded+ #x01) ; application is in threaded environment diff --git a/interfaces/oracle/oracle-loader.cl b/interfaces/oracle/oracle-loader.cl index a610d59..48d3246 100644 --- a/interfaces/oracle/oracle-loader.cl +++ b/interfaces/oracle/oracle-loader.cl @@ -1,12 +1,12 @@ ;;; -*- Mode: Lisp -*- -;;; $Id: oracle-loader.cl,v 1.1 2002/05/13 03:52:24 kevin Exp $ +;;; $Id: oracle-loader.cl,v 1.2 2002/05/13 03:57:09 kevin Exp $ ;;; ;;; MaiSQL --- Common Lisp Interface Layer to SQL Databases ;;; This is copyrighted software. See documentation for terms. ;;; ;;; oracle-loader.cl --- Foreign Object Loader for Oracle -(in-package :MAISQL-ORACLE) +(in-package :clsql-oracle) ;; Load the foreign library diff --git a/interfaces/oracle/oracle-objects.cl b/interfaces/oracle/oracle-objects.cl index 14ecad2..23f22d7 100644 --- a/interfaces/oracle/oracle-objects.cl +++ b/interfaces/oracle/oracle-objects.cl @@ -1,4 +1,4 @@ -(in-package :maisql-oracle) +(in-package :clsql-oracle) (defparameter *oracle-default-varchar2-length* "512") @@ -77,13 +77,13 @@ ;;; LOCAL-TIME stuff that needs to go into hooks #+local-time -(defmethod maisql-sys::database-get-type-specifier +(defmethod clsql-sys::database-get-type-specifier ((type (eql 'local-time::local-time)) args (database oracle-database)) (declare (ignore args)) "DATE") #+local-time -(defmethod maisql-sys::database-get-type-specifier +(defmethod clsql-sys::database-get-type-specifier ((type (eql 'local-time::duration)) args (database oracle-database)) diff --git a/interfaces/oracle/oracle-package.cl b/interfaces/oracle/oracle-package.cl index 5a03289..9dd43b0 100644 --- a/interfaces/oracle/oracle-package.cl +++ b/interfaces/oracle/oracle-package.cl @@ -1,18 +1,14 @@ ;;; -*- Mode: Lisp -*- -;;; $Id: oracle-package.cl,v 1.1 2002/05/13 03:52:24 kevin Exp $ +;;; $Id: oracle-package.cl,v 1.2 2002/05/13 03:57:09 kevin Exp $ ;;; -;;; MaiSQL --- Common Lisp Interface Layer to SQL Databases ;;; This is copyrighted software. See documentation for terms. -;;; -;;; oracle-package.lisp --- Package definition for the Oracle interface -;;; (in-package :cl-user) -(defpackage "MAISQL-ORACLE" - (:nicknames "ORACLE") - (:use "COMMON-LISP" "MAISQL-SYS" "ALIEN" "C-CALL" "SYSTEM") - (:export "ORACLE-DATABASE" - "*ORACLE-SO-LOAD-PATH*" - "*ORACLE-SO-LIBRARIES*") - (:documentation "This is the MaiSQL interface to Oracle.")) +(defpackage :clsql-oracle + (:nicknames :oracle) + (:use :common-lisp :clsql-sys "ALIEN" "C-CALL" "SYSTEM") + (:export #:oracle-database + #:*oracle-so-load-path* + #:*oracle-so-libraries*) + (:documentation "This is the CLSQL interface to Oracle.")) diff --git a/interfaces/oracle/oracle-sql.cl b/interfaces/oracle/oracle-sql.cl index 3a0b046..d607ff8 100644 --- a/interfaces/oracle/oracle-sql.cl +++ b/interfaces/oracle/oracle-sql.cl @@ -1,5 +1,5 @@ ;;; -*- Mode: Lisp -*- -;;; $Id: oracle-sql.cl,v 1.1 2002/05/13 03:52:24 kevin Exp $ +;;; $Id: oracle-sql.cl,v 1.2 2002/05/13 03:57:09 kevin Exp $ ;;; MaiSQL --- Common Lisp Interface Layer to SQL Databases ;;; This is copyrighted software. See documentation for terms. @@ -8,7 +8,7 @@ ;;; ;;; derived from postgresql.lisp -(in-package :MAISQL-ORACLE) +(in-package :clsql-oracle) (defmethod database-initialize-database-type ((database-type (eql :oracle))) @@ -131,16 +131,16 @@ the length of that format."))) (oci-error-get (deref errhp) 1 "" (c-& errcode 0) (c-& errbuf 0) +errbuf-len+ +oci-htype-error+) (let ((subcode (deref errcode 0))) (unless (and nulls-ok (= subcode +null-value-returned+)) - (error 'maisql-sql-error + (error 'clsql-sql-error :database database :errno subcode :error (cast (c-& errbuf 0) c-string))))))) (nulls-ok - (error 'maisql-sql-error + (error 'clsql-sql-error :database database :error "can't handle NULLS-OK without ERRHP")) (t - (error 'maisql-sql-error + (error 'clsql-sql-error :database database :error "OCI Error (and no ERRHP available to find subcode)")))) diff --git a/interfaces/oracle/oracle.cl b/interfaces/oracle/oracle.cl index 16b2d4a..eb1569c 100644 --- a/interfaces/oracle/oracle.cl +++ b/interfaces/oracle/oracle.cl @@ -1,5 +1,5 @@ ;;; -*- Mode: Lisp -*- -;;; $Id: oracle.cl,v 1.1 2002/05/13 03:52:24 kevin Exp $ +;;; $Id: oracle.cl,v 1.2 2002/05/13 03:57:09 kevin Exp $ ;;; MaiSQL --- Common Lisp Interface Layer to SQL Databases ;;; This is copyrighted software. See documentation for terms. @@ -9,7 +9,7 @@ ;;; The present content of this file is orented specifically towards ;;; Oracle 8.0.5.1 under Linux, linking against libclntsh.so -(in-package :MAISQL-ORACLE) +(in-package :clsql-oracle) ;;