RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 09-Apr-2010 00:50:45
Branch: HEAD Handle: 2010040822504401
Modified files:
rpm/tests Makefile.am
rpm/tests/ref sqldb-basic.out sqldb-basic.sql sqldb-meta.sql
Log:
- tests: stub-in the 3 basic executions needed to blueprint embedded
SQL.
Summary:
Revision Changes Path
1.66 +15 -3 rpm/tests/Makefile.am
1.3 +0 -69 rpm/tests/ref/sqldb-basic.out
1.3 +1 -1 rpm/tests/ref/sqldb-basic.sql
1.2 +1 -1 rpm/tests/ref/sqldb-meta.sql
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/tests/Makefile.am
============================================================================
$ cvs diff -u -r1.65 -r1.66 Makefile.am
--- rpm/tests/Makefile.am 8 Apr 2010 22:13:38 -0000 1.65
+++ rpm/tests/Makefile.am 8 Apr 2010 22:50:44 -0000 1.66
@@ -43,7 +43,7 @@
rpmcache = $(abs_top_builddir)/tools/rpmcache --macros $(macros)
rpmdigest = $(abs_top_builddir)/tools/rpmdigest
rpmrepo = $(abs_top_builddir)/tools/rpmrepo
-dbsql = $(abs_top_builddir)/tools/sqlite3
+rpmsql = $(abs_top_builddir)/tools/sqlite3
tpgp = ./tpgp --macros $(macros)
@@ -96,11 +96,13 @@
db_checkpoint = ${db_tool} db_checkpoint -h $(rpmdb) -v
db_dump = ${db_tool} db_dump -h $(rpmdb)
db_load = ${db_tool} db_load -h $(rpmdb)
+db_log_verify = ${db_tool} db_log_verify -h $(rpmdb)
db_printlog = ${db_tool} db_printlog -h $(rpmdb)
db_recover = ${db_tool} db_recover -h $(rpmdb) -v
db_stat = ${db_tool} db_stat -h $(rpmdb)
db_upgrade = ${db_tool} db_upgrade -h $(rpmdb) -v
db_verify = ${db_tool} db_verify -h $(rpmdb)
+dbsql = $(abs_top_builddir)/tools/dbsql
cpio = @__CPIO@
diff = @__DIFF@
@@ -109,6 +111,7 @@
mkdir = @__MKDIR@
mv = @__MV@
rm = @__RM@
+sqlite3 = /usr/bin/sqlite3
tar = @__TAR@
tpgp_SOURCES = genpgp.h tpgp.c
@@ -417,9 +420,18 @@
check-sql:
@echo "=== $@ ==="
- @rm -rf tmp/sqldb*
- @-${dbsql} -echo tmp/sqldb '.read ref/sqldb-basic.sql' >&
tmp/sqldb-basic.out
+ @echo "--> sqlite3:"
+ @rm -f tmp/sqldb*
+ @-${sqlite3} -echo tmp/sqldb ".read ref/sqldb-basic.sql" >&
tmp/sqldb-basic.out
@-diff -u {tmp,ref}/sqldb-basic.out || cp {tmp,ref}/sqldb-basic.out
+ @echo "--> rpm sqlite3:"
+ @rm -f tmp/sqldb*
+ @-${rpmsql} -echo tmp/sqldb ".read ref/sqldb-basic.sql" >&
tmp/sqldb-basic.out
+ @-diff -u {tmp,ref}/sqldb-basic.out
+ @echo "--> rpm embedded:"
+ @rm -f tmp/sqldb*
+ @-${rpm} -E '%{sql -echo tmp/sqldb:.read ref/sqldb-basic.sql}' >&
tmp/sqldb-basic.out
+ @-diff -u {tmp,ref}/sqldb-basic.out
check-local: check-init check-pubkeys check-markup check-macros \
check-build check-sign check-ACID check-install \
@@ .
patch -p0 <<'@@ .'
Index: rpm/tests/ref/sqldb-basic.out
============================================================================
$ cvs diff -u -r1.2 -r1.3 sqldb-basic.out
--- rpm/tests/ref/sqldb-basic.out 8 Apr 2010 22:13:38 -0000 1.2
+++ rpm/tests/ref/sqldb-basic.out 8 Apr 2010 22:50:44 -0000 1.3
@@ -1,25 +1,4 @@
.read ref/rpmdb.sql
-CREATE TABLE Packages (
- i INTEGER UNIQUE PRIMARY KEY NOT NULL,
- h BLOB NOT NULL
-);
-CREATE TEMP TRIGGER insert_Packages AFTER INSERT ON Packages
- BEGIN
- INSERT INTO Nvra (k,v) VALUES ( new.h, new.rowid );
- END;
-CREATE TEMP TRIGGER delete_Packages BEFORE DELETE ON Packages
- BEGIN
- DELETE FROM Nvra WHERE v = old.rowid;
- END;
-CREATE TABLE Nvra (
- k TEXT PRIMARY KEY NOT NULL,
- v INTEGER REFERENCES Packages(i) ON UPDATE RESTRICT ON DELETE RESTRICT
-);
-BEGIN TRANSACTION;
-INSERT into Packages (h) VALUES ('bing-1.2-3.noarch');
-INSERT into Packages (h) VALUES ('bang-4.5-6.noarch');
-INSERT into Packages (h) VALUES ('boom-7.8.9.noarch');
-COMMIT TRANSACTION;
SELECT * from Packages;
1|bing-1.2-3.noarch
2|bang-4.5-6.noarch
@@ -28,58 +7,10 @@
bing-1.2-3.noarch|1
bang-4.5-6.noarch|2
boom-7.8.9.noarch|3
-BEGIN TRANSACTION;
-DELETE FROM Packages WHERE i = 2;
-COMMIT TRANSACTION;
SELECT * from Packages;
1|bing-1.2-3.noarch
3|boom-7.8.9.noarch
SELECT * from Nvra;
bing-1.2-3.noarch|1
boom-7.8.9.noarch|3
-.read ref/sqldb-meta.sql
-.databases
-seq name file
---- ---------------
----------------------------------------------------------
-0 main /X/src/wdj/tests/tmp/sqldb
-1 temp
-.echo on
-.explain off
-.headers off
-.indices
-.mode list
-.nullvalue ""
-.output stdout
-.prompt 'foo> ' '---> '
-.schema
-CREATE TABLE Nvra (
- k TEXT PRIMARY KEY NOT NULL,
- v INTEGER REFERENCES Packages(i) ON UPDATE RESTRICT ON DELETE RESTRICT
-);
-CREATE TABLE Packages (
- i INTEGER UNIQUE PRIMARY KEY NOT NULL,
- h BLOB NOT NULL
-);
-CREATE TRIGGER delete_Packages BEFORE DELETE ON Packages
- BEGIN
- DELETE FROM Nvra WHERE v = old.rowid;
- END;
-CREATE TRIGGER insert_Packages AFTER INSERT ON Packages
- BEGIN
- INSERT INTO Nvra (k,v) VALUES ( new.h, new.rowid );
- END;
-.separator "|"
-.show
- echo: on
- explain: off
- headers: off
- mode: semi
-nullvalue: ""
- output: stdout
-separator: "|"
- width: 3 15 58
-.tables
-Nvra Packages
-.timeout 1000
-.timer off
.exit
@@ .
patch -p0 <<'@@ .'
Index: rpm/tests/ref/sqldb-basic.sql
============================================================================
$ cvs diff -u -r1.2 -r1.3 sqldb-basic.sql
--- rpm/tests/ref/sqldb-basic.sql 8 Apr 2010 22:13:38 -0000 1.2
+++ rpm/tests/ref/sqldb-basic.sql 8 Apr 2010 22:50:44 -0000 1.3
@@ -21,6 +21,6 @@
SELECT * from Nvra;
-- Basic .foo SQL metadata tests.
-.read ref/sqldb-meta.sql
+-- .read ref/sqldb-meta.sql
.exit
@@ .
patch -p0 <<'@@ .'
Index: rpm/tests/ref/sqldb-meta.sql
============================================================================
$ cvs diff -u -r1.1 -r1.2 sqldb-meta.sql
--- rpm/tests/ref/sqldb-meta.sql 8 Apr 2010 22:13:38 -0000 1.1
+++ rpm/tests/ref/sqldb-meta.sql 8 Apr 2010 22:50:45 -0000 1.2
@@ -9,7 +9,7 @@
-- .log stderr
.mode list
.nullvalue ""
-.output stdout
+-- .output stdout
.prompt 'foo> ' '---> '
.schema
.separator "|"
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
