From 6dfc0fb76722bcdf7e97211778d2e0d4b65efc88 Mon Sep 17 00:00:00 2001 From: clockvoid Date: Sun, 16 Sep 2018 15:17:50 +0900 Subject: [PATCH 01/13] empty commit From 03bc056e97e22a58c07cf3954f42438e426b4e40 Mon Sep 17 00:00:00 2001 From: yaya1026 Date: Sun, 16 Sep 2018 15:25:51 +0900 Subject: [PATCH 02/13] =?UTF-8?q?=E3=83=9E=E3=82=A4=E3=82=B0=E3=83=AC?= =?UTF-8?q?=E3=83=BC=E3=82=B7=E3=83=A7=E3=83=B3=E3=83=95=E3=82=A1=E3=82=A4?= =?UTF-8?q?=E3=83=AB=E4=BD=9C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modeling/db/migrations/20180916062355-create_user.sql | 4 ++++ modeling/db/migrations/20180916062416-create_vegetables.sql | 4 ++++ .../db/migrations/20180916062433-create_order_history.sql | 4 ++++ 3 files changed, 12 insertions(+) create mode 100644 modeling/db/migrations/20180916062355-create_user.sql create mode 100644 modeling/db/migrations/20180916062416-create_vegetables.sql create mode 100644 modeling/db/migrations/20180916062433-create_order_history.sql diff --git a/modeling/db/migrations/20180916062355-create_user.sql b/modeling/db/migrations/20180916062355-create_user.sql new file mode 100644 index 0000000..22185e3 --- /dev/null +++ b/modeling/db/migrations/20180916062355-create_user.sql @@ -0,0 +1,4 @@ + +-- +migrate Up + +-- +migrate Down diff --git a/modeling/db/migrations/20180916062416-create_vegetables.sql b/modeling/db/migrations/20180916062416-create_vegetables.sql new file mode 100644 index 0000000..22185e3 --- /dev/null +++ b/modeling/db/migrations/20180916062416-create_vegetables.sql @@ -0,0 +1,4 @@ + +-- +migrate Up + +-- +migrate Down diff --git a/modeling/db/migrations/20180916062433-create_order_history.sql b/modeling/db/migrations/20180916062433-create_order_history.sql new file mode 100644 index 0000000..22185e3 --- /dev/null +++ b/modeling/db/migrations/20180916062433-create_order_history.sql @@ -0,0 +1,4 @@ + +-- +migrate Up + +-- +migrate Down From ed14e5121ded0476821d8cc59119a2bcb91f1f77 Mon Sep 17 00:00:00 2001 From: yaya1026 Date: Sun, 16 Sep 2018 15:30:06 +0900 Subject: [PATCH 03/13] =?UTF-8?q?create=5Fuser=E3=81=AE=E3=83=9E=E3=82=A4?= =?UTF-8?q?=E3=82=B0=E3=83=AC=E3=83=BC=E3=82=B7=E3=83=A7=E3=83=B3=E3=83=95?= =?UTF-8?q?=E3=82=A1=E3=82=A4=E3=83=AB=E3=82=92=E4=BD=9C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modeling/db/migrations/20180916062355-create_user.sql | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modeling/db/migrations/20180916062355-create_user.sql b/modeling/db/migrations/20180916062355-create_user.sql index 22185e3..13f0e45 100644 --- a/modeling/db/migrations/20180916062355-create_user.sql +++ b/modeling/db/migrations/20180916062355-create_user.sql @@ -1,4 +1,10 @@ -- +migrate Up +CREATE TABLE users ( + id INT NOT NULL AUTO_INCREMENT, + name VARCHAR(255) NOT NULL, + PRIMARY KEY(id) +); -- +migrate Down +DROP TABLE users; From 950d0725553c94b9937e23932a787bb823178dbb Mon Sep 17 00:00:00 2001 From: clockvoid Date: Sun, 16 Sep 2018 15:31:35 +0900 Subject: [PATCH 04/13] add: create_vegetables --- modeling/.python-version | 1 + .../db/migrations/20180916062416-create_vegetables.sql | 7 +++++++ 2 files changed, 8 insertions(+) create mode 100644 modeling/.python-version diff --git a/modeling/.python-version b/modeling/.python-version new file mode 100644 index 0000000..bec3a35 --- /dev/null +++ b/modeling/.python-version @@ -0,0 +1 @@ +system diff --git a/modeling/db/migrations/20180916062416-create_vegetables.sql b/modeling/db/migrations/20180916062416-create_vegetables.sql index 22185e3..da93c50 100644 --- a/modeling/db/migrations/20180916062416-create_vegetables.sql +++ b/modeling/db/migrations/20180916062416-create_vegetables.sql @@ -1,4 +1,11 @@ -- +migrate Up +CREATE TABLE vegetables ( + id INT NOT NULL AUTO_INCREMENT, + name VARCHAR(255) NOT NULL, + point INT NOT NULL, + PRIMARY KEY(id) +); -- +migrate Down +DROP TABLE vegetables; From 60a02be3e4c78044f170ba959e0550fdfc1919d1 Mon Sep 17 00:00:00 2001 From: yutsukimiyashita Date: Sun, 16 Sep 2018 15:38:06 +0900 Subject: [PATCH 05/13] history --- .../migrations/20180916062433-create_order_history.sql | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/modeling/db/migrations/20180916062433-create_order_history.sql b/modeling/db/migrations/20180916062433-create_order_history.sql index 22185e3..03d76fe 100644 --- a/modeling/db/migrations/20180916062433-create_order_history.sql +++ b/modeling/db/migrations/20180916062433-create_order_history.sql @@ -1,4 +1,14 @@ -- +migrate Up +CREATE TABLE order_history ( + id INT NOT NULL AUTO_INCREMENT, + user_id INT NOT NULL, + vegetable_id INT NOT NULL, + date DATE DEFAULT CURRENT_DATE ON UPDATE CURRENT_DATE, + PRIMARY KEY(id), + FOREIGN KEY(user_id) REFERENCES users(id), + FOREIGN KEY(vegetable_id) REFERENCES vegetables(id) +); + -- +migrate Down From 4d4b01a8ab07080833f921019ae978d2535dd0a4 Mon Sep 17 00:00:00 2001 From: yutsukimiyashita Date: Sun, 16 Sep 2018 15:49:12 +0900 Subject: [PATCH 06/13] date change --- .../db/migrations/20180916062433-create_order_history.sql | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modeling/db/migrations/20180916062433-create_order_history.sql b/modeling/db/migrations/20180916062433-create_order_history.sql index 03d76fe..912e39f 100644 --- a/modeling/db/migrations/20180916062433-create_order_history.sql +++ b/modeling/db/migrations/20180916062433-create_order_history.sql @@ -4,11 +4,14 @@ CREATE TABLE order_history ( id INT NOT NULL AUTO_INCREMENT, user_id INT NOT NULL, vegetable_id INT NOT NULL, - date DATE DEFAULT CURRENT_DATE ON UPDATE CURRENT_DATE, + `date` DATE NOT NULL, PRIMARY KEY(id), FOREIGN KEY(user_id) REFERENCES users(id), FOREIGN KEY(vegetable_id) REFERENCES vegetables(id) ); + + -- +migrate Down +DROP TABLE order_history; \ No newline at end of file From 423dba622c22b596c709bd3984f3f1a27a406e3f Mon Sep 17 00:00:00 2001 From: yaya1026 Date: Sun, 16 Sep 2018 16:42:51 +0900 Subject: [PATCH 07/13] =?UTF-8?q?=E3=83=9E=E3=82=A4=E3=82=B0=E3=83=AC?= =?UTF-8?q?=E3=83=BC=E3=82=B7=E3=83=A7=E3=83=B3=E3=83=95=E3=82=A1=E3=82=A4?= =?UTF-8?q?=E3=83=AB=E4=BD=9C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migrations/20180916062433-create_order_history.sql | 2 -- modeling/db/migrations/20180916074217-create_pex.sql | 4 ++++ .../db/migrations/20180916074229-create_point_exchange.sql | 4 ++++ .../db/migrations/20180916074243-create_external_service.sql | 4 ++++ 4 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 modeling/db/migrations/20180916074217-create_pex.sql create mode 100644 modeling/db/migrations/20180916074229-create_point_exchange.sql create mode 100644 modeling/db/migrations/20180916074243-create_external_service.sql diff --git a/modeling/db/migrations/20180916062433-create_order_history.sql b/modeling/db/migrations/20180916062433-create_order_history.sql index 912e39f..5f66fb8 100644 --- a/modeling/db/migrations/20180916062433-create_order_history.sql +++ b/modeling/db/migrations/20180916062433-create_order_history.sql @@ -11,7 +11,5 @@ CREATE TABLE order_history ( ); - - -- +migrate Down DROP TABLE order_history; \ No newline at end of file diff --git a/modeling/db/migrations/20180916074217-create_pex.sql b/modeling/db/migrations/20180916074217-create_pex.sql new file mode 100644 index 0000000..22185e3 --- /dev/null +++ b/modeling/db/migrations/20180916074217-create_pex.sql @@ -0,0 +1,4 @@ + +-- +migrate Up + +-- +migrate Down diff --git a/modeling/db/migrations/20180916074229-create_point_exchange.sql b/modeling/db/migrations/20180916074229-create_point_exchange.sql new file mode 100644 index 0000000..22185e3 --- /dev/null +++ b/modeling/db/migrations/20180916074229-create_point_exchange.sql @@ -0,0 +1,4 @@ + +-- +migrate Up + +-- +migrate Down diff --git a/modeling/db/migrations/20180916074243-create_external_service.sql b/modeling/db/migrations/20180916074243-create_external_service.sql new file mode 100644 index 0000000..22185e3 --- /dev/null +++ b/modeling/db/migrations/20180916074243-create_external_service.sql @@ -0,0 +1,4 @@ + +-- +migrate Up + +-- +migrate Down From 10e2a66285328536222db473e3bf570ac9f8c831 Mon Sep 17 00:00:00 2001 From: yaya1026 Date: Sun, 16 Sep 2018 16:47:56 +0900 Subject: [PATCH 08/13] =?UTF-8?q?=E5=A4=96=E9=83=A8=E3=82=B5=E3=83=BC?= =?UTF-8?q?=E3=83=93=E3=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../migrations/20180916074243-create_external_service.sql | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modeling/db/migrations/20180916074243-create_external_service.sql b/modeling/db/migrations/20180916074243-create_external_service.sql index 22185e3..f8771de 100644 --- a/modeling/db/migrations/20180916074243-create_external_service.sql +++ b/modeling/db/migrations/20180916074243-create_external_service.sql @@ -1,4 +1,10 @@ -- +migrate Up +CREATE TABLE external_service ( + id INT NOT NULL AUTO_INCREMENT, + name VARCHAR(25) NOT NULL, + PRIMARY KEY(id) +); -- +migrate Down +DROP TABLE external_service; From 211d560c1804f7ecbeacb9a1e63fb7f80b2cf140 Mon Sep 17 00:00:00 2001 From: yutsukimiyashita Date: Sun, 16 Sep 2018 16:52:32 +0900 Subject: [PATCH 09/13] [add] pex table --- modeling/db/migrations/20180916074217-create_pex.sql | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/modeling/db/migrations/20180916074217-create_pex.sql b/modeling/db/migrations/20180916074217-create_pex.sql index 22185e3..246ef3b 100644 --- a/modeling/db/migrations/20180916074217-create_pex.sql +++ b/modeling/db/migrations/20180916074217-create_pex.sql @@ -1,4 +1,11 @@ - -- +migrate Up +CREATE TABLE pex ( + pex_id VARCHAR(255) NOT NULL, + user_id INT NOT NULL, + PRIMARY KEY(pex_id), + FOREIGN KEY(user_id) REFERENCES users(id), +); -- +migrate Down +DROP TABLE pex; +; \ No newline at end of file From 621e52ffcd48786c58979fea8f0ef61982aaff8b Mon Sep 17 00:00:00 2001 From: yutsukimiyashita Date: Sun, 16 Sep 2018 16:53:47 +0900 Subject: [PATCH 10/13] [fix] pex --- modeling/db/migrations/20180916074217-create_pex.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modeling/db/migrations/20180916074217-create_pex.sql b/modeling/db/migrations/20180916074217-create_pex.sql index 246ef3b..5ca83f8 100644 --- a/modeling/db/migrations/20180916074217-create_pex.sql +++ b/modeling/db/migrations/20180916074217-create_pex.sql @@ -3,7 +3,7 @@ CREATE TABLE pex ( pex_id VARCHAR(255) NOT NULL, user_id INT NOT NULL, PRIMARY KEY(pex_id), - FOREIGN KEY(user_id) REFERENCES users(id), + FOREIGN KEY(user_id) REFERENCES users(id) ); -- +migrate Down From 61e7b15084757547d4180be63f59e56974323037 Mon Sep 17 00:00:00 2001 From: clockvoid Date: Sun, 16 Sep 2018 16:56:17 +0900 Subject: [PATCH 11/13] add: create_exchange_point --- ...sql => 20180916074220-create_external_service.sql} | 0 .../20180916074229-create_point_exchange.sql | 11 +++++++++++ 2 files changed, 11 insertions(+) rename modeling/db/migrations/{20180916074243-create_external_service.sql => 20180916074220-create_external_service.sql} (100%) diff --git a/modeling/db/migrations/20180916074243-create_external_service.sql b/modeling/db/migrations/20180916074220-create_external_service.sql similarity index 100% rename from modeling/db/migrations/20180916074243-create_external_service.sql rename to modeling/db/migrations/20180916074220-create_external_service.sql diff --git a/modeling/db/migrations/20180916074229-create_point_exchange.sql b/modeling/db/migrations/20180916074229-create_point_exchange.sql index 22185e3..ccd0a49 100644 --- a/modeling/db/migrations/20180916074229-create_point_exchange.sql +++ b/modeling/db/migrations/20180916074229-create_point_exchange.sql @@ -1,4 +1,15 @@ -- +migrate Up +CREATE TABLE point_exchange ( + id INT NOT NULL AUTO_INCREMENT, + point INT NOT NULL, + date DATE NOT NULL, + service_id INT NOT NULL, + user_id INT NOT NULL, + PRIMARY KEY(id), + FOREIGN KEY(service_id) REFERENCES external_service(id), + FOREIGN KEY(user_id) REFERENCES users(id) +); -- +migrate Down +DROP TABLE point_exchange; From 8e32bd8df4a85d59fba251ef0b6305f30818e820 Mon Sep 17 00:00:00 2001 From: clockvoid Date: Sun, 16 Sep 2018 17:34:52 +0900 Subject: [PATCH 12/13] add: vegetable_point --- .../db/migrations/20180916083413-create_vegetable_point.sql | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 modeling/db/migrations/20180916083413-create_vegetable_point.sql diff --git a/modeling/db/migrations/20180916083413-create_vegetable_point.sql b/modeling/db/migrations/20180916083413-create_vegetable_point.sql new file mode 100644 index 0000000..22185e3 --- /dev/null +++ b/modeling/db/migrations/20180916083413-create_vegetable_point.sql @@ -0,0 +1,4 @@ + +-- +migrate Up + +-- +migrate Down From 4553bed7cc76607954d83a3df0d092bb2aae3b43 Mon Sep 17 00:00:00 2001 From: clockvoid Date: Sun, 16 Sep 2018 17:41:08 +0900 Subject: [PATCH 13/13] fix: vegetable_point --- .../db/migrations/20180916062416-create_vegetables.sql | 7 +++---- .../20180916083413-create_vegetable_point.sql | 10 ++++++++++ 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/modeling/db/migrations/20180916062416-create_vegetables.sql b/modeling/db/migrations/20180916062416-create_vegetables.sql index da93c50..dbc158a 100644 --- a/modeling/db/migrations/20180916062416-create_vegetables.sql +++ b/modeling/db/migrations/20180916062416-create_vegetables.sql @@ -1,10 +1,9 @@ -- +migrate Up CREATE TABLE vegetables ( - id INT NOT NULL AUTO_INCREMENT, - name VARCHAR(255) NOT NULL, - point INT NOT NULL, - PRIMARY KEY(id) + id INT NOT NULL AUTO_INCREMENT, + name VARCHAR(255) NOT NULL, + PRIMARY KEY(id) ); -- +migrate Down diff --git a/modeling/db/migrations/20180916083413-create_vegetable_point.sql b/modeling/db/migrations/20180916083413-create_vegetable_point.sql index 22185e3..82c7505 100644 --- a/modeling/db/migrations/20180916083413-create_vegetable_point.sql +++ b/modeling/db/migrations/20180916083413-create_vegetable_point.sql @@ -1,4 +1,14 @@ -- +migrate Up +CREATE TABLE vegetable_point ( + id INT NOT NULL AUTO_INCREMENT, + vegetable_id INT NOT NULL, + point INT NOT NULL, + start DATE NOT NULL, + end DATE NOT NULL, + PRIMARY KEY(id), + FOREIGN KEY(vegetable_id) REFERENCES vegetables(id) +); -- +migrate Down +DROP TABLE vegetable_point;