evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clean up some query stuff

Browse source
This commit is contained in:
Paulus Schoutsen 2016-02-07 10:07:27 -08:00
parent 9ad1d290af
commit cd25c8f72d
1 changed files with 19 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

37
homeassistant/components/recorder.py
View file

@ -285,7 +285,8 @@ class Recorder(threading.Thread):
else: else:
return cur.fetchall() return cur.fetchall()
except sqlite3.IntegrityError: except (sqlite3.IntegrityError, sqlite3.OperationalError,
sqlite3.ProgrammingError):
_LOGGER.exception( _LOGGER.exception(
"Error querying the database using: %s", sql_query) "Error querying the database using: %s", sql_query)
return [] return []
@ -329,7 +330,7 @@ class Recorder(threading.Thread):
migration_id = 0 migration_id = 0
if migration_id < 1: if migration_id < 1:
self.query(""" cur.execute("""
CREATE TABLE recorder_runs ( CREATE TABLE recorder_runs (
run_id integer primary key, run_id integer primary key,
start integer, start integer,
@ -338,7 +339,7 @@ class Recorder(threading.Thread):
created integer) created integer)
""") """)
self.query(""" cur.execute("""
CREATE TABLE events ( CREATE TABLE events (
event_id integer primary key, event_id integer primary key,
event_type text, event_type text,
@ -346,10 +347,10 @@ class Recorder(threading.Thread):
origin text, origin text,
created integer) created integer)
""") """)
self.query( cur.execute(
'CREATE INDEX events__event_type ON events(event_type)') 'CREATE INDEX events__event_type ON events(event_type)')
self.query(""" cur.execute("""
CREATE TABLE states ( CREATE TABLE states (
state_id integer primary key, state_id integer primary key,
entity_id text, entity_id text,
@ -359,51 +360,51 @@ class Recorder(threading.Thread):
last_updated integer, last_updated integer,
created integer) created integer)
""") """)
self.query('CREATE INDEX states__entity_id ON states(entity_id)') cur.execute('CREATE INDEX states__entity_id ON states(entity_id)')
save_migration(1) save_migration(1)
if migration_id < 2: if migration_id < 2:
self.query(""" cur.execute("""
ALTER TABLE events ALTER TABLE events
ADD COLUMN time_fired integer ADD COLUMN time_fired integer
""") """)
self.query('UPDATE events SET time_fired=created') cur.execute('UPDATE events SET time_fired=created')
save_migration(2) save_migration(2)
if migration_id < 3: if migration_id < 3:
utc_offset = self.utc_offset utc_offset = self.utc_offset
self.query(""" cur.execute("""
ALTER TABLE recorder_runs ALTER TABLE recorder_runs
ADD COLUMN utc_offset integer ADD COLUMN utc_offset integer
""") """)
self.query(""" cur.execute("""
ALTER TABLE events ALTER TABLE events
ADD COLUMN utc_offset integer ADD COLUMN utc_offset integer
""") """)
self.query(""" cur.execute("""
ALTER TABLE states ALTER TABLE states
ADD COLUMN utc_offset integer ADD COLUMN utc_offset integer
""") """)
self.query("UPDATE recorder_runs SET utc_offset=?", [utc_offset]) cur.execute("UPDATE recorder_runs SET utc_offset=?", [utc_offset])
self.query("UPDATE events SET utc_offset=?", [utc_offset]) cur.execute("UPDATE events SET utc_offset=?", [utc_offset])
self.query("UPDATE states SET utc_offset=?", [utc_offset]) cur.execute("UPDATE states SET utc_offset=?", [utc_offset])
save_migration(3) save_migration(3)
if migration_id < 4: if migration_id < 4:
# We had a bug where we did not save utc offset for recorder runs # We had a bug where we did not save utc offset for recorder runs
self.query( cur.execute(
"""UPDATE recorder_runs SET utc_offset=? """UPDATE recorder_runs SET utc_offset=?
WHERE utc_offset IS NULL""", [self.utc_offset]) WHERE utc_offset IS NULL""", [self.utc_offset])
self.query(""" cur.execute("""
ALTER TABLE states ALTER TABLE states
ADD COLUMN event_id integer ADD COLUMN event_id integer
""") """)
@ -435,10 +436,10 @@ class Recorder(threading.Thread):
""") """)
# add indexes we are going to use a lot on selects # add indexes we are going to use a lot on selects
self.query(""" cur.execute("""
CREATE INDEX states__state_changes ON CREATE INDEX states__state_changes ON
states (last_changed, last_updated, entity_id)""") states (last_changed, last_updated, entity_id)""")
self.query(""" cur.execute("""
CREATE INDEX states__significant_changes ON CREATE INDEX states__significant_changes ON
states (domain, last_updated, entity_id)""") states (domain, last_updated, entity_id)""")
save_migration(5) save_migration(5)