From 1275ed70de12ed434badd6384de695df36b63128 Mon Sep 17 00:00:00 2001 From: Ryan Culpepper Date: Wed, 26 Jun 2013 15:58:16 -0400 Subject: [PATCH] split out db pkgs --- .../racket-doc => db-pkgs/db-doc}/db/info.rkt | 1 + .../db-doc}/db/scribblings/config.rkt | 0 .../db-doc}/db/scribblings/connect.scrbl | 0 .../db-doc}/db/scribblings/db.scrbl | 0 .../db-doc}/db/scribblings/log-for-connect.rktd | 0 .../db-doc}/db/scribblings/log-for-query.rktd | 0 .../db-doc}/db/scribblings/log-for-sql-types.rktd | 0 .../db-doc}/db/scribblings/log-for-using-db.rktd | 0 .../db-doc}/db/scribblings/log-for-util.rktd | 0 .../db-doc}/db/scribblings/notes.scrbl | 0 .../db-doc}/db/scribblings/query.scrbl | 0 .../db-doc}/db/scribblings/sql-types.scrbl | 0 .../db-doc}/db/scribblings/tabbing.rkt | 0 .../db-doc}/db/scribblings/using-db.scrbl | 0 .../db-doc}/db/scribblings/util.scrbl | 0 pkgs/db-pkgs/db-doc/info.rkt | 12 ++++++++++++ {racket/lib/collects => pkgs/db-pkgs/db-lib}/db/TODO | 0 pkgs/db-pkgs/db-lib/db/info.rkt | 3 +++ .../lib/collects => pkgs/db-pkgs/db-lib}/db/main.rkt | 6 +++--- .../collects => pkgs/db-pkgs/db-lib}/db/mysql.rkt | 2 +- .../lib/collects => pkgs/db-pkgs/db-lib}/db/odbc.rkt | 2 +- .../db-pkgs/db-lib}/db/postgresql.rkt | 2 +- .../db-pkgs/db-lib}/db/private/mysql/connection.rkt | 8 ++++---- .../db-pkgs/db-lib}/db/private/mysql/dbsystem.rkt | 6 +++--- .../db-pkgs/db-lib}/db/private/mysql/main.rkt | 4 ++-- .../db-pkgs/db-lib}/db/private/mysql/message.rkt | 4 ++-- .../db-pkgs/db-lib}/db/private/odbc/connection.rkt | 10 +++++----- .../db-pkgs/db-lib}/db/private/odbc/dbsystem.rkt | 8 ++++---- .../db-lib}/db/private/odbc/ffi-constants.rkt | 0 .../db-pkgs/db-lib}/db/private/odbc/ffi.rkt | 0 .../db-pkgs/db-lib}/db/private/odbc/main.rkt | 6 +++--- .../db-lib}/db/private/postgresql/connection.rkt | 8 ++++---- .../db-lib}/db/private/postgresql/dbsystem.rkt | 8 ++++---- .../db-pkgs/db-lib}/db/private/postgresql/main.rkt | 4 ++-- .../db-lib}/db/private/postgresql/message.rkt | 4 ++-- .../db-pkgs/db-lib}/db/util/datetime.rkt | 2 +- .../db-pkgs/db-lib}/db/util/geometry.rkt | 0 .../db-pkgs/db-lib}/db/util/postgresql.rkt | 0 .../db-pkgs/db-lib}/db/util/private/geometry.rkt | 0 .../db-pkgs/db-lib}/db/util/testing.rkt | 4 ++-- pkgs/db-pkgs/db-lib/info.rkt | 4 ++++ pkgs/db-pkgs/db-test/info.rkt | 8 ++++++++ .../db-test}/tests/db/all-tests.rkt | 0 .../db-test}/tests/db/config.rkt | 0 .../db-test}/tests/db/db/concurrent.rkt | 0 .../db-test}/tests/db/db/connection.rkt | 0 .../db-test}/tests/db/db/query.rkt | 0 .../db-test}/tests/db/db/sql-types.rkt | 0 .../db-test}/tests/db/gen/misc.rkt | 0 .../db-test}/tests/db/gen/query.rkt | 0 .../db-test}/tests/db/gen/sql-types.rkt | 0 .../db-test}/tests/db/programs/memleak.rkt | 0 .../db-test}/tests/db/programs/sl-inserts.rkt | 0 .../db-test}/tests/db/programs/web-test.rkt | 0 pkgs/db-pkgs/db/info.rkt | 4 ++++ pkgs/main-distribution/info.rkt | 1 + pkgs/plot/info.rkt | 1 + pkgs/web-server-pkgs/web-server-doc/info.rkt | 1 + racket/lib/collects/db/private/generic/dsn.rkt | 10 ++++++---- .../lib/collects/db/private/generic/place-server.rkt | 5 ++--- racket/lib/collects/pkg/db.rkt | 3 ++- racket/lib/collects/setup/doc-db.rkt | 3 ++- 62 files changed, 91 insertions(+), 53 deletions(-) rename pkgs/{racket-pkgs/racket-doc => db-pkgs/db-doc}/db/info.rkt (74%) rename pkgs/{racket-pkgs/racket-doc => db-pkgs/db-doc}/db/scribblings/config.rkt (100%) rename pkgs/{racket-pkgs/racket-doc => db-pkgs/db-doc}/db/scribblings/connect.scrbl (100%) rename pkgs/{racket-pkgs/racket-doc => db-pkgs/db-doc}/db/scribblings/db.scrbl (100%) rename pkgs/{racket-pkgs/racket-doc => db-pkgs/db-doc}/db/scribblings/log-for-connect.rktd (100%) rename pkgs/{racket-pkgs/racket-doc => db-pkgs/db-doc}/db/scribblings/log-for-query.rktd (100%) rename pkgs/{racket-pkgs/racket-doc => db-pkgs/db-doc}/db/scribblings/log-for-sql-types.rktd (100%) rename pkgs/{racket-pkgs/racket-doc => db-pkgs/db-doc}/db/scribblings/log-for-using-db.rktd (100%) rename pkgs/{racket-pkgs/racket-doc => db-pkgs/db-doc}/db/scribblings/log-for-util.rktd (100%) rename pkgs/{racket-pkgs/racket-doc => db-pkgs/db-doc}/db/scribblings/notes.scrbl (100%) rename pkgs/{racket-pkgs/racket-doc => db-pkgs/db-doc}/db/scribblings/query.scrbl (100%) rename pkgs/{racket-pkgs/racket-doc => db-pkgs/db-doc}/db/scribblings/sql-types.scrbl (100%) rename pkgs/{racket-pkgs/racket-doc => db-pkgs/db-doc}/db/scribblings/tabbing.rkt (100%) rename pkgs/{racket-pkgs/racket-doc => db-pkgs/db-doc}/db/scribblings/using-db.scrbl (100%) rename pkgs/{racket-pkgs/racket-doc => db-pkgs/db-doc}/db/scribblings/util.scrbl (100%) create mode 100644 pkgs/db-pkgs/db-doc/info.rkt rename {racket/lib/collects => pkgs/db-pkgs/db-lib}/db/TODO (100%) create mode 100644 pkgs/db-pkgs/db-lib/db/info.rkt rename {racket/lib/collects => pkgs/db-pkgs/db-lib}/db/main.rkt (97%) rename {racket/lib/collects => pkgs/db-pkgs/db-lib}/db/mysql.rkt (97%) rename {racket/lib/collects => pkgs/db-pkgs/db-lib}/db/odbc.rkt (97%) rename {racket/lib/collects => pkgs/db-pkgs/db-lib}/db/postgresql.rkt (97%) rename {racket/lib/collects => pkgs/db-pkgs/db-lib}/db/private/mysql/connection.rkt (99%) rename {racket/lib/collects => pkgs/db-pkgs/db-lib}/db/private/mysql/dbsystem.rkt (97%) rename {racket/lib/collects => pkgs/db-pkgs/db-lib}/db/private/mysql/main.rkt (97%) rename {racket/lib/collects => pkgs/db-pkgs/db-lib}/db/private/mysql/message.rkt (99%) rename {racket/lib/collects => pkgs/db-pkgs/db-lib}/db/private/odbc/connection.rkt (99%) rename {racket/lib/collects => pkgs/db-pkgs/db-lib}/db/private/odbc/dbsystem.rkt (97%) rename {racket/lib/collects => pkgs/db-pkgs/db-lib}/db/private/odbc/ffi-constants.rkt (100%) rename {racket/lib/collects => pkgs/db-pkgs/db-lib}/db/private/odbc/ffi.rkt (100%) rename {racket/lib/collects => pkgs/db-pkgs/db-lib}/db/private/odbc/main.rkt (98%) rename {racket/lib/collects => pkgs/db-pkgs/db-lib}/db/private/postgresql/connection.rkt (99%) rename {racket/lib/collects => pkgs/db-pkgs/db-lib}/db/private/postgresql/dbsystem.rkt (99%) rename {racket/lib/collects => pkgs/db-pkgs/db-lib}/db/private/postgresql/main.rkt (97%) rename {racket/lib/collects => pkgs/db-pkgs/db-lib}/db/private/postgresql/message.rkt (99%) rename {racket/lib/collects => pkgs/db-pkgs/db-lib}/db/util/datetime.rkt (98%) rename {racket/lib/collects => pkgs/db-pkgs/db-lib}/db/util/geometry.rkt (100%) rename {racket/lib/collects => pkgs/db-pkgs/db-lib}/db/util/postgresql.rkt (100%) rename {racket/lib/collects => pkgs/db-pkgs/db-lib}/db/util/private/geometry.rkt (100%) rename {racket/lib/collects => pkgs/db-pkgs/db-lib}/db/util/testing.rkt (95%) create mode 100644 pkgs/db-pkgs/db-lib/info.rkt create mode 100644 pkgs/db-pkgs/db-test/info.rkt rename pkgs/{racket-pkgs/racket-test => db-pkgs/db-test}/tests/db/all-tests.rkt (100%) rename pkgs/{racket-pkgs/racket-test => db-pkgs/db-test}/tests/db/config.rkt (100%) rename pkgs/{racket-pkgs/racket-test => db-pkgs/db-test}/tests/db/db/concurrent.rkt (100%) rename pkgs/{racket-pkgs/racket-test => db-pkgs/db-test}/tests/db/db/connection.rkt (100%) rename pkgs/{racket-pkgs/racket-test => db-pkgs/db-test}/tests/db/db/query.rkt (100%) rename pkgs/{racket-pkgs/racket-test => db-pkgs/db-test}/tests/db/db/sql-types.rkt (100%) rename pkgs/{racket-pkgs/racket-test => db-pkgs/db-test}/tests/db/gen/misc.rkt (100%) rename pkgs/{racket-pkgs/racket-test => db-pkgs/db-test}/tests/db/gen/query.rkt (100%) rename pkgs/{racket-pkgs/racket-test => db-pkgs/db-test}/tests/db/gen/sql-types.rkt (100%) rename pkgs/{racket-pkgs/racket-test => db-pkgs/db-test}/tests/db/programs/memleak.rkt (100%) rename pkgs/{racket-pkgs/racket-test => db-pkgs/db-test}/tests/db/programs/sl-inserts.rkt (100%) rename pkgs/{racket-pkgs/racket-test => db-pkgs/db-test}/tests/db/programs/web-test.rkt (100%) create mode 100644 pkgs/db-pkgs/db/info.rkt diff --git a/pkgs/racket-pkgs/racket-doc/db/info.rkt b/pkgs/db-pkgs/db-doc/db/info.rkt similarity index 74% rename from pkgs/racket-pkgs/racket-doc/db/info.rkt rename to pkgs/db-pkgs/db-doc/db/info.rkt index 17ed1c3e27..f8d62895fe 100644 --- a/pkgs/racket-pkgs/racket-doc/db/info.rkt +++ b/pkgs/db-pkgs/db-doc/db/info.rkt @@ -1,3 +1,4 @@ #lang info +(define collection "db") (define scribblings '(("scribblings/db.scrbl" (multi-page)))) diff --git a/pkgs/racket-pkgs/racket-doc/db/scribblings/config.rkt b/pkgs/db-pkgs/db-doc/db/scribblings/config.rkt similarity index 100% rename from pkgs/racket-pkgs/racket-doc/db/scribblings/config.rkt rename to pkgs/db-pkgs/db-doc/db/scribblings/config.rkt diff --git a/pkgs/racket-pkgs/racket-doc/db/scribblings/connect.scrbl b/pkgs/db-pkgs/db-doc/db/scribblings/connect.scrbl similarity index 100% rename from pkgs/racket-pkgs/racket-doc/db/scribblings/connect.scrbl rename to pkgs/db-pkgs/db-doc/db/scribblings/connect.scrbl diff --git a/pkgs/racket-pkgs/racket-doc/db/scribblings/db.scrbl b/pkgs/db-pkgs/db-doc/db/scribblings/db.scrbl similarity index 100% rename from pkgs/racket-pkgs/racket-doc/db/scribblings/db.scrbl rename to pkgs/db-pkgs/db-doc/db/scribblings/db.scrbl diff --git a/pkgs/racket-pkgs/racket-doc/db/scribblings/log-for-connect.rktd b/pkgs/db-pkgs/db-doc/db/scribblings/log-for-connect.rktd similarity index 100% rename from pkgs/racket-pkgs/racket-doc/db/scribblings/log-for-connect.rktd rename to pkgs/db-pkgs/db-doc/db/scribblings/log-for-connect.rktd diff --git a/pkgs/racket-pkgs/racket-doc/db/scribblings/log-for-query.rktd b/pkgs/db-pkgs/db-doc/db/scribblings/log-for-query.rktd similarity index 100% rename from pkgs/racket-pkgs/racket-doc/db/scribblings/log-for-query.rktd rename to pkgs/db-pkgs/db-doc/db/scribblings/log-for-query.rktd diff --git a/pkgs/racket-pkgs/racket-doc/db/scribblings/log-for-sql-types.rktd b/pkgs/db-pkgs/db-doc/db/scribblings/log-for-sql-types.rktd similarity index 100% rename from pkgs/racket-pkgs/racket-doc/db/scribblings/log-for-sql-types.rktd rename to pkgs/db-pkgs/db-doc/db/scribblings/log-for-sql-types.rktd diff --git a/pkgs/racket-pkgs/racket-doc/db/scribblings/log-for-using-db.rktd b/pkgs/db-pkgs/db-doc/db/scribblings/log-for-using-db.rktd similarity index 100% rename from pkgs/racket-pkgs/racket-doc/db/scribblings/log-for-using-db.rktd rename to pkgs/db-pkgs/db-doc/db/scribblings/log-for-using-db.rktd diff --git a/pkgs/racket-pkgs/racket-doc/db/scribblings/log-for-util.rktd b/pkgs/db-pkgs/db-doc/db/scribblings/log-for-util.rktd similarity index 100% rename from pkgs/racket-pkgs/racket-doc/db/scribblings/log-for-util.rktd rename to pkgs/db-pkgs/db-doc/db/scribblings/log-for-util.rktd diff --git a/pkgs/racket-pkgs/racket-doc/db/scribblings/notes.scrbl b/pkgs/db-pkgs/db-doc/db/scribblings/notes.scrbl similarity index 100% rename from pkgs/racket-pkgs/racket-doc/db/scribblings/notes.scrbl rename to pkgs/db-pkgs/db-doc/db/scribblings/notes.scrbl diff --git a/pkgs/racket-pkgs/racket-doc/db/scribblings/query.scrbl b/pkgs/db-pkgs/db-doc/db/scribblings/query.scrbl similarity index 100% rename from pkgs/racket-pkgs/racket-doc/db/scribblings/query.scrbl rename to pkgs/db-pkgs/db-doc/db/scribblings/query.scrbl diff --git a/pkgs/racket-pkgs/racket-doc/db/scribblings/sql-types.scrbl b/pkgs/db-pkgs/db-doc/db/scribblings/sql-types.scrbl similarity index 100% rename from pkgs/racket-pkgs/racket-doc/db/scribblings/sql-types.scrbl rename to pkgs/db-pkgs/db-doc/db/scribblings/sql-types.scrbl diff --git a/pkgs/racket-pkgs/racket-doc/db/scribblings/tabbing.rkt b/pkgs/db-pkgs/db-doc/db/scribblings/tabbing.rkt similarity index 100% rename from pkgs/racket-pkgs/racket-doc/db/scribblings/tabbing.rkt rename to pkgs/db-pkgs/db-doc/db/scribblings/tabbing.rkt diff --git a/pkgs/racket-pkgs/racket-doc/db/scribblings/using-db.scrbl b/pkgs/db-pkgs/db-doc/db/scribblings/using-db.scrbl similarity index 100% rename from pkgs/racket-pkgs/racket-doc/db/scribblings/using-db.scrbl rename to pkgs/db-pkgs/db-doc/db/scribblings/using-db.scrbl diff --git a/pkgs/racket-pkgs/racket-doc/db/scribblings/util.scrbl b/pkgs/db-pkgs/db-doc/db/scribblings/util.scrbl similarity index 100% rename from pkgs/racket-pkgs/racket-doc/db/scribblings/util.scrbl rename to pkgs/db-pkgs/db-doc/db/scribblings/util.scrbl diff --git a/pkgs/db-pkgs/db-doc/info.rkt b/pkgs/db-pkgs/db-doc/info.rkt new file mode 100644 index 0000000000..52ac21bdc0 --- /dev/null +++ b/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")) diff --git a/racket/lib/collects/db/TODO b/pkgs/db-pkgs/db-lib/db/TODO similarity index 100% rename from racket/lib/collects/db/TODO rename to pkgs/db-pkgs/db-lib/db/TODO diff --git a/pkgs/db-pkgs/db-lib/db/info.rkt b/pkgs/db-pkgs/db-lib/db/info.rkt new file mode 100644 index 0000000000..5d5561ec3f --- /dev/null +++ b/pkgs/db-pkgs/db-lib/db/info.rkt @@ -0,0 +1,3 @@ +#lang setup/infotab + +(define collection "db") diff --git a/racket/lib/collects/db/main.rkt b/pkgs/db-pkgs/db-lib/db/main.rkt similarity index 97% rename from racket/lib/collects/db/main.rkt rename to pkgs/db-pkgs/db-lib/db/main.rkt index 90a213c8dd..0b046a7f60 100644 --- a/racket/lib/collects/db/main.rkt +++ b/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" diff --git a/racket/lib/collects/db/mysql.rkt b/pkgs/db-pkgs/db-lib/db/mysql.rkt similarity index 97% rename from racket/lib/collects/db/mysql.rkt rename to pkgs/db-pkgs/db-lib/db/mysql.rkt index 020264eb3c..027c1e230f 100644 --- a/racket/lib/collects/db/mysql.rkt +++ b/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 diff --git a/racket/lib/collects/db/odbc.rkt b/pkgs/db-pkgs/db-lib/db/odbc.rkt similarity index 97% rename from racket/lib/collects/db/odbc.rkt rename to pkgs/db-pkgs/db-lib/db/odbc.rkt index 4d88401b79..44e0b49f2d 100644 --- a/racket/lib/collects/db/odbc.rkt +++ b/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 diff --git a/racket/lib/collects/db/postgresql.rkt b/pkgs/db-pkgs/db-lib/db/postgresql.rkt similarity index 97% rename from racket/lib/collects/db/postgresql.rkt rename to pkgs/db-pkgs/db-lib/db/postgresql.rkt index e6fac69f8c..8f5924ec1a 100644 --- a/racket/lib/collects/db/postgresql.rkt +++ b/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 diff --git a/racket/lib/collects/db/private/mysql/connection.rkt b/pkgs/db-pkgs/db-lib/db/private/mysql/connection.rkt similarity index 99% rename from racket/lib/collects/db/private/mysql/connection.rkt rename to pkgs/db-pkgs/db-lib/db/private/mysql/connection.rkt index fd832ee91d..0f392489ef 100644 --- a/racket/lib/collects/db/private/mysql/connection.rkt +++ b/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% diff --git a/racket/lib/collects/db/private/mysql/dbsystem.rkt b/pkgs/db-pkgs/db-lib/db/private/mysql/dbsystem.rkt similarity index 97% rename from racket/lib/collects/db/private/mysql/dbsystem.rkt rename to pkgs/db-pkgs/db-lib/db/private/mysql/dbsystem.rkt index 6adf742716..f623c4b409 100644 --- a/racket/lib/collects/db/private/mysql/dbsystem.rkt +++ b/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 diff --git a/racket/lib/collects/db/private/mysql/main.rkt b/pkgs/db-pkgs/db-lib/db/private/mysql/main.rkt similarity index 97% rename from racket/lib/collects/db/private/mysql/main.rkt rename to pkgs/db-pkgs/db-lib/db/private/mysql/main.rkt index 9f03e2f453..aded42175c 100644 --- a/racket/lib/collects/db/private/mysql/main.rkt +++ b/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 diff --git a/racket/lib/collects/db/private/mysql/message.rkt b/pkgs/db-pkgs/db-lib/db/private/mysql/message.rkt similarity index 99% rename from racket/lib/collects/db/private/mysql/message.rkt rename to pkgs/db-pkgs/db-lib/db/private/mysql/message.rkt index 7d61fafa12..b4663d0b85 100644 --- a/racket/lib/collects/db/private/mysql/message.rkt +++ b/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 diff --git a/racket/lib/collects/db/private/odbc/connection.rkt b/pkgs/db-pkgs/db-lib/db/private/odbc/connection.rkt similarity index 99% rename from racket/lib/collects/db/private/odbc/connection.rkt rename to pkgs/db-pkgs/db-lib/db/private/odbc/connection.rkt index 68fdc943f4..2aeffd50f1 100644 --- a/racket/lib/collects/db/private/odbc/connection.rkt +++ b/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") diff --git a/racket/lib/collects/db/private/odbc/dbsystem.rkt b/pkgs/db-pkgs/db-lib/db/private/odbc/dbsystem.rkt similarity index 97% rename from racket/lib/collects/db/private/odbc/dbsystem.rkt rename to pkgs/db-pkgs/db-lib/db/private/odbc/dbsystem.rkt index 902658c012..bdc61ff39f 100644 --- a/racket/lib/collects/db/private/odbc/dbsystem.rkt +++ b/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 diff --git a/racket/lib/collects/db/private/odbc/ffi-constants.rkt b/pkgs/db-pkgs/db-lib/db/private/odbc/ffi-constants.rkt similarity index 100% rename from racket/lib/collects/db/private/odbc/ffi-constants.rkt rename to pkgs/db-pkgs/db-lib/db/private/odbc/ffi-constants.rkt diff --git a/racket/lib/collects/db/private/odbc/ffi.rkt b/pkgs/db-pkgs/db-lib/db/private/odbc/ffi.rkt similarity index 100% rename from racket/lib/collects/db/private/odbc/ffi.rkt rename to pkgs/db-pkgs/db-lib/db/private/odbc/ffi.rkt diff --git a/racket/lib/collects/db/private/odbc/main.rkt b/pkgs/db-pkgs/db-lib/db/private/odbc/main.rkt similarity index 98% rename from racket/lib/collects/db/private/odbc/main.rkt rename to pkgs/db-pkgs/db-lib/db/private/odbc/main.rkt index 218259fb27..37ecc53af0 100644 --- a/racket/lib/collects/db/private/odbc/main.rkt +++ b/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") diff --git a/racket/lib/collects/db/private/postgresql/connection.rkt b/pkgs/db-pkgs/db-lib/db/private/postgresql/connection.rkt similarity index 99% rename from racket/lib/collects/db/private/postgresql/connection.rkt rename to pkgs/db-pkgs/db-lib/db/private/postgresql/connection.rkt index fe918c8120..fd15851c9b 100644 --- a/racket/lib/collects/db/private/postgresql/connection.rkt +++ b/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% diff --git a/racket/lib/collects/db/private/postgresql/dbsystem.rkt b/pkgs/db-pkgs/db-lib/db/private/postgresql/dbsystem.rkt similarity index 99% rename from racket/lib/collects/db/private/postgresql/dbsystem.rkt rename to pkgs/db-pkgs/db-lib/db/private/postgresql/dbsystem.rkt index 8883fc5d36..e4143b67f2 100644 --- a/racket/lib/collects/db/private/postgresql/dbsystem.rkt +++ b/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" diff --git a/racket/lib/collects/db/private/postgresql/main.rkt b/pkgs/db-pkgs/db-lib/db/private/postgresql/main.rkt similarity index 97% rename from racket/lib/collects/db/private/postgresql/main.rkt rename to pkgs/db-pkgs/db-lib/db/private/postgresql/main.rkt index 637bd6417d..19aebe6c59 100644 --- a/racket/lib/collects/db/private/postgresql/main.rkt +++ b/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 diff --git a/racket/lib/collects/db/private/postgresql/message.rkt b/pkgs/db-pkgs/db-lib/db/private/postgresql/message.rkt similarity index 99% rename from racket/lib/collects/db/private/postgresql/message.rkt rename to pkgs/db-pkgs/db-lib/db/private/postgresql/message.rkt index 3fbc4e165b..1d549d558e 100644 --- a/racket/lib/collects/db/private/postgresql/message.rkt +++ b/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 diff --git a/racket/lib/collects/db/util/datetime.rkt b/pkgs/db-pkgs/db-lib/db/util/datetime.rkt similarity index 98% rename from racket/lib/collects/db/util/datetime.rkt rename to pkgs/db-pkgs/db-lib/db/util/datetime.rkt index 8b621f8f77..3537eacf08 100644 --- a/racket/lib/collects/db/util/datetime.rkt +++ b/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 diff --git a/racket/lib/collects/db/util/geometry.rkt b/pkgs/db-pkgs/db-lib/db/util/geometry.rkt similarity index 100% rename from racket/lib/collects/db/util/geometry.rkt rename to pkgs/db-pkgs/db-lib/db/util/geometry.rkt diff --git a/racket/lib/collects/db/util/postgresql.rkt b/pkgs/db-pkgs/db-lib/db/util/postgresql.rkt similarity index 100% rename from racket/lib/collects/db/util/postgresql.rkt rename to pkgs/db-pkgs/db-lib/db/util/postgresql.rkt diff --git a/racket/lib/collects/db/util/private/geometry.rkt b/pkgs/db-pkgs/db-lib/db/util/private/geometry.rkt similarity index 100% rename from racket/lib/collects/db/util/private/geometry.rkt rename to pkgs/db-pkgs/db-lib/db/util/private/geometry.rkt diff --git a/racket/lib/collects/db/util/testing.rkt b/pkgs/db-pkgs/db-lib/db/util/testing.rkt similarity index 95% rename from racket/lib/collects/db/util/testing.rkt rename to pkgs/db-pkgs/db-lib/db/util/testing.rkt index 87635ee6c5..12c3016f37 100644 --- a/racket/lib/collects/db/util/testing.rkt +++ b/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<%>) diff --git a/pkgs/db-pkgs/db-lib/info.rkt b/pkgs/db-pkgs/db-lib/info.rkt new file mode 100644 index 0000000000..e43df74125 --- /dev/null +++ b/pkgs/db-pkgs/db-lib/info.rkt @@ -0,0 +1,4 @@ +#lang setup/infotab + +(define collection 'multi) +(define deps '("base")) diff --git a/pkgs/db-pkgs/db-test/info.rkt b/pkgs/db-pkgs/db-test/info.rkt new file mode 100644 index 0000000000..3e95bb8f5a --- /dev/null +++ b/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")) diff --git a/pkgs/racket-pkgs/racket-test/tests/db/all-tests.rkt b/pkgs/db-pkgs/db-test/tests/db/all-tests.rkt similarity index 100% rename from pkgs/racket-pkgs/racket-test/tests/db/all-tests.rkt rename to pkgs/db-pkgs/db-test/tests/db/all-tests.rkt diff --git a/pkgs/racket-pkgs/racket-test/tests/db/config.rkt b/pkgs/db-pkgs/db-test/tests/db/config.rkt similarity index 100% rename from pkgs/racket-pkgs/racket-test/tests/db/config.rkt rename to pkgs/db-pkgs/db-test/tests/db/config.rkt diff --git a/pkgs/racket-pkgs/racket-test/tests/db/db/concurrent.rkt b/pkgs/db-pkgs/db-test/tests/db/db/concurrent.rkt similarity index 100% rename from pkgs/racket-pkgs/racket-test/tests/db/db/concurrent.rkt rename to pkgs/db-pkgs/db-test/tests/db/db/concurrent.rkt diff --git a/pkgs/racket-pkgs/racket-test/tests/db/db/connection.rkt b/pkgs/db-pkgs/db-test/tests/db/db/connection.rkt similarity index 100% rename from pkgs/racket-pkgs/racket-test/tests/db/db/connection.rkt rename to pkgs/db-pkgs/db-test/tests/db/db/connection.rkt diff --git a/pkgs/racket-pkgs/racket-test/tests/db/db/query.rkt b/pkgs/db-pkgs/db-test/tests/db/db/query.rkt similarity index 100% rename from pkgs/racket-pkgs/racket-test/tests/db/db/query.rkt rename to pkgs/db-pkgs/db-test/tests/db/db/query.rkt diff --git a/pkgs/racket-pkgs/racket-test/tests/db/db/sql-types.rkt b/pkgs/db-pkgs/db-test/tests/db/db/sql-types.rkt similarity index 100% rename from pkgs/racket-pkgs/racket-test/tests/db/db/sql-types.rkt rename to pkgs/db-pkgs/db-test/tests/db/db/sql-types.rkt diff --git a/pkgs/racket-pkgs/racket-test/tests/db/gen/misc.rkt b/pkgs/db-pkgs/db-test/tests/db/gen/misc.rkt similarity index 100% rename from pkgs/racket-pkgs/racket-test/tests/db/gen/misc.rkt rename to pkgs/db-pkgs/db-test/tests/db/gen/misc.rkt diff --git a/pkgs/racket-pkgs/racket-test/tests/db/gen/query.rkt b/pkgs/db-pkgs/db-test/tests/db/gen/query.rkt similarity index 100% rename from pkgs/racket-pkgs/racket-test/tests/db/gen/query.rkt rename to pkgs/db-pkgs/db-test/tests/db/gen/query.rkt diff --git a/pkgs/racket-pkgs/racket-test/tests/db/gen/sql-types.rkt b/pkgs/db-pkgs/db-test/tests/db/gen/sql-types.rkt similarity index 100% rename from pkgs/racket-pkgs/racket-test/tests/db/gen/sql-types.rkt rename to pkgs/db-pkgs/db-test/tests/db/gen/sql-types.rkt diff --git a/pkgs/racket-pkgs/racket-test/tests/db/programs/memleak.rkt b/pkgs/db-pkgs/db-test/tests/db/programs/memleak.rkt similarity index 100% rename from pkgs/racket-pkgs/racket-test/tests/db/programs/memleak.rkt rename to pkgs/db-pkgs/db-test/tests/db/programs/memleak.rkt diff --git a/pkgs/racket-pkgs/racket-test/tests/db/programs/sl-inserts.rkt b/pkgs/db-pkgs/db-test/tests/db/programs/sl-inserts.rkt similarity index 100% rename from pkgs/racket-pkgs/racket-test/tests/db/programs/sl-inserts.rkt rename to pkgs/db-pkgs/db-test/tests/db/programs/sl-inserts.rkt diff --git a/pkgs/racket-pkgs/racket-test/tests/db/programs/web-test.rkt b/pkgs/db-pkgs/db-test/tests/db/programs/web-test.rkt similarity index 100% rename from pkgs/racket-pkgs/racket-test/tests/db/programs/web-test.rkt rename to pkgs/db-pkgs/db-test/tests/db/programs/web-test.rkt diff --git a/pkgs/db-pkgs/db/info.rkt b/pkgs/db-pkgs/db/info.rkt new file mode 100644 index 0000000000..fb5c20b564 --- /dev/null +++ b/pkgs/db-pkgs/db/info.rkt @@ -0,0 +1,4 @@ +#lang info + +(define deps + '("base" "db-lib" "db-doc" "db-test")) diff --git a/pkgs/main-distribution/info.rkt b/pkgs/main-distribution/info.rkt index ce2a649a2a..12f37d3051 100644 --- a/pkgs/main-distribution/info.rkt +++ b/pkgs/main-distribution/info.rkt @@ -8,6 +8,7 @@ "contract-profile" "data-lib" "datalog" + "db" "deinprogramm" "draw" "draw-doc" diff --git a/pkgs/plot/info.rkt b/pkgs/plot/info.rkt index e28bcf8b59..bf9eed2d29 100644 --- a/pkgs/plot/info.rkt +++ b/pkgs/plot/info.rkt @@ -8,6 +8,7 @@ (define deps '("typed-racket-more" "base" "compatibility-lib" + "db-lib" "draw-lib" "gui-lib" "pict-lib" diff --git a/pkgs/web-server-pkgs/web-server-doc/info.rkt b/pkgs/web-server-pkgs/web-server-doc/info.rkt index 5f9e2d9b4a..2915aaf54e 100644 --- a/pkgs/web-server-pkgs/web-server-doc/info.rkt +++ b/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" diff --git a/racket/lib/collects/db/private/generic/dsn.rkt b/racket/lib/collects/db/private/generic/dsn.rkt index fcd36878f6..3bc341d071 100644 --- a/racket/lib/collects/db/private/generic/dsn.rkt +++ b/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 diff --git a/racket/lib/collects/db/private/generic/place-server.rkt b/racket/lib/collects/db/private/generic/place-server.rkt index 9219a9fab1..6b1a249e46 100644 --- a/racket/lib/collects/db/private/generic/place-server.rkt +++ b/racket/lib/collects/db/private/generic/place-server.rkt @@ -30,9 +30,8 @@ where ::= (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) diff --git a/racket/lib/collects/pkg/db.rkt b/racket/lib/collects/pkg/db.rkt index 5facd012a4..b0cfe2f5e7 100644 --- a/racket/lib/collects/pkg/db.rkt +++ b/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) diff --git a/racket/lib/collects/setup/doc-db.rkt b/racket/lib/collects/setup/doc-db.rkt index a176b72dae..8870006b1e 100644 --- a/racket/lib/collects/setup/doc-db.rkt +++ b/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")