r9443: * test/test-fdml.lisp: String table names are now case sensitive,...

        default db case for FDML/SELECT/25

diff --git a/ChangeLog b/ChangeLog
index abf454757bc199920afe7eb509c41ccfc17c92cd..7cc79dedb1857b8302fdd2a4c13fbcb1c720bdae 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,10 @@
        * sql/classes.lisp: honor case of string tables when outputting queries 
        * sql/objects.lisp: Add database type to default database-get-type-specifier method
        * sql/sql.lisp:  Add database type to default database-abort-transaction method
        * sql/classes.lisp: honor case of string tables when outputting queries 
        * sql/objects.lisp: Add database type to default database-get-type-specifier method
        * sql/sql.lisp:  Add database type to default database-abort-transaction method

+       * sql/utils.lisp: Add GETENV function which will be used to get ORACLE_HOME
+       from environment
+       * test/test-fdml.lisp: String table names are now case sensitive, so convert to
+       default db case for FDML/SELECT/25

 
 22 May 2004 Kevin Rosenberg
        * Version 2.10.20 released: Oracle backend now fails 6 out of 200 tests
 
 22 May 2004 Kevin Rosenberg
        * Version 2.10.20 released: Oracle backend now fails 6 out of 200 tests

diff --git a/sql/package.lisp b/sql/package.lisp
index 77100e55925b08df899bb508cccdbf34639ffc2d..20555d6e28dd82bf1d77df89a5ec0429c844dfba 100644 (file)
--- a/sql/package.lisp
+++ b/sql/package.lisp
@@ -179,7 +179,8 @@
      #:symbol-name-default-case
      #:convert-to-db-default-case
      #:ensure-keyword
      #:symbol-name-default-case
      #:convert-to-db-default-case
      #:ensure-keyword

-
+     #:getenv
+     

      #:*loaded-database-types*
      #:reload-database-types
      #:*connect-if-exists*
      #:*loaded-database-types*
      #:reload-database-types
      #:*connect-if-exists*

diff --git a/sql/utils.lisp b/sql/utils.lisp
index 8763216a34f951607c1c2c4e1bd4e89c73645518..a23a820ff0231b108c92c526da089ab1e4743c01 100644 (file)
--- a/sql/utils.lisp
+++ b/sql/utils.lisp
@@ -315,6 +315,17 @@ list of characters and replacement strings."
          (incf dpos))))))
 
 
          (incf dpos))))))
 
 

+(defun getenv (var)
+  "Return the value of the environment variable."
+  #+allegro (sys::getenv (string var))
+  #+clisp (ext:getenv (string var))
+  #+(or cmu scl)
+  (cdr (assoc (string var) ext:*environment-list* :test #'equalp
+              :key #'string))
+  #+lispworks (lw:environment-variable (string var))
+  #+mcl (ccl::getenv var)
+  #+sbcl (sb-ext:posix-getenv var))
+

 (eval-when (:compile-toplevel :load-toplevel :execute)
   (when (char= #\a (schar (symbol-name '#:a) 0))
     (pushnew :clsql-lowercase-reader *features*)))
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (when (char= #\a (schar (symbol-name '#:a) 0))
     (pushnew :clsql-lowercase-reader *features*)))


@@ -334,7 +345,6 @@ list of characters and replacement strings."
     ;; Default CommonSQL behavior is to upcase strings
     (string-upcase str)))
            
     ;; Default CommonSQL behavior is to upcase strings
     (string-upcase str)))
            

-

 (defun ensure-keyword (name)
   "Returns keyword for a name"
   (etypecase name
 (defun ensure-keyword (name)
   "Returns keyword for a name"
   (etypecase name


@@ -344,3 +354,4 @@ list of characters and replacement strings."
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (setq cl:*features* (delete :clsql-lowercase-reader cl:*features*)))
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (setq cl:*features* (delete :clsql-lowercase-reader cl:*features*)))

+

diff --git a/tests/test-fdml.lisp b/tests/test-fdml.lisp
index 812894dff3f134a02558524574ccd3176235d489..be35f5bb7f965e29da8c56d776ca25f6d8bd0261 100644 (file)
--- a/tests/test-fdml.lisp
+++ b/tests/test-fdml.lisp
@@ -375,10 +375,11 @@
   "Yuri"))
 
 (deftest :fdml/select/25
   "Yuri"))
 
 (deftest :fdml/select/25

- (clsql:select [first-name] :from "employee" :flatp t :distinct t
-                            :field-names nil 
-                            :result-types nil 
-                            :order-by [first-name])
+ (clsql:select [first-name] :from (clsql-sys:convert-to-db-default-case "employee" *default-database*)
+  :flatp t :distinct t
+  :field-names nil 
+  :result-types nil 
+  :order-by [first-name])

  ("Boris" "Josef" "Konstantin" "Leon" "Leonid" "Mikhail" "Nikita" "Vladamir"
   "Yuri"))
 
  ("Boris" "Josef" "Konstantin" "Leon" "Leonid" "Mikhail" "Nikita" "Vladamir"
   "Yuri"))