From e7e678868a3d689d06203db207065364112dcbd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20Mielcarek?= <felix.mielcarek@etu.uca.fr>
Date: Tue, 21 May 2024 18:34:22 +0200
Subject: [PATCH] Adding mariadb table creation

---
 .drone.yml              | 30 +++++++++++++++---------------
 database/db-creation.py | 36 ++++++++----------------------------
 2 files changed, 23 insertions(+), 43 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index e563f2c..62cd67c 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -4,13 +4,13 @@ name: BB_PIPELINE
 
 
 steps:
-  - name: deploy-container-pgsql
+  - name: deploy-container-db
     image: hub.codefirst.iut.uca.fr/thomas.bellembois/codefirst-dockerproxy-clientdrone:latest
     environment:
       IMAGENAME: mariadb:10
       CONTAINERNAME: bigbrotherdb
       COMMAND: create
-      # OVERWRITE: false
+      OVERWRITE: false
       PRIVATE: true
       CODEFIRST_CLIENTDRONE_ENV_MARIADB_ROOT_PASSWORD:
         from_secret: db_root_password
@@ -21,19 +21,19 @@ steps:
       CODEFIRST_CLIENTDRONE_ENV_MARIADB_PASSWORD:
         from_secret: db_password
 
-#  - name: create-bigbrother-database
-#    image: python:latest
-#    commands:
-#      - cd database/
-#      - pip install psycopg2
-#      - python3 db-creation.py
-#    environment:
-#      POSTGRES_USER:
-#        from_secret: db_user
-#      POSTGRES_PASSWORD:
-#        from_secret: db_password
-#    depends_on: [ deploy-container-pgsql ]
-#
+  - name: create-bigbrother-database
+    image: python:latest
+    commands:
+      - cd database/
+      - pip install psycopg2
+      - python3 db-creation.py
+    environment:
+      MARIADB_USER:
+        from_secret: db_user
+      MARIADB_PASSWORD:
+        from_secret: db_password
+    depends_on: [ deploy-container-db ]
+
 #  - name: build-image-server
 #    image: plugins/docker
 #    settings:
diff --git a/database/db-creation.py b/database/db-creation.py
index 2b15d4a..d4b9b4e 100644
--- a/database/db-creation.py
+++ b/database/db-creation.py
@@ -1,8 +1,8 @@
 import os
 import psycopg2
 
-env_user = os.getenv('POSTGRES_USER')
-env_password = os.getenv('POSTGRES_PASSWORD')
+env_user = os.getenv('MARIADB_USER')
+env_password = os.getenv('MARIADB_PASSWORD')
 
 def executeDBQuery(query):
     conn = psycopg2.connect(
@@ -16,34 +16,14 @@ def executeDBQuery(query):
     cur.close()
     conn.close()
 
-create_db_query = '''
-CREATE DATABASE bigbrother;
-'''
-
-create_schema_query = '''
-CREATE SCHEMA IF NOT EXISTS public
-    AUTHORIZATION pg_database_owner;
-
-COMMENT ON SCHEMA public
-    IS 'standard public schema';
-
-GRANT USAGE ON SCHEMA public TO PUBLIC;
-
-GRANT ALL ON SCHEMA public TO pg_database_owner;
-'''
 
 create_table_query = '''
-CREATE TABLE IF NOT EXISTS public.users
-(
-    spotifyid character varying COLLATE pg_catalog."default" NOT NULL,
-    accesstoken character varying COLLATE pg_catalog."default",
-    refreshtoken character varying COLLATE pg_catalog."default",
-    CONSTRAINT users_pkey PRIMARY KEY (spotifyid)
-)
-
-TABLESPACE pg_default;
+CREATE TABLE IF NOT EXISTS users (
+    spotifyid VARCHAR(255) NOT NULL,
+    accesstoken VARCHAR(255),
+    refreshtoken VARCHAR(255),
+    PRIMARY KEY (spotifyid)
+);
 '''
 
-executeDBQuery(create_db_query)
-executeDBQuery(create_schema_query)
 executeDBQuery(create_table_query)
\ No newline at end of file