From: Russ Tyndall <russ@acceleration.net>
Date: Mon, 28 Nov 2011 22:13:51 +0000 (-0500)
Subject: Merge branch 'master' of http://git.b9.com/clsql
X-Git-Tag: v6.1.0~3
X-Git-Url: http://git.kpe.io/?p=clsql.git;a=commitdiff_plain;h=1695d53021c689589567c1911ab79b64526a52f7;hp=0985148d757424ac855001f2701e8a86037dba78

Merge branch 'master' of http://git.b9.com/clsql
---

diff --git a/ChangeLog b/ChangeLog
index ae9680c..005158f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-18  Russ Tyndall  <russ@acceleration.net>
+	* db-odbc/odbc-api.lisp
+
+	Added type specifier so MSSQL nvarchar fields can make it through
+
 2011-09-12  Russ Tyndall  <russ@acceleration.net>
 	* sql/fddl.lisp sql/generic-postgres.lisp db-mysql/mysql-sql.lisp
 	sql/generic-odbc.lisp sql/odbc-api.lisp sql/odbc-dbi.lisp
diff --git a/db-odbc/odbc-api.lisp b/db-odbc/odbc-api.lisp
index af36bb9..8541145 100644
--- a/db-odbc/odbc-api.lisp
+++ b/db-odbc/odbc-api.lisp
@@ -586,8 +586,9 @@ as possible second argument) to the desired representation of date/time/timestam
 
 (defun sql-to-c-type (sql-type)
   (ecase sql-type
+    ;; Added -10 for MSSQL ntext type and -11 for nvarchar
     ((#.$SQL_CHAR #.$SQL_VARCHAR #.$SQL_LONGVARCHAR
-      #.$SQL_NUMERIC #.$SQL_DECIMAL -8 -9 -10) $SQL_C_CHAR) ;; Added -10 for MSSQL ntext type
+      #.$SQL_NUMERIC #.$sql_decimal -8 -9 -10 -11) $SQL_C_CHAR)
     (#.$SQL_INTEGER $SQL_C_SLONG)
     (#.$SQL_BIGINT $SQL_C_SBIGINT)
     (#.$SQL_SMALLINT $SQL_C_SSHORT)
diff --git a/sql/command-object.lisp b/sql/command-object.lisp
index 3b752ef..d931bac 100644
--- a/sql/command-object.lisp
+++ b/sql/command-object.lisp
@@ -23,13 +23,16 @@
 (in-package #:clsql-sys)
 
 (defclass command-object ()
-  ((expression :accessor expression :initarg :expression :initform nil)
-   (parameters :accessor parameters :initarg :parameters :initform nil)
+  ((expression :accessor expression :initarg :expression :initform nil
+               :documentation "query that refers to parameters using \"$1\", \"$2\", \"$n\".
+       These match positions in the parameters list.")
+   (parameters :accessor parameters :initarg :parameters :initform nil
+               :documentation "list of parameters")
    (prepared-name :accessor prepared-name :initarg :prepared-name :initform ""
     :documentation "If we want this to be a prepared statement, give it a name
        to identify it to this session")
    (has-been-prepared :accessor has-been-prepared :initarg :has-been-prepared :initform nil
-		      :documentation "Have we already prepared this command object")
+		      :documentation "Have we already prepared this command object?")
    ))
 
 (defmethod initialize-instance :after ((o command-object) &key &allow-other-keys )