diff --git a/extra/http/server/sessions/storage/db/db.factor b/extra/http/server/sessions/storage/db/db.factor index 58a0130b36..0d8ad84985 100755 --- a/extra/http/server/sessions/storage/db/db.factor +++ b/extra/http/server/sessions/storage/db/db.factor @@ -10,7 +10,7 @@ SINGLETON: sessions-in-db session "SESSIONS" { ! { "id" "ID" +random-id+ system-random-generator } - { "id" "ID" INTEGER +native-id+ } + { "id" "ID" INTEGER +db-assigned-id+ } { "expires" "EXPIRES" BIG-INTEGER +not-null+ } { "namespace" "NAMESPACE" FACTOR-BLOB } } define-persistent diff --git a/extra/semantic-db/semantic-db.factor b/extra/semantic-db/semantic-db.factor index 279ebcf922..4591f6bf08 100755 --- a/extra/semantic-db/semantic-db.factor +++ b/extra/semantic-db/semantic-db.factor @@ -12,7 +12,7 @@ TUPLE: node id content ; node "node" { - { "id" "id" +native-id+ +autoincrement+ } + { "id" "id" +db-assigned-id+ +autoincrement+ } { "content" "content" TEXT } } define-persistent diff --git a/extra/webapps/pastebin/pastebin.factor b/extra/webapps/pastebin/pastebin.factor index 9301b14353..616da67eee 100644 --- a/extra/webapps/pastebin/pastebin.factor +++ b/extra/webapps/pastebin/pastebin.factor @@ -24,7 +24,7 @@ TUPLE: paste id summary author mode date contents annotations captcha ; paste "PASTE" { - { "id" "ID" INTEGER +native-id+ } + { "id" "ID" INTEGER +db-assigned-id+ } { "summary" "SUMMARY" { VARCHAR 256 } +not-null+ } { "author" "AUTHOR" { VARCHAR 256 } +not-null+ } { "mode" "MODE" { VARCHAR 256 } +not-null+ } @@ -43,7 +43,7 @@ TUPLE: annotation aid id summary author mode contents date captcha ; annotation "ANNOTATION" { - { "aid" "AID" INTEGER +native-id+ } + { "aid" "AID" INTEGER +db-assigned-id+ } { "id" "ID" INTEGER +not-null+ } { "summary" "SUMMARY" { VARCHAR 256 } +not-null+ } { "author" "AUTHOR" { VARCHAR 256 } +not-null+ } diff --git a/extra/webapps/planet/planet.factor b/extra/webapps/planet/planet.factor index 0e9601461c..d3260e1c70 100755 --- a/extra/webapps/planet/planet.factor +++ b/extra/webapps/planet/planet.factor @@ -27,7 +27,7 @@ M: blog link-href www-url>> ; blog "BLOGS" { - { "id" "ID" INTEGER +native-id+ } + { "id" "ID" INTEGER +db-assigned-id+ } { "name" "NAME" { VARCHAR 256 } +not-null+ } { "www-url" "WWWURL" { VARCHAR 256 } +not-null+ } { "feed-url" "FEEDURL" { VARCHAR 256 } +not-null+ } diff --git a/extra/webapps/todo/todo.factor b/extra/webapps/todo/todo.factor index 5c60b37f82..d04c8d97bd 100755 --- a/extra/webapps/todo/todo.factor +++ b/extra/webapps/todo/todo.factor @@ -15,7 +15,7 @@ TUPLE: todo uid id priority summary description ; todo "TODO" { { "uid" "UID" { VARCHAR 256 } +not-null+ } - { "id" "ID" +native-id+ } + { "id" "ID" +db-assigned-id+ } { "priority" "PRIORITY" INTEGER +not-null+ } { "summary" "SUMMARY" { VARCHAR 256 } +not-null+ } { "description" "DESCRIPTION" { VARCHAR 256 } }