Author: jflesch
Date: 2006-12-11 00:26:22 +0000 (Mon, 11 Dec 2006)
New Revision: 11341
Modified:
trunk/apps/Thaw/src/thaw/plugins/SqlConsole.java
trunk/apps/Thaw/src/thaw/plugins/index/DatabaseManager.java
Log:
Fix compilation
Modified: trunk/apps/Thaw/src/thaw/plugins/SqlConsole.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/SqlConsole.java 2006-12-11 00:18:58 UTC
(rev 11340)
+++ trunk/apps/Thaw/src/thaw/plugins/SqlConsole.java 2006-12-11 00:26:22 UTC
(rev 11341)
@@ -15,7 +15,7 @@
import thaw.core.I18n;
import thaw.core.Logger;
import thaw.core.Plugin;
-import thaw.plugins.index.TableCreator;
+import thaw.plugins.index.DatabaseManager;
public class SqlConsole implements Plugin, java.awt.event.ActionListener {
public final static int BUFFER_SIZE = 51200;
@@ -164,17 +164,16 @@
return;
}
} else {
- TableCreator.dropTables(hsqldb);
+ DatabaseManager.dropTables(hsqldb);
addToConsole("Ok\n");
return;
}
-
-
+
if(result == null) {
addToConsole("(null)\n");
return;
}
-
+
if(result.getFetchSize() == 0) {
addToConsole("(done)\n");
return;
Modified: trunk/apps/Thaw/src/thaw/plugins/index/DatabaseManager.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/DatabaseManager.java 2006-12-11
00:18:58 UTC (rev 11340)
+++ trunk/apps/Thaw/src/thaw/plugins/index/DatabaseManager.java 2006-12-11
00:26:22 UTC (rev 11341)
@@ -35,7 +35,7 @@
public static void createTables(final Hsqldb db) {
//sendQuery(db,
// "SET IGNORECASE TRUE");
- TableCreator.sendQuery(db,
+ DatabaseManager.sendQuery(db,
"CREATE CACHED TABLE indexCategories ("
+ "id INTEGER IDENTITY NOT NULL,"
+ "name VARCHAR(255) NOT NULL,"
@@ -45,7 +45,7 @@
+ "PRIMARY KEY (id),"
+ "FOREIGN KEY (parent) REFERENCES indexCategories
(id))");
- TableCreator.sendQuery(db,
+ DatabaseManager.sendQuery(db,
"CREATE CACHED TABLE indexes ("
+ "id INTEGER IDENTITY NOT NULL, "
+ "originalName VARCHAR(255) NOT NULL, "
@@ -59,12 +59,12 @@
+ "PRIMARY KEY (id), "
+ "FOREIGN KEY (parent) REFERENCES indexCategories
(id))");
- TableCreator.sendQuery(db,
+ DatabaseManager.sendQuery(db,
"CREATE CACHED TABLE categories ("
+ "id INTEGER IDENTITY NOT NULL,"
+ "name VARCHAR(255) NOT NULL)");
- TableCreator.sendQuery(db,
+ DatabaseManager.sendQuery(db,
"CREATE CACHED TABLE files ("
+ "id INTEGER IDENTITY NOT NULL,"
+ "filename VARCHAR(255) NOT NULL,"
@@ -78,7 +78,7 @@
+ "FOREIGN KEY (indexParent) REFERENCES indexes (id),"
+ "FOREIGN KEY (category) REFERENCES categories
(id))");
- TableCreator.sendQuery(db,
+ DatabaseManager.sendQuery(db,
"CREATE CACHED TABLE links ("
+ "id INTEGER IDENTITY NOT NULL,"
+ "publicKey VARCHAR(350) NOT NULL," // key ~= 100 +
filename == 255 max
@@ -90,13 +90,13 @@
+ "FOREIGN KEY (indexParent) REFERENCES indexes (id),"
+ "FOREIGN KEY (indexTarget) REFERENCES indexes
(id))");
- TableCreator.sendQuery(db,
+ DatabaseManager.sendQuery(db,
"CREATE CACHED TABLE metadataNames ("
+ "id INTEGER IDENTITY NOT NULL,"
+ "name VARCHAR(255) NOT NULL,"
+ "PRIMARY KEY (id))");
- TableCreator.sendQuery(db,
+ DatabaseManager.sendQuery(db,
"CREATE CACHED TABLE metadatas ("
+ "id INTEGER IDENTITY NOT NULL,"
+ "nameId INTEGER NOT NULL,"
@@ -109,14 +109,14 @@
}
public static void dropTables(final Hsqldb db) {
- TableCreator.sendQuery(db, "DROP TABLE metadatas");
- TableCreator.sendQuery(db, "DROP TABLE metadataNames");
+ DatabaseManager.sendQuery(db, "DROP TABLE metadatas");
+ DatabaseManager.sendQuery(db, "DROP TABLE metadataNames");
- TableCreator.sendQuery(db, "DROP TABLE files");
- TableCreator.sendQuery(db, "DROP TABLE links");
+ DatabaseManager.sendQuery(db, "DROP TABLE files");
+ DatabaseManager.sendQuery(db, "DROP TABLE links");
- TableCreator.sendQuery(db, "DROP TABLE indexes");
- TableCreator.sendQuery(db, "DROP TABLE indexCategories");
+ DatabaseManager.sendQuery(db, "DROP TABLE indexes");
+ DatabaseManager.sendQuery(db, "DROP TABLE indexCategories");
}
@@ -127,7 +127,7 @@
try {
db.executeQuery(query);
} catch(final SQLException e) {
- Logger.notice(new TableCreator(), "While (re)creating
sql tables: "+e.toString());
+ Logger.notice(new DatabaseManager(), "While
(re)creating sql tables: "+e.toString());
}
}
