[pulsar-manager] branch master updated: Fix schema issues on postgresql (#273)

[gu...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

guangning pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar-manager.git


The following commit(s) were added to refs/heads/master by this push:
     new 6f92157  Fix schema issues on postgresql (#273)
6f92157 is described below

commit 6f92157e09ef15bace7d60e389c40d46031fdf28
Author: Yosi Attias <yo...@gmail.com>
AuthorDate: Mon Mar 16 03:59:21 2020 +0200

    Fix schema issues on postgresql (#273)
    
    * Fix schema issues on postgresql
    
    1. Remove "AUTO_INCREMENT" no such thing in postgresql
    2. Role-binding change primary key to be `BIGSERIAL` and not `BIGINT` so it will be auto-incremented
    
    https://github.com/apache/pulsar-manager/issues/272
    
    * Allow null access token
    
    When creating a user, it doesn't have an access token.
---
 src/main/resources/META-INF/sql/postgresql-schema.sql | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/resources/META-INF/sql/postgresql-schema.sql b/src/main/resources/META-INF/sql/postgresql-schema.sql
index 8dcaa33..343cf96 100644
--- a/src/main/resources/META-INF/sql/postgresql-schema.sql
+++ b/src/main/resources/META-INF/sql/postgresql-schema.sql
@@ -125,8 +125,8 @@ CREATE TABLE IF NOT EXISTS tokens (
 );
 
 CREATE TABLE IF NOT EXISTS users (
-  user_id BIGSERIAL PRIMARY KEY AUTO_INCREMENT,
-  access_token varchar(256) NOT NULL,
+  user_id BIGSERIAL PRIMARY KEY,
+  access_token varchar(256),
   name varchar(256) NOT NULL,
   description varchar(128),
   email varchar(256),
@@ -139,7 +139,7 @@ CREATE TABLE IF NOT EXISTS users (
 );
 
 CREATE TABLE IF NOT EXISTS roles (
-  role_id BIGSERIAL PRIMARY KEY AUTO_INCREMENT,
+  role_id BIGSERIAL PRIMARY KEY,
   role_name varchar(256) NOT NULL,
   role_source varchar(256) NOT NULL,
   description varchar(128),
@@ -151,7 +151,7 @@ CREATE TABLE IF NOT EXISTS roles (
 );
 
 CREATE TABLE IF NOT EXISTS tenants (
-  tenant_id BIGSERIAL PRIMARY KEY AUTO_INCREMENT,
+  tenant_id BIGSERIAL PRIMARY KEY,
   tenant varchar(255) NOT NULL,
   admin_roles varchar(255),
   allowed_clusters varchar(255),
@@ -160,16 +160,16 @@ CREATE TABLE IF NOT EXISTS tenants (
 );
 
 CREATE TABLE IF NOT EXISTS namespaces (
-  namespace_id BIGSERIAL PRIMARY KEY AUTO_INCREMENT,
+  namespace_id BIGSERIAL PRIMARY KEY,
   tenant varchar(255) NOT NULL,
   namespace varchar(255) NOT NULL,
   UNIQUE(tenant, namespace)
 );
 
 CREATE TABLE IF NOT EXISTS role_binding(
-  role_binding_id BIGINT PRIMARY KEY AUTO_INCREMENT,
+  role_binding_id BIGSERIAL PRIMARY KEY,
   name varchar(256) NOT NULL,
   description varchar(256),
   role_id BIGINT NOT NULL,
   user_id BIGINT NOT NULL
-);
\ No newline at end of file
+);