split out db pkgs

pkgs/db-pkgs/db-doc/db/info.rkt

@@ -1,3 +1,4 @@
 #lang info
 
+(define collection "db")
 (define scribblings '(("scribblings/db.scrbl" (multi-page))))

pkgs/db-pkgs/db-doc/info.rkt

@@ -0,0 +1,12 @@
+#lang info
+
+(define collection 'multi)
+
+(define deps '("base"))
+
+(define build-deps '("base"
+                     "scribble-lib"
+                     "sandbox-lib"
+                     "web-server-lib"
+                     "db-lib"
+                     "racket-doc"))

pkgs/db-pkgs/db-lib/db/info.rkt

@@ -0,0 +1,3 @@
+#lang setup/infotab
+
+(define collection "db")

pkgs/db-pkgs/db-lib/db/main.rkt

@@ -1,8 +1,8 @@
 #lang racket/base
 (require racket/lazy-require
          racket/contract/base
-         "base.rkt")
-(provide (all-from-out "base.rkt"))
+         db/base)
+(provide (all-from-out db/base))
 
 (lazy-require
  ["private/postgresql/main.rkt"
@@ -13,7 +13,7 @@
   (mysql-connect
    mysql-guess-socket-path
    mysql-password-hash)]
- ["private/sqlite3/main.rkt"
+ [db/private/sqlite3/main
   (sqlite3-connect
    sqlite3-available?)]
  ["private/odbc/main.rkt"

pkgs/db-pkgs/db-lib/db/mysql.rkt

@@ -1,7 +1,7 @@
 #lang racket/base
 (require racket/contract/base
          openssl
-         "base.rkt"
+         db/base
          "private/mysql/main.rkt")
 
 ;; FIXME: Contracts duplicated at main.rkt

pkgs/db-pkgs/db-lib/db/odbc.rkt

@@ -1,6 +1,6 @@
 #lang racket/base
 (require racket/contract/base
-         "base.rkt"
+         db/base
          "private/odbc/main.rkt")
 
 ;; FIXME: Contracts duplicated at main.rkt

pkgs/db-pkgs/db-lib/db/postgresql.rkt

@@ -1,7 +1,7 @@
 #lang racket/base
 (require racket/contract/base
          openssl
-         "base.rkt"
+         db/base
          "private/postgresql/main.rkt")
 
 ;; FIXME: Contracts duplicated at main.rkt

pkgs/db-pkgs/db-lib/db/private/mysql/connection.rkt

@@ -4,10 +4,10 @@
          openssl
          openssl/sha1
          unstable/error
-         "../generic/interfaces.rkt"
-         "../generic/common.rkt"
-         "../generic/prepared.rkt"
-         "../generic/sql-data.rkt"
+         db/private/generic/interfaces
+         db/private/generic/common
+         db/private/generic/prepared
+         db/private/generic/sql-data
          "message.rkt"
          "dbsystem.rkt")
 (provide connection%

pkgs/db-pkgs/db-lib/db/private/mysql/dbsystem.rkt

@@ -1,9 +1,9 @@
 #lang racket/base
 (require racket/class
          racket/match
-         "../generic/interfaces.rkt"
-         "../generic/common.rkt"
-         "../generic/sql-data.rkt"
+         db/private/generic/interfaces
+         db/private/generic/common
+         db/private/generic/sql-data
          "../../util/private/geometry.rkt"
          (only-in "message.rkt" field-dvec->typeid field-dvec->flags))
 (provide dbsystem

pkgs/db-pkgs/db-lib/db/private/mysql/main.rkt

@@ -2,8 +2,8 @@
 (require racket/class
          racket/tcp
          openssl
-         "../generic/interfaces.rkt"
-         "../generic/common.rkt"
+         db/private/generic/interfaces
+         db/private/generic/common
          unstable/socket
          "connection.rkt")
 (provide mysql-connect

pkgs/db-pkgs/db-lib/db/private/mysql/message.rkt

@@ -6,8 +6,8 @@ Based on protocol documentation here:
 #lang racket/base
 (require racket/match
          racket/port
-         "../generic/sql-data.rkt"
-         "../generic/interfaces.rkt"
+         db/private/generic/sql-data
+         db/private/generic/interfaces
          "../../util/private/geometry.rkt")
 (provide write-packet
          parse-packet

pkgs/db-pkgs/db-lib/db/private/odbc/connection.rkt

@@ -5,11 +5,11 @@
          ffi/unsafe
          ffi/unsafe/atomic
          unstable/error
-         "../generic/interfaces.rkt"
-         "../generic/common.rkt"
-         "../generic/prepared.rkt"
-         "../generic/sql-data.rkt"
-         "../generic/sql-convert.rkt"
+         db/private/generic/interfaces
+         db/private/generic/common
+         db/private/generic/prepared
+         db/private/generic/sql-data
+         db/private/generic/sql-convert
          "ffi.rkt"
          "ffi-constants.rkt"
          "dbsystem.rkt")

pkgs/db-pkgs/db-lib/db/private/odbc/dbsystem.rkt

@@ -1,9 +1,9 @@
 #lang racket/base
 (require racket/class
-         "../generic/interfaces.rkt"
-         "../generic/common.rkt"
-         "../generic/sql-data.rkt"
-         "../generic/sql-convert.rkt")
+         db/private/generic/interfaces
+         db/private/generic/common
+         db/private/generic/sql-data
+         db/private/generic/sql-convert)
 (provide dbsystem
          field-dvec->field-info
          field-dvec->typeid

pkgs/db-pkgs/db-lib/db/private/odbc/main.rkt

@@ -1,8 +1,8 @@
 #lang racket/base
 (require racket/class
-         "../generic/interfaces.rkt"
-         "../generic/common.rkt"
-         "../generic/place-client.rkt"
+         db/private/generic/interfaces
+         db/private/generic/common
+         db/private/generic/place-client
          "connection.rkt"
          "dbsystem.rkt"
          "ffi.rkt")

pkgs/db-pkgs/db-lib/db/private/postgresql/connection.rkt

@@ -4,10 +4,10 @@
          file/md5
          openssl
          unstable/error
-         "../generic/interfaces.rkt"
-         "../generic/common.rkt"
-         "../generic/sql-data.rkt"
-         "../generic/prepared.rkt"
+         db/private/generic/interfaces
+         db/private/generic/common
+         db/private/generic/sql-data
+         db/private/generic/prepared
          "message.rkt"
          "dbsystem.rkt")
 (provide connection%

pkgs/db-pkgs/db-lib/db/private/postgresql/dbsystem.rkt

@@ -4,10 +4,10 @@
          racket/match
          (prefix-in srfi: srfi/19)
          json
-         "../generic/interfaces.rkt"
-         "../generic/common.rkt"
-         "../generic/sql-data.rkt"
-         "../generic/sql-convert.rkt"
+         db/private/generic/interfaces
+         db/private/generic/common
+         db/private/generic/sql-data
+         db/private/generic/sql-convert
          "../../util/datetime.rkt"
          "../../util/geometry.rkt"
          "../../util/postgresql.rkt"

pkgs/db-pkgs/db-lib/db/private/postgresql/main.rkt

@@ -2,8 +2,8 @@
 (require racket/class
          racket/tcp
          openssl
-         "../generic/interfaces.rkt"
-         "../generic/common.rkt"
+         db/private/generic/interfaces
+         db/private/generic/common
          unstable/socket
          "connection.rkt")
 (provide postgresql-connect

pkgs/db-pkgs/db-lib/db/private/postgresql/message.rkt

@@ -1,8 +1,8 @@
 #lang racket/base
 (require (for-syntax racket/base)
          racket/match
-         "../generic/interfaces.rkt"
-         "../generic/sql-data.rkt")
+         db/private/generic/interfaces
+         db/private/generic/sql-data)
 (provide write-message
          parse-server-message
 

pkgs/db-pkgs/db-lib/db/util/datetime.rkt

@@ -2,7 +2,7 @@
 (require racket/contract/base
          racket/match
          (prefix-in srfi: srfi/19)
-         "../private/generic/sql-data.rkt")
+         db/private/generic/sql-data)
 
 (define (sql-datetime->srfi-date datetime)
   (match datetime

pkgs/db-pkgs/db-lib/db/util/testing.rkt

@@ -2,8 +2,8 @@
 (require racket/contract
          racket/class
          ffi/unsafe/atomic
-         "../private/generic/interfaces.rkt"
-         "../private/generic/common.rkt")
+         db/private/generic/interfaces
+         db/private/generic/common)
 
 (define high-latency-connection%
   (class* locking% (connection<%>)

pkgs/db-pkgs/db-lib/info.rkt

@@ -0,0 +1,4 @@
+#lang setup/infotab
+
+(define collection 'multi)
+(define deps '("base"))

pkgs/db-pkgs/db-test/info.rkt

@@ -0,0 +1,8 @@
+#lang info
+
+(define collection 'multi)
+
+(define deps '("base"
+               "db-lib"
+               "rackunit-lib"
+               "web-server-lib"))

pkgs/db-pkgs/db/info.rkt

@@ -0,0 +1,4 @@
+#lang info
+
+(define deps
+  '("base" "db-lib" "db-doc" "db-test"))

pkgs/main-distribution/info.rkt

@@ -8,6 +8,7 @@
                "contract-profile"
                "data-lib"
                "datalog"
+               "db"
                "deinprogramm"
                "draw"
                "draw-doc"

pkgs/plot/info.rkt

@@ -8,6 +8,7 @@
 (define deps '("typed-racket-more"
                "base"
                "compatibility-lib"
+               "db-lib"
                "draw-lib"
                "gui-lib"
                "pict-lib"

pkgs/web-server-pkgs/web-server-doc/info.rkt

@@ -3,6 +3,7 @@
 (define collection 'multi)
 
 (define build-deps '("compatibility-lib"
+                     "db-lib"
 		     "net-lib"
                      "rackunit-lib"
                      "sandbox-lib"

racket/lib/collects/db/private/generic/dsn.rkt

@@ -17,10 +17,12 @@
          odbc-data-source)
 
 (lazy-require
- ["../../main.rkt" (postgresql-connect
-                    mysql-connect
-                    sqlite3-connect
-                    odbc-connect)])
+ [db/sqlite3 (sqlite3-connect)])
+
+(lazy-require
+ [db (postgresql-connect
+      mysql-connect
+      odbc-connect)])
 
 #|
 DSN v0.1 format

racket/lib/collects/db/private/generic/place-server.rkt

@@ -30,9 +30,8 @@ where <connect-spec> ::= (list 'sqlite3 path/sym mode-sym delay-num limit-num)
     (loop)))
 
 (lazy-require
- ["../sqlite3/main.rkt" (sqlite3-connect)]
- ["../odbc/main.rkt" (odbc-connect
-                      odbc-driver-connect)])
+ [db/private/sqlite3/main (sqlite3-connect)]
+ [db/private/odbc/main (odbc-connect odbc-driver-connect)])
 
 (define (serve client-chan)
   (match (place-channel-get client-chan)

racket/lib/collects/pkg/db.rkt

@@ -5,7 +5,8 @@
          racket/path
          racket/file
          version/utils
-         db)
+         db/base
+         db/sqlite3)
 
 (provide 
  (struct-out pkg)

racket/lib/collects/setup/doc-db.rkt

@@ -1,5 +1,6 @@
 #lang racket/base
-(require db
+(require db/base
+         db/sqlite3
          racket/format
          racket/serialize
          "main-doc.rkt")