Fix makedb bug introduced in 19ae6e4a
This commit is contained in:
parent
a1d0c7fd97
commit
5325d064da
2 changed files with 9 additions and 8 deletions
|
@ -6,10 +6,7 @@ import tools
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
def makeDB(path=tools.config.dbpath):
|
def makeDB(path=tools.config.dbpath):
|
||||||
if tools.fileExists(path):
|
db = tools.dbHelper(path, create = True)
|
||||||
raise IOError(path + " already exists. If you want to recreate it, please delete it first, or provide a different file name.")
|
|
||||||
|
|
||||||
db = tools.dbObject(path)
|
|
||||||
|
|
||||||
db.executeQuery("CREATE TABLE tweets(`tweet_id` INTEGER NOT NULL, `in_reply_to_status_id` TEXT, `in_reply_to_user_id` TEXT, `timestamp` TEXT, `source` TEXT, `text` TEXT, `retweeted_status_id` TEXT, `retweeted_status_user_id` TEXT, `retweeted_status_timestamp` TEXT, `expanded_urls` TEXT, PRIMARY KEY(tweet_id));")
|
db.executeQuery("CREATE TABLE tweets(`tweet_id` INTEGER NOT NULL, `in_reply_to_status_id` TEXT, `in_reply_to_user_id` TEXT, `timestamp` TEXT, `source` TEXT, `text` TEXT, `retweeted_status_id` TEXT, `retweeted_status_user_id` TEXT, `retweeted_status_timestamp` TEXT, `expanded_urls` TEXT, PRIMARY KEY(tweet_id));")
|
||||||
|
|
||||||
|
@ -17,6 +14,8 @@ def makeDB(path=tools.config.dbpath):
|
||||||
db.closeConnection()
|
db.closeConnection()
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
|
if len(sys.argv) > 2:
|
||||||
|
raise ValueError(sys.argv[0] + " only takes one argument, the path of the new database file.")
|
||||||
try:
|
try:
|
||||||
makeDB(sys.argv[1])
|
makeDB(sys.argv[1])
|
||||||
except IndexError:
|
except IndexError:
|
||||||
|
|
10
tools.py
10
tools.py
|
@ -31,15 +31,17 @@ class dbObject:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
|
|
||||||
def dbCheck(db):
|
def dbCheck(db, create = False):
|
||||||
if dbInitialized(db):
|
if (!create and dbInitialized(db)) or (create and !dbInitialized(db)):
|
||||||
return True
|
return True
|
||||||
|
if create:
|
||||||
|
raise ValueError("Provided database file " + path + " is already initialized. Remove it manually before trying to recreate it.")
|
||||||
raise ValueError("Provided database file " + path + " is not initialized. Create it using makedb.py or csvdb.py")
|
raise ValueError("Provided database file " + path + " is not initialized. Create it using makedb.py or csvdb.py")
|
||||||
|
|
||||||
|
|
||||||
def dbHelper(path):
|
def dbHelper(path, create = False):
|
||||||
db = dbObject(path)
|
db = dbObject(path)
|
||||||
dbCheck(db)
|
dbCheck(db, create)
|
||||||
return db
|
return db
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue