summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2005-11-23 00:09:58 +0000
committerLennart Poettering <lennart@poettering.net>2005-11-23 00:09:58 +0000
commitabc975cbc6e3ca7f6f3f16625013ff34cec223f2 (patch)
treeabbf200a157710897f6b26ca090ebc242d1c2be7
parent0e1c2be3780aa6308185af98ed3d178f1667a9b9 (diff)
fix db design
add support for local configs git-svn-id: file:///home/lennart/svn/public/sse/trunk@25 5fbabb74-0606-0410-a5e4-b5cc6a42724e
-rw-r--r--feed/sse_config.py6
-rw-r--r--sse.sql10
2 files changed, 12 insertions, 4 deletions
diff --git a/feed/sse_config.py b/feed/sse_config.py
index 2dfdbd7..f5f3f45 100644
--- a/feed/sse_config.py
+++ b/feed/sse_config.py
@@ -1,4 +1,3 @@
-
import os
HOME = os.environ["HOME"]
@@ -10,3 +9,8 @@ SSE_DB_HOST = "localhost"
SSE_DB_USER= "sse_web"
SSE_DB_PASSWORD = "ece6Yoli"
SSE_DB_DATABASE = "sse"
+
+try:
+ import sse_config_local
+except:
+ pass
diff --git a/sse.sql b/sse.sql
index 2345053..03117dd 100644
--- a/sse.sql
+++ b/sse.sql
@@ -25,7 +25,7 @@ CREATE TABLE file (
path VARBINARY(255) NOT NULL,
language_id TINYINT UNSIGNED NOT NULL,
- PRIMARY KEY (crawler_id, id),
+ PRIMARY KEY (id, crawler_id),
UNIQUE KEY (crawler_id, package_id, path)
) ENGINE=InnoDB;
@@ -37,7 +37,7 @@ CREATE TABLE package (
timestamp TIMESTAMP NOT NULL,
md CHAR(32) NOT NULL DEFAULT '',
- PRIMARY KEY(crawler_id, id),
+ PRIMARY KEY(id, crawler_id),
UNIQUE KEY (md)
) ENGINE=InnoDB;
@@ -61,7 +61,11 @@ CREATE TABLE crawler (
id TINYINT UNSIGNED NOT NULL,
name VARCHAR(255) NOT NULL,
- url VARBINATY(255) NOT NULL,
+ url VARBINARY(255) NOT NULL,
PRIMARY KEY(id)
) ENGINE=InnoDB;
+
+INSERT INTO crawler (id, name, url) VALUES
+ (1, "Tango", "http://poehlsen.org/sse/"),
+ (2, "Soleil", "http://soleil.ethium.org:8000/sse/");