Bläddra i källkod

Feature version bump should use UPDATE instead of INSERT.

Neal Wilson 11 år sedan
förälder
incheckning
791a1d99d8
1 ändrade filer med 2 tillägg och 2 borttagningar
  1. 2
    2
      config/Windows/navigation.xml

+ 2
- 2
config/Windows/navigation.xml Visa fil

@@ -259,7 +259,7 @@ type="push" />
259 259
 			var query = new QSqlQuery;
260 260
 			query.exec("ALTER TABLE transactions ADD COLUMN person text DEFAULT NULL");
261 261
 			query.exec("ALTER TABLE roasting_log ADD COLUMN person text DEFAULT NULL");
262
-			query.exec("CREATE FUNCTION log_session_user() RETURNS trigger AS $$ BEGIN NEW.person := session_name; RETURN NEW; END; $$ LANGUAGE plpgsql");
262
+			query.exec("CREATE OR REPLACE FUNCTION log_session_user() RETURNS trigger AS $$ BEGIN NEW.person := session_name; RETURN NEW; END; $$ LANGUAGE plpgsql");
263 263
 			query.exec("CREATE TRIGGER log_person BEFORE INSERT ON inventory FOR EACH ROW EXECUTE PROCEDURE log_session_user()");
264 264
 			query.exec("CREATE TRIGGER log_person BEFORE INSERT ON loss FOR EACH ROW EXECUTE PROCEDURE log_session_user()");
265 265
 			query.exec("CREATE TRIGGER log_person BEFORE INSERT ON make FOR EACH ROW EXECUTE PROCEDURE log_session_user()");
@@ -267,7 +267,7 @@ type="push" />
267 267
 			query.exec("CREATE TRIGGER log_person BEFORE INSERT ON sale FOR EACH ROW EXECUTE PROCEDURE log_session_user()");
268 268
 			query.exec("CREATE TRIGGER log_person BEFORE INSERT ON use FOR EACH ROW EXECUTE PROCEDURE log_session_user()");
269 269
 			query.exec("CREATE TRIGGER log_person BEFORE INSERT ON roasting_log FOR EACH ROW EXECUTE PROCEDURE log_session_user()");
270
-			query.exec("INSERT INTO TypicaFeatures VALUES('base-features', TRUE, 2)");
270
+			query.exec("UPDATE TypicaFeatures SET version = 2 WHERE feature = 'base-features'");
271 271
 			query = query.invalidate();
272 272
 		};
273 273
 		

Laddar…
Avbryt
Spara