X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=db.sql;h=aadd91df9e24403814219cf3096c78d239bc141b;hb=106b25a0eabbeb2a06d20c245c082202b3cb1a4e;hp=eb7c461bcc426ec0bee8c4ab96db564cee1c128d;hpb=3f852ae0fbb42655a1baf66d914007f02fd4720e;p=zpackage

diff --git a/db.sql b/db.sql
index eb7c461..aadd91d 100644
--- a/db.sql
+++ b/db.sql
@@ -128,9 +128,9 @@ create table packagefiles (
 	release	integer,
 
 	path	text, -- filesystem path
-	mode	text not null, -- perms, use text for octal rep?
-	username	text not null, -- name of owner
-	groupname	text not null, -- group of owner
+	mode	text not null default '0644', -- perms, use text for octal rep?
+	username	text not null default 'root', -- name of owner
+	groupname	text not null default 'root', -- group of owner
 	uid	integer, -- numeric uid, generally ignored
 	gid	integer, -- numeric gid, generally ignored
 	configuration integer not null default 0, -- boolean if config file
@@ -278,9 +278,10 @@ create table elflibraries (
 )
 without rowid
 ;
+create index elf_library_name_index on elflibraries(soname);
 
 create table elfneeded (
-	file	text,
+	file	text, -- hash of file
 	needed	text, -- soname of dependency
 	primary key (file, needed)
 )
@@ -373,6 +374,8 @@ create table repository (
 	priority	integer not null default 1,
 	refreshed	integer -- last refresh time
 );
+-- force the url to be repourl/info.repo
+-- package urls repourl/pkgid.zpm
 
 -- urls for downloading packages.  possibly unneeded
 create table repository_packages (
@@ -435,6 +438,19 @@ from syncstatus BASE
 where path in (select path from md_conflict where mdcount > 1)
 ;
 
+create view needed_libraries as
+with recursive
+libs(file,needs,provider) as (
+	select N.file, N.needed as needs, L.file as provider
+	from elfneeded N left join elflibraries L on N.needed = L.soname
+	union
+	select L.file, N.needed as needs, EL.file as provider
+	from libs L
+	join elfneeded N on N.file = L.provider
+	left join elflibraries EL on N.needed = EL.soname
+)
+select * from libs;
+
 create view syncinfo as
 with
 preserved as (
@@ -477,7 +493,10 @@ modified as (
 	select distinct
 	SS.path, 
 	SS.username, SS.uid, SS.groupname, SS.gid, SS.mode, SS.filetype,
-	SS.mtime, SS.hash, SS.configuration, SS.target, SS.device,
+	SS.mtime, SS.hash,
+	SS.configuration + case when OS.configuration = 1 then 2 else 0 end
+	as configuration,
+       	SS.target, SS.device,
 	OS.hash as ohash, SS.mds, OS.mds as omds
 	from syncstatus SS
 	join syncstatus OS
@@ -489,6 +508,7 @@ modified as (
 	SS.rstatus in ('installing')
 ),
 -- preserve: libraries needed by something in installed or installing
+/*
 needed as (
 	select distinct
        	ED.library
@@ -496,13 +516,23 @@ needed as (
 	where status in ('installed', 'installing')
 	and library is not null
 ),
+*/
+needed as (
+	select NL.file as needslib, NL.provider as libraryhash
+	from needed_libraries NL
+	inner join syncstatus SS on SS.hash = NL.file
+	and SS.status in ('installed', 'installing')
+),
 preserve as (
 	select distinct
        	path,username,uid,groupname,gid,mode,filetype,mtime,hash,
 	configuration,target,device, null as ohash
 	from syncstatus SS
-	where path in (select library from needed)
-	and SS.rstatus in ('removing', 'removed')
+	join needed N on SS.hash = N.libraryhash
+	where SS.rstatus in ('removing', 'removed')
+--	where SS.hash in (select libraryhash from needed)
+--	where path in (select library from needed)
+--	and SS.rstatus in ('removing', 'removed')
 ),
 -- remove: cur, not preserved, not in final set
 remove as (