From 7b68c292f53496953e8f4e6e30b05ca94a729efe Mon Sep 17 00:00:00 2001 From: lxnay Date: Mon, 12 May 2008 14:15:10 +0000 Subject: [PATCH] Entropy/etpDatabase: - change dumped sql table creation schema from 'CREATE TABLE' to 'CREATE TABLE IF NOT EXISTS' git-svn-id: http://svn.sabayonlinux.org/projects/entropy/trunk@1928 cd1c1023-2f26-0410-ae45-c471fc1f0318 --- TODO | 1 + libraries/databaseTools.py | 3 +++ libraries/entropy.py | 2 ++ 3 files changed, 6 insertions(+) diff --git a/TODO b/TODO index b61aad703..566dbf55d 100644 --- a/TODO +++ b/TODO @@ -1,4 +1,5 @@ TODO list + - server/client-side: upload/download make.conf and package.* from portage - add i18n support - server-side: improve RDEPEND check output - server-side: add libtest to reagent diff --git a/libraries/databaseTools.py b/libraries/databaseTools.py index d5f50e4bd..bb40f3039 100644 --- a/libraries/databaseTools.py +++ b/libraries/databaseTools.py @@ -3234,6 +3234,9 @@ class etpDatabase: elif name.startswith("sqlite_"): continue else: + t_cmd = "CREATE TABLE" + if sql.startswith(t_cmd): + sql = "CREATE TABLE IF NOT EXISTS"+sql[len(t_cmd):] dumpfile.write("%s;\n" % sql) self.cursor.execute("PRAGMA table_info('%s')" % name) diff --git a/libraries/entropy.py b/libraries/entropy.py index 7004191aa..338b0455e 100644 --- a/libraries/entropy.py +++ b/libraries/entropy.py @@ -5831,6 +5831,8 @@ class RepoInterface: if os.path.isfile(dbfile): os.remove(dbfile) dbconn = self.Entropy.openGenericDatabase(dbfile, xcache = False, indexing_override = False) + #dbconn.initializeDatabase() + #dbconn.createAllIndexes() rc = dbconn.doDatabaseImport(dumpfile, dbfile) dbconn.closeDB() del dbconn