X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=db-postgresql%2Fpostgresql-sql.lisp;h=2f0ae75ba19a38917cd5cba388426bd984975b7a;hb=8b5250e14e3280bdc4641c3b35a8dc68ca4dbde7;hp=b4eaa821662e0304b0b02c52542b4ef488b7b723;hpb=a3e1cd20eec3903790c6e8f126345558904488f4;p=clsql.git

diff --git a/db-postgresql/postgresql-sql.lisp b/db-postgresql/postgresql-sql.lisp
index b4eaa82..2f0ae75 100644
--- a/db-postgresql/postgresql-sql.lisp
+++ b/db-postgresql/postgresql-sql.lisp
@@ -146,7 +146,7 @@
   (setf (database-conn-ptr database) nil)
   t)
 
-(defmethod database-query (query-expression (database postgresql-database) result-types)
+(defmethod database-query (query-expression (database postgresql-database) result-types field-names)
   (let ((conn-ptr (database-conn-ptr database)))
     (declare (type pgsql-conn-def conn-ptr))
     (uffi:with-cstring (query-native query-expression)
@@ -166,15 +166,18 @@
 		 (setq result-types
 		   (canonicalize-types result-types num-fields
 					     result))
-		 (loop for tuple-index from 0 below (PQntuples result)
-		       collect
-		       (loop for i from 0 below num-fields
-			     collect
-			     (if (zerop (PQgetisnull result tuple-index i))
-				 (convert-raw-field
-				  (PQgetvalue result tuple-index i)
-				  result-types i)
-				 nil)))))
+                 (values
+                  (loop for tuple-index from 0 below (PQntuples result)
+                        collect
+                        (loop for i from 0 below num-fields
+                              collect
+                              (if (zerop (PQgetisnull result tuple-index i))
+                                  (convert-raw-field
+                                   (PQgetvalue result tuple-index i)
+                                   result-types i)
+                                nil)))
+                  (when field-names
+                    (result-field-names num-fields result)))))
               (t
                (error 'clsql-sql-error
                       :database database
@@ -184,6 +187,13 @@
                               (PQresultErrorMessage result)))))
           (PQclear result))))))
 
+(defun result-field-names (num-fields result)
+  "Return list of result field names."
+  (let ((names '()))
+    (dotimes (i num-fields (nreverse names))
+      (declare (fixnum i))
+      (push (uffi:convert-from-foreign-string (PQfname res-ptr i)) names))))
+
 (defmethod database-execute-command (sql-expression
                                      (database postgresql-database))
   (let ((conn-ptr (database-conn-ptr database)))
@@ -366,22 +376,26 @@
 
 ;;; Object listing
 
-(defmethod database-list-objects-of-type ((database postgresql-database)
-                                          type owner)
-  (let ((owner-clause
-         (cond ((stringp owner)
-                (format nil " AND (relowner=(SELECT usesysid FROM pg_user WHERE (usename='~A')))" owner))
-               ((null owner)
-                (format nil " AND (NOT (relowner=1))"))
-               (t ""))))
-    (mapcar #'car
-            (database-query
-             (format nil
-                     "SELECT relname FROM pg_class WHERE (relkind = '~A')~A"
-                     type
-                     owner-clause)
-             database nil))))
-    
+(defun owner-clause (owner)
+  (cond 
+   ((stringp owner)
+    (format
+     nil
+     " AND (relowner=(SELECT usesysid FROM pg_user WHERE (usename='~A')))" 
+     owner))
+   ((null owner)
+    (format nil " AND (NOT (relowner=1))"))
+   (t "")))
+
+(defun database-list-objects-of-type (database type owner)
+  (mapcar #'car
+	  (database-query
+	   (format nil
+		   "SELECT relname FROM pg_class WHERE (relkind = '~A')~A"
+		   type
+		   (owner-clause owner))
+	   database nil)))
+
 (defmethod database-list-tables ((database postgresql-database)
                                  &key (owner nil))
   (database-list-objects-of-type database "r" owner))
@@ -393,7 +407,28 @@
 (defmethod database-list-indexes ((database postgresql-database)
                                   &key (owner nil))
   (database-list-objects-of-type database "i" owner))
-  
+
+
+(defmethod database-list-table-indexes (table (database postgresql-database)
+					&key (owner nil))
+  (let ((indexrelids
+	 (database-query
+	  (format 
+	   nil
+	   "select indexrelid from pg_index where indrelid=(select relfilenode from pg_class where relname='~A'~A)"
+	   (string-downcase table)
+	   (owner-clause owner))
+	  database :auto))
+	(result nil))
+    (dolist (indexrelid indexrelids (nreverse result))
+      (push 
+       (caar (database-query
+	      (format nil "select relname from pg_class where relfilenode='~A'"
+		      (car indexrelid))
+	      database
+	      nil))
+       result))))
+
 (defmethod database-list-attributes ((table string)
 				     (database postgresql-database)
                                      &key (owner nil))
@@ -530,7 +565,7 @@
 	   (progn
 	     (setf (slot-value database 'clsql-base-sys::state) :open)
 	     (mapcar #'car (database-query "select datname from pg_database" 
-					   database :auto)))
+					   database nil)))
 	(progn
 	  (database-disconnect database)
 	  (setf (slot-value database 'clsql-base-sys::state) :closed))))))
@@ -575,5 +610,13 @@
 	(setf conn-ptr (%pg-database-connection connection-spec))
 	database))))
 
+;;; Database capabilities
+
+(defmethod db-type-has-fancy-math? ((db-type (eql :postgresql)))
+  t)
+
+(defmethod db-type-default-case ((db-type (eql :postgresql)))
+  :lower)
+
 (when (clsql-base-sys:database-type-library-loaded :postgresql)
   (clsql-base-sys:initialize-database-type :database-type :postgresql))