From 0ced2308e21d8295fb5de59de16bc56f1a5c00e2 Mon Sep 17 00:00:00 2001 From: INOPIAE Date: Thu, 16 Jun 2016 11:26:15 +0200 Subject: [PATCH] db_update: db changes related to issue #25 in table organisations Change-Id: I1f8ec30d036ea2fb948f9397988f5ef494d85076 --- src/org/cacert/gigi/database/DatabaseConnection.java | 2 +- src/org/cacert/gigi/database/tableStructure.sql | 6 ++++-- src/org/cacert/gigi/database/upgrade/from_12.sql | 4 ++++ 3 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 src/org/cacert/gigi/database/upgrade/from_12.sql diff --git a/src/org/cacert/gigi/database/DatabaseConnection.java b/src/org/cacert/gigi/database/DatabaseConnection.java index a3519798..43b7b748 100644 --- a/src/org/cacert/gigi/database/DatabaseConnection.java +++ b/src/org/cacert/gigi/database/DatabaseConnection.java @@ -122,7 +122,7 @@ public class DatabaseConnection { } - public static final int CURRENT_SCHEMA_VERSION = 12; + public static final int CURRENT_SCHEMA_VERSION = 13; public static final int CONNECTION_TIMEOUT = 24 * 60 * 60; diff --git a/src/org/cacert/gigi/database/tableStructure.sql b/src/org/cacert/gigi/database/tableStructure.sql index ca57e515..8a0727d6 100644 --- a/src/org/cacert/gigi/database/tableStructure.sql +++ b/src/org/cacert/gigi/database/tableStructure.sql @@ -36,12 +36,14 @@ CREATE INDEX ON "users" ("verified"); DROP TABLE IF EXISTS "organisations"; CREATE TABLE IF NOT EXISTS "organisations" ( "id" int NOT NULL, - "name" varchar(100) NOT NULL, + "name" varchar(64) NOT NULL, "state" varchar(2) NOT NULL, "province" varchar(100) NOT NULL, "city" varchar(100) NOT NULL, "contactEmail" varchar(100) NOT NULL, "creator" int NOT NULL, + "optional_name" text, + "postal_address" text, PRIMARY KEY ("id") ); @@ -372,7 +374,7 @@ CREATE TABLE "schemeVersion" ( "version" smallint NOT NULL, PRIMARY KEY ("version") ); -INSERT INTO "schemeVersion" (version) VALUES(11); +INSERT INTO "schemeVersion" (version) VALUES(13); DROP TABLE IF EXISTS `passwordResetTickets`; CREATE TABLE `passwordResetTickets` ( diff --git a/src/org/cacert/gigi/database/upgrade/from_12.sql b/src/org/cacert/gigi/database/upgrade/from_12.sql new file mode 100644 index 00000000..1035e09d --- /dev/null +++ b/src/org/cacert/gigi/database/upgrade/from_12.sql @@ -0,0 +1,4 @@ +ALTER TABLE "organisations" ALTER COLUMN "name" TYPE varchar(64); + +ALTER TABLE "organisations" ADD COLUMN "optional_name" text; +ALTER TABLE "organisations" ADD COLUMN "postal_address" text; -- 2.39.2