db.postgresql: don't test on win-32.

diff --git a/basis/db/postgresql/postgresql-tests.factor b/basis/db/postgresql/postgresql-tests.factor
index a12f8468de167ff589719a68e8e33e75eabb861f..c4a38909f3311dfb66302d11042cf25dc993818a 100644 (file)
--- a/basis/db/postgresql/postgresql-tests.factor
+++ b/basis/db/postgresql/postgresql-tests.factor
@@ -2,11 +2,6 @@ USING: accessors alien continuations db db.errors db.queries db.postgresql
 db.private db.tester db.tuples db.types io classes kernel math namespaces
 prettyprint sequences system tools.test unicode ;
 
-! Ensure the test database exists
-postgresql-template1-db [
-    postgresql-test-db-name ensure-database
-] with-db
-
 ! Triggers a two line error message (ERROR + DETAIL) because two
 ! connections can't simultaneously use the template1 database.
 ! [
@@ -17,81 +12,65 @@ postgresql-template1-db [
     ! ] with-db
 ! ] [ sql-unknown-error? ] must-fail-with
 
-{ } [
-    postgresql-test-db [
+[
+
+    { } [
         [ "drop table person;" sql-command ] ignore-errors
         "create table person (name varchar(30), country varchar(30));"
             sql-command
 
         "insert into person values('John', 'America');" sql-command
         "insert into person values('Jane', 'New Zealand');" sql-command
-    ] with-db
-] unit-test
+    ] unit-test
 
-{
     {
-        { "John" "America" }
-        { "Jane" "New Zealand" }
-    }
-} [
-    postgresql-test-db [
-        "select * from person" sql-query
-    ] with-db
-] unit-test
+        {
+            { "John" "America" }
+            { "Jane" "New Zealand" }
+        }
+    } [ "select * from person" sql-query ] unit-test
 
-{
     {
-        { "John" "America" }
-        { "Jane" "New Zealand" }
-    }
-} [ postgresql-test-db [ "select * from person" sql-query ] with-db ] unit-test
+        {
+            { "John" "America" }
+            { "Jane" "New Zealand" }
+        }
+    } [ "select * from person" sql-query ] unit-test
 
-{
-} [
-    postgresql-test-db [
+    {
+    } [
         "insert into person(name, country) values('Jimmy', 'Canada')"
         sql-command
-    ] with-db
-] unit-test
+    ] unit-test
 
-{
     {
-        { "John" "America" }
-        { "Jane" "New Zealand" }
-        { "Jimmy" "Canada" }
-    }
-} [ postgresql-test-db [ "select * from person" sql-query ] with-db ] unit-test
+        {
+            { "John" "America" }
+            { "Jane" "New Zealand" }
+            { "Jimmy" "Canada" }
+        }
+    } [ "select * from person" sql-query ] unit-test
 
-[
-    postgresql-test-db [
+    [
         [
             "insert into person(name, country) values('Jose', 'Mexico')" sql-command
             "insert into person(name, country) values('Jose', 'Mexico')" sql-command
             "oops" throw
         ] with-transaction
-    ] with-db
-] must-fail
+    ] must-fail
 
-{ 3 } [
-    postgresql-test-db [
-        "select * from person" sql-query length
-    ] with-db
-] unit-test
+    { 3 } [ "select * from person" sql-query length ] unit-test
 
-{
-} [
-    postgresql-test-db [
+    {
+    } [
         [
             "insert into person(name, country) values('Jose', 'Mexico')"
             sql-command
             "insert into person(name, country) values('Jose', 'Mexico')"
             sql-command
         ] with-transaction
-    ] with-db
-] unit-test
+    ] unit-test
+
+    { 5 } [ "select * from person" sql-query length ] unit-test
 
-{ 5 } [
-    postgresql-test-db [
-        "select * from person" sql-query length
-    ] with-db
-] unit-test
+] test-postgresql

diff --git a/basis/db/tester/tester.factor b/basis/db/tester/tester.factor
index 72c7d942e31a00aafb5cff4c0e7e243018e25cf4..365901dfa011a420b39dd97d763e1d91a58fb6ce 100644 (file)
--- a/basis/db/tester/tester.factor
+++ b/basis/db/tester/tester.factor
@@ -35,10 +35,13 @@ IN: db.tester
 
 : test-postgresql ( quot -- )
     '[
-        postgresql-template1-db [
-            postgresql-test-db-name ensure-database
-        ] with-db
-        [ ] [ postgresql-test-db _ with-db ] unit-test
+        ! disable on windows-x86-32
+        os windows? cpu x86.32? and [
+            postgresql-template1-db [
+                postgresql-test-db-name ensure-database
+            ] with-db
+            [ ] [ postgresql-test-db _ with-db ] unit-test
+        ] unless
     ] call ; inline