[Gd-chatter] r11455 - in trunk/fundev/sources: databases/sql-odbc registry/generic registry/x86-win32

[agent at gwydiondylan.org]

Author: agent
Date: Mon Sep 24 04:37:31 2007
New Revision: 11455

Added:
   trunk/fundev/sources/registry/generic/sql   (props changed)
      - copied unchanged from r11454, trunk/fundev/sources/registry/x86-win32/sql
   trunk/fundev/sources/registry/generic/sql-example   (props changed)
      - copied unchanged from r11454, trunk/fundev/sources/registry/x86-win32/sql-example
   trunk/fundev/sources/registry/generic/sql-odbc   (props changed)
      - copied unchanged from r11454, trunk/fundev/sources/registry/x86-win32/sql-odbc
   trunk/fundev/sources/registry/generic/sql-odbc-test   (props changed)
      - copied unchanged from r11454, trunk/fundev/sources/registry/x86-win32/sql-odbc-test
Removed:
   trunk/fundev/sources/registry/x86-win32/sql
   trunk/fundev/sources/registry/x86-win32/sql-example
   trunk/fundev/sources/registry/x86-win32/sql-odbc
   trunk/fundev/sources/registry/x86-win32/sql-odbc-test
Modified:
   trunk/fundev/sources/databases/sql-odbc/odbc-nice-layer.dylan
Log:
Job: fd
Made sql & sql-odbc libraries compile on Darwin.



Modified: trunk/fundev/sources/databases/sql-odbc/odbc-nice-layer.dylan
==============================================================================
--- trunk/fundev/sources/databases/sql-odbc/odbc-nice-layer.dylan	(original)
+++ trunk/fundev/sources/databases/sql-odbc/odbc-nice-layer.dylan	Mon Sep 24 04:37:31 2007
@@ -214,7 +214,7 @@
 //Lose this ASAP.
 define function collect-garbage ()
   block ()
-    primitive-mps-collect();
+    primitive-mps-collect(primitive-boolean-as-raw(#f));
     values(raw-as-integer(primitive-mps-committed()), 0)
   afterwards
     primitive-mps-release();
@@ -464,7 +464,7 @@
            $sql-quoted-identifier-case,
            $sql-txn-capable);
                     
-define constant <sqlgetinfo-uinteger-info-type>
+define constant <sqlgetinfo-uinteger-info-part1>
   = one-of(//$sql-aggregate-functions,
            $sql-alter-domain,
            $sql-alter-table,
@@ -519,8 +519,10 @@
            $sql-drop-schema,
            $sql-drop-table,
            $sql-drop-translation,
-           $sql-drop-view,
-           $sql-dynamic-cursor-attributes1,
+           $sql-drop-view);
+
+define constant <sqlgetinfo-uinteger-info-part2>
+  = one-of($sql-dynamic-cursor-attributes1,
            $sql-dynamic-cursor-attributes2,
            $sql-forward-only-cursor-attributes1,
            $sql-forward-only-cursor-attributes2,
@@ -567,6 +569,9 @@
            $sql-txn-isolation-option,
            $sql-union);
 
+define constant <sqlgetinfo-uinteger-info-type>
+  = type-union(<sqlgetinfo-uinteger-info-part1>,
+               <sqlgetinfo-uinteger-info-part2>);
 
 define generic nice-SQLGetInfo(connection-handle :: <object>,
                                info-type :: <object>)