Merge branch 'master' of git://factorcode.org/git/factor

2009-02-20 17:00:30 -08:00 · 2009-02-20 17:00:30 -08:00 · 5f409d0e9d
parent fc5b985728 6eaa5aee24
commit 5f409d0e9d
6 changed files with 56 additions and 33 deletions
--- a/basis/db/sqlite/sqlite-tests.factor
+++ b/basis/db/sqlite/sqlite-tests.factor
@ -123,12 +123,8 @@ hi "HELLO" {
    ] with-db
 ] unit-test

-[ ] [
-    test.db [
-        hi create-table
-        hi drop-table
-    ] with-db
-] unit-test
+
+! Test SQLite triggers

 TUPLE: show id ;
 TUPLE: user username data ;
@ -144,12 +140,12 @@ show "SHOW" {
 } define-persistent

 watch "WATCH" {
-    { "user" "USER" TEXT +not-null+
-        { +foreign-id+ user "USERNAME" } +user-assigned-id+ }
-    { "show" "SHOW" BIG-INTEGER +not-null+
-        { +foreign-id+ show "ID" } +user-assigned-id+ }
+    { "user" "USER" TEXT +not-null+ +user-assigned-id+
+        { +foreign-id+ user "USERNAME" } }
+    { "show" "SHOW" BIG-INTEGER +not-null+ +user-assigned-id+
+        { +foreign-id+ show "ID" } }
 } define-persistent
-
+    
 [ T{ user { username "littledan" } { data "foo" } } ] [
    test.db [
        user create-table
@ -160,7 +156,7 @@ watch "WATCH" {
        show new insert-tuple
        show new select-tuple
        "littledan" f user boa select-tuple
-        swap [ username>> ] [ id>> ] bi*
+        [ id>> ] [ username>> ] bi*
        watch boa insert-tuple
        watch new select-tuple
        user>> f user boa select-tuple
--- a/basis/db/sqlite/sqlite.factor
+++ b/basis/db/sqlite/sqlite.factor
@ -204,7 +204,7 @@ M: sqlite-db-connection persistent-table ( -- assoc )
        CREATE TRIGGER fki_${table-name}_${table-id}_${foreign-table-name}_${foreign-table-id}_id
        BEFORE INSERT ON ${table-name}
        FOR EACH ROW BEGIN
-            SELECT RAISE(ROLLBACK, 'insert on table "${table-name}" violates foreign key constraint "fk_${foreign-table-name}_id"')
+            SELECT RAISE(ROLLBACK, 'insert on table "${table-name}" violates foreign key constraint "fki_${table-name}_$table-id}_${foreign-table-name}_${foreign-table-id}_id"')
            WHERE  (SELECT ${foreign-table-id} FROM ${foreign-table-name} WHERE ${foreign-table-id} = NEW.${table-id}) IS NULL;
        END;
    "> interpolate
@ -216,8 +216,8 @@ M: sqlite-db-connection persistent-table ( -- assoc )
        CREATE TRIGGER fki_${table-name}_${table-id}_${foreign-table-name}_${foreign-table-id}_id
        BEFORE INSERT ON ${table-name}
        FOR EACH ROW BEGIN
-            SELECT RAISE(ROLLBACK, 'insert on table "${table-name}" violates foreign key constraint "fk_${foreign-table-name}_id"')
-            WHERE NEW.${foreign-table-id} IS NOT NULL
+            SELECT RAISE(ROLLBACK, 'insert on table "${table-name}" violates foreign key constraint "fki_${table-name}_$table-id}_${foreign-table-name}_${foreign-table-id}_id"')
+            WHERE NEW.${table-id} IS NOT NULL
                AND (SELECT ${foreign-table-id} FROM ${foreign-table-name} WHERE ${foreign-table-id} = NEW.${table-id}) IS NULL;
        END;
    "> interpolate
@ -236,8 +236,8 @@ M: sqlite-db-connection persistent-table ( -- assoc )
        CREATE TRIGGER fku_${table-name}_${table-id}_${foreign-table-name}_${foreign-table-id}_id
        BEFORE UPDATE ON ${table-name}
        FOR EACH ROW BEGIN
-            SELECT RAISE(ROLLBACK, 'update on table "${table-name}" violates foreign key constraint "fk_${foreign-table-name}_id"')
-            WHERE  (SELECT ${foreign-table-id} FROM ${foreign-table-name} WHERE ${foreign-table-id} = NEW.${table-id}) IS NULL;
+            SELECT RAISE(ROLLBACK, 'update on table "${table-name}" violates foreign key constraint "fku_${table-name}_$table-id}_${foreign-table-name}_${foreign-table-id}_id"')
+            WHERE (SELECT ${foreign-table-id} FROM ${foreign-table-name} WHERE ${foreign-table-id} = NEW.${table-id}) IS NULL;
        END;
    "> interpolate
    ] with-string-writer ;
@ -248,8 +248,8 @@ M: sqlite-db-connection persistent-table ( -- assoc )
        CREATE TRIGGER fku_${table-name}_${table-id}_${foreign-table-name}_${foreign-table-id}_id
        BEFORE UPDATE ON ${table-name}
        FOR EACH ROW BEGIN
-            SELECT RAISE(ROLLBACK, 'update on table "${table-name}" violates foreign key constraint "fk_${foreign-table-name}_id"')
-            WHERE NEW.${foreign-table-id} IS NOT NULL
+            SELECT RAISE(ROLLBACK, 'update on table "${table-name}" violates foreign key constraint "fku_${table-name}_$table-id}_${foreign-table-name}_${foreign-table-id}_id"')
+            WHERE NEW.${table-id} IS NOT NULL
                AND (SELECT ${foreign-table-id} FROM ${foreign-table-name} WHERE ${foreign-table-id} = NEW.${table-id}) IS NULL;
        END;
    "> interpolate
@ -268,8 +268,8 @@ M: sqlite-db-connection persistent-table ( -- assoc )
        CREATE TRIGGER fkd_${table-name}_${table-id}_${foreign-table-name}_${foreign-table-id}_id
        BEFORE DELETE ON ${foreign-table-name}
        FOR EACH ROW BEGIN
-            SELECT RAISE(ROLLBACK, 'delete on table "${foreign-table-name}" violates foreign key constraint "fk_${foreign-table-name}_id"')
-            WHERE  (SELECT ${foreign-table-id} FROM ${foreign-table-name} WHERE ${foreign-table-id} = OLD.${foreign-table-id}) IS NOT NULL;
+            SELECT RAISE(ROLLBACK, 'delete on table "${foreign-table-name}" violates foreign key constraint "fkd_${table-name}_$table-id}_${foreign-table-name}_${foreign-table-id}_id"')
+            WHERE (SELECT ${foreign-table-id} FROM ${foreign-table-name} WHERE ${foreign-table-id} = OLD.${foreign-table-id}) IS NOT NULL;
        END;
    "> interpolate
    ] with-string-writer ;
@ -336,17 +336,19 @@ M: sqlite-db-connection persistent-table ( -- assoc )
        [ modifiers>> [ +foreign-id+ = ] deep-any? ] filter
        [
            [ class>> db-table-name "db-table" set ]
-            [ column-name>> "table-id" set ]
            [
+                [ "sql-spec" set ]
+                [ column-name>> "table-id" set ]
+                [ ] tri
                modifiers>> [ [ +foreign-id+ = ] deep-any? ] filter
                [
                    [ second db-table-name "foreign-table-name" set ]
                    [ third "foreign-table-id" set ] bi
                    _ execute
                ] each
-            ] tri
+            ] bi
        ] each
-    ] call ;
+    ] call ; inline

 : sqlite-create-table ( sql-specs class-name -- )
    [
@ -378,8 +380,7 @@ M: sqlite-db-connection create-sql-statement ( class -- statement )

 M: sqlite-db-connection drop-sql-statement ( class -- statements )
    [
-        [ nip "drop table " 0% 0% ";" 0% ]
-        [ drop \ drop-sqlite-triggers db-triggers ] 2bi
+        nip "drop table " 0% 0% ";" 0%
    ] query-make ;

 M: sqlite-db-connection compound ( string seq -- new-string )
--- a/basis/editors/emacs/emacs.factor
+++ b/basis/editors/emacs/emacs.factor
@ -1,17 +1,24 @@
 USING: definitions io.launcher kernel parser words sequences math
-math.parser namespaces editors make system ;
+math.parser namespaces editors make system combinators.short-circuit
+fry threads ;
 IN: editors.emacs

+SYMBOL: emacsclient-path
+
+HOOK: default-emacsclient os ( -- path )
+
+M: object default-emacsclient ( -- path ) "emacsclient" ;
+
 : emacsclient ( file line -- )
    [
-        \ emacsclient get "emacsclient" or ,
-        os windows? [ "--no-wait" , ] unless
-        "+" swap number>string append ,
+        { [ \ emacsclient-path get ] [ default-emacsclient ] } 0|| ,
+        "--no-wait" ,
+        number>string "+" prepend ,
        ,
-    ] { } make try-process ;
+    ] { } make
+    os windows? [ run-detached drop ] [ try-process ] if ;

 : emacs ( word -- )
    where first2 emacsclient ;

 [ emacsclient ] edit-hook set-global
-
--- a/basis/editors/emacs/windows/authors.txt
+++ b/basis/editors/emacs/windows/authors.txt
@ -0,0 +1 @@
+Doug Coleman
--- a/basis/editors/emacs/windows/windows.factor
+++ b/basis/editors/emacs/windows/windows.factor
@ -0,0 +1,12 @@
+! Copyright (C) 2009 Doug Coleman.
+! See http://factorcode.org/license.txt for BSD license.
+USING: editors.emacs io.directories.search.windows kernel sequences
+system combinators.short-circuit ;
+IN: editors.emacs.windows
+
+M: windows default-emacsclient
+    {
+        [ "Emacs" t [ "emacsclientw.exe" tail? ] find-in-program-files ]
+        [ "Emacs" t [ "emacsclient.exe" tail? ] find-in-program-files ]
+        [ "emacsclient.exe" ]
+    } 0|| ;
--- a/basis/io/directories/search/search.factor
+++ b/basis/io/directories/search/search.factor
@ -57,8 +57,14 @@ PRIVATE>
        pusher [ [ f ] compose iterate-directory drop ] dip
    ] [ drop f ] recover ; inline

+ERROR: file-not-found ;
+
 : find-in-directories ( directories bfs? quot: ( obj -- ? ) -- path'/f )
-    '[ _ _ find-file ] attempt-all ;
+    [
+        '[ _ _ find-file [ file-not-found ] unless* ] attempt-all
+    ] [
+        drop f
+    ] recover ;

 : find-all-in-directories ( directories bfs? quot: ( obj -- ? ) -- paths/f )
    '[ _ _ find-all-files ] map concat ;