From 4abec14a2111a5d7d2f32f8edbe769f7a0cc1fdc Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Tue, 5 Sep 2023 11:24:42 +0200 Subject: [PATCH] updates --- apps/api/devTemplates.yaml | 135 ------------------------------------- apps/api/src/lib/common.ts | 2 +- package.json | 2 +- 3 files changed, 2 insertions(+), 137 deletions(-) diff --git a/apps/api/devTemplates.yaml b/apps/api/devTemplates.yaml index 739c0e338..c743db64f 100644 --- a/apps/api/devTemplates.yaml +++ b/apps/api/devTemplates.yaml @@ -3372,141 +3372,6 @@ - POSTGRES_PASSWORD=$$secret_postgres_password - POSTGRES_DB=$$config_postgres_db ports: [] - files: - - location: /docker-entrypoint-initdb.d/schema.postgresql.sql - content: |2- - - -- CreateTable - CREATE TABLE "account" ( - "user_id" SERIAL NOT NULL, - "username" VARCHAR(255) NOT NULL, - "password" VARCHAR(60) NOT NULL, - "is_admin" BOOLEAN NOT NULL DEFAULT false, - "created_at" TIMESTAMPTZ(6) DEFAULT CURRENT_TIMESTAMP, - "updated_at" TIMESTAMPTZ(6) DEFAULT CURRENT_TIMESTAMP, - - PRIMARY KEY ("user_id") - ); - - -- CreateTable - CREATE TABLE "event" ( - "event_id" SERIAL NOT NULL, - "website_id" INTEGER NOT NULL, - "session_id" INTEGER NOT NULL, - "created_at" TIMESTAMPTZ(6) DEFAULT CURRENT_TIMESTAMP, - "url" VARCHAR(500) NOT NULL, - "event_type" VARCHAR(50) NOT NULL, - "event_value" VARCHAR(50) NOT NULL, - - PRIMARY KEY ("event_id") - ); - - -- CreateTable - CREATE TABLE "pageview" ( - "view_id" SERIAL NOT NULL, - "website_id" INTEGER NOT NULL, - "session_id" INTEGER NOT NULL, - "created_at" TIMESTAMPTZ(6) DEFAULT CURRENT_TIMESTAMP, - "url" VARCHAR(500) NOT NULL, - "referrer" VARCHAR(500), - - PRIMARY KEY ("view_id") - ); - - -- CreateTable - CREATE TABLE "session" ( - "session_id" SERIAL NOT NULL, - "session_uuid" UUID NOT NULL, - "website_id" INTEGER NOT NULL, - "created_at" TIMESTAMPTZ(6) DEFAULT CURRENT_TIMESTAMP, - "hostname" VARCHAR(100), - "browser" VARCHAR(20), - "os" VARCHAR(20), - "device" VARCHAR(20), - "screen" VARCHAR(11), - "language" VARCHAR(35), - "country" CHAR(2), - - PRIMARY KEY ("session_id") - ); - - -- CreateTable - CREATE TABLE "website" ( - "website_id" SERIAL NOT NULL, - "website_uuid" UUID NOT NULL, - "user_id" INTEGER NOT NULL, - "name" VARCHAR(100) NOT NULL, - "domain" VARCHAR(500), - "share_id" VARCHAR(64), - "created_at" TIMESTAMPTZ(6) DEFAULT CURRENT_TIMESTAMP, - - PRIMARY KEY ("website_id") - ); - - -- CreateIndex - CREATE UNIQUE INDEX "account.username_unique" ON "account"("username"); - - -- CreateIndex - CREATE INDEX "event_created_at_idx" ON "event"("created_at"); - - -- CreateIndex - CREATE INDEX "event_session_id_idx" ON "event"("session_id"); - - -- CreateIndex - CREATE INDEX "event_website_id_idx" ON "event"("website_id"); - - -- CreateIndex - CREATE INDEX "pageview_created_at_idx" ON "pageview"("created_at"); - - -- CreateIndex - CREATE INDEX "pageview_session_id_idx" ON "pageview"("session_id"); - - -- CreateIndex - CREATE INDEX "pageview_website_id_created_at_idx" ON "pageview"("website_id", "created_at"); - - -- CreateIndex - CREATE INDEX "pageview_website_id_idx" ON "pageview"("website_id"); - - -- CreateIndex - CREATE INDEX "pageview_website_id_session_id_created_at_idx" ON "pageview"("website_id", "session_id", "created_at"); - - -- CreateIndex - CREATE UNIQUE INDEX "session.session_uuid_unique" ON "session"("session_uuid"); - - -- CreateIndex - CREATE INDEX "session_created_at_idx" ON "session"("created_at"); - - -- CreateIndex - CREATE INDEX "session_website_id_idx" ON "session"("website_id"); - - -- CreateIndex - CREATE UNIQUE INDEX "website.website_uuid_unique" ON "website"("website_uuid"); - - -- CreateIndex - CREATE UNIQUE INDEX "website.share_id_unique" ON "website"("share_id"); - - -- CreateIndex - CREATE INDEX "website_user_id_idx" ON "website"("user_id"); - - -- AddForeignKey - ALTER TABLE "event" ADD FOREIGN KEY ("session_id") REFERENCES "session"("session_id") ON DELETE CASCADE ON UPDATE CASCADE; - - -- AddForeignKey - ALTER TABLE "event" ADD FOREIGN KEY ("website_id") REFERENCES "website"("website_id") ON DELETE CASCADE ON UPDATE CASCADE; - - -- AddForeignKey - ALTER TABLE "pageview" ADD FOREIGN KEY ("session_id") REFERENCES "session"("session_id") ON DELETE CASCADE ON UPDATE CASCADE; - - -- AddForeignKey - ALTER TABLE "pageview" ADD FOREIGN KEY ("website_id") REFERENCES "website"("website_id") ON DELETE CASCADE ON UPDATE CASCADE; - - -- AddForeignKey - ALTER TABLE "session" ADD FOREIGN KEY ("website_id") REFERENCES "website"("website_id") ON DELETE CASCADE ON UPDATE CASCADE; - - -- AddForeignKey - ALTER TABLE "website" ADD FOREIGN KEY ("user_id") REFERENCES "account"("user_id") ON DELETE CASCADE ON UPDATE CASCADE; - - insert into account (username, password, is_admin) values ('admin', '$$hashed$$secret_admin_password', true); variables: - id: $$secret_database_url name: DATABASE_URL diff --git a/apps/api/src/lib/common.ts b/apps/api/src/lib/common.ts index d102c3ee5..9585a6453 100644 --- a/apps/api/src/lib/common.ts +++ b/apps/api/src/lib/common.ts @@ -18,7 +18,7 @@ import { scheduler } from './scheduler'; import type { ExecaChildProcess } from 'execa'; import { FastifyReply } from 'fastify'; -export const version = '3.12.38'; +export const version = '3.12.39'; export const isDev = process.env.NODE_ENV === 'development'; export const proxyPort = process.env.COOLIFY_PROXY_PORT; export const proxySecurePort = process.env.COOLIFY_PROXY_SECURE_PORT; diff --git a/package.json b/package.json index 4a1936d74..60b504c68 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "coolify", "description": "An open-source & self-hostable Heroku / Netlify alternative.", - "version": "3.12.38", + "version": "3.12.39", "license": "Apache-2.0", "repository": "github:coollabsio/coolify", "scripts": {