PHP unit tests updates for class changes

add more info in parameters flag

4dev/database/function/edit_access_set_uid.sql

@@ -3,26 +3,26 @@
 CREATE OR REPLACE FUNCTION set_edit_access_uid() RETURNS TRIGGER AS
 $$
 DECLARE
-	myrec RECORD;
+    myrec RECORD;
-	v_uid VARCHAR;
+    v_uid VARCHAR;
 BEGIN
-	-- skip if NEW.name is not set
+    -- skip if NEW.name is not set
-	IF NEW.name IS NOT NULL AND NEW.name <> '' THEN
+    IF NEW.name IS NOT NULL AND NEW.name <> '' THEN
-		-- use NEW.name as base, remove all spaces
+        -- use NEW.name as base, remove all spaces
-		-- name data is already unique, so we do not need to worry about this here
+        -- name data is already unique, so we do not need to worry about this here
-		v_uid := REPLACE(NEW.name, ' ', '');
+        v_uid := REPLACE(NEW.name, ' ', '');
-		IF TG_OP = 'INSERT' THEN
+        IF TG_OP = 'INSERT' THEN
-			-- always set
+            -- always set
-			NEW.uid := v_uid;
+            NEW.uid := v_uid;
-		ELSIF TG_OP = 'UPDATE' THEN
+        ELSIF TG_OP = 'UPDATE' THEN
-			-- check if not set, then set
+            -- check if not set, then set
-			SELECT INTO myrec t.* FROM edit_access t WHERE edit_access_id = NEW.edit_access_id;
+            SELECT INTO myrec t.* FROM edit_access t WHERE edit_access_id = NEW.edit_access_id;
-			IF FOUND THEN
+            IF FOUND THEN
-				NEW.uid := v_uid;
+                NEW.uid := v_uid;
-			END IF;
+            END IF;
-		END IF;
+        END IF;
-	END IF;
+    END IF;
-	RETURN NEW;
+    RETURN NEW;
 END;
 $$
 LANGUAGE 'plpgsql';

4dev/database/function/edit_group_set_uid.sql

@@ -3,26 +3,26 @@
 CREATE OR REPLACE FUNCTION set_edit_group_uid() RETURNS TRIGGER AS
 $$
 DECLARE
-	myrec RECORD;
+    myrec RECORD;
-	v_uid VARCHAR;
+    v_uid VARCHAR;
 BEGIN
-	-- skip if NEW.name is not set
+    -- skip if NEW.name is not set
-	IF NEW.name IS NOT NULL AND NEW.name <> '' THEN
+    IF NEW.name IS NOT NULL AND NEW.name <> '' THEN
-		-- use NEW.name as base, remove all spaces
+        -- use NEW.name as base, remove all spaces
-		-- name data is already unique, so we do not need to worry about this here
+        -- name data is already unique, so we do not need to worry about this here
-		v_uid := REPLACE(NEW.name, ' ', '');
+        v_uid := REPLACE(NEW.name, ' ', '');
-		IF TG_OP = 'INSERT' THEN
+        IF TG_OP = 'INSERT' THEN
-			-- always set
+            -- always set
-			NEW.uid := v_uid;
+            NEW.uid := v_uid;
-		ELSIF TG_OP = 'UPDATE' THEN
+        ELSIF TG_OP = 'UPDATE' THEN
-			-- check if not set, then set
+            -- check if not set, then set
-			SELECT INTO myrec t.* FROM edit_group t WHERE edit_group_id = NEW.edit_group_id;
+            SELECT INTO myrec t.* FROM edit_group t WHERE edit_group_id = NEW.edit_group_id;
-			IF FOUND THEN
+            IF FOUND THEN
-				NEW.uid := v_uid;
+                NEW.uid := v_uid;
-			END IF;
+            END IF;
-		END IF;
+        END IF;
-	END IF;
+    END IF;
-	RETURN NEW;
+    RETURN NEW;
 END;
 $$
 LANGUAGE 'plpgsql';

4dev/database/function/edit_log_partition_insert.sql

@@ -9,142 +9,142 @@ CREATE OR REPLACE FUNCTION edit_log_insert_trigger ()
 RETURNS TRIGGER AS
 $$
 DECLARE
-	start_date DATE := '2010-01-01';
+    start_date DATE := '2010-01-01';
-	end_date DATE;
+    end_date DATE;
-	timeformat TEXT := 'YYYY';
+    timeformat TEXT := 'YYYY';
-	selector TEXT := 'year';
+    selector TEXT := 'year';
-	base_table TEXT := 'edit_log';
+    base_table TEXT := 'edit_log';
-	_interval INTERVAL := '1 ' || selector;
+    _interval INTERVAL := '1 ' || selector;
-	_interval_next INTERVAL := '2 ' || selector;
+    _interval_next INTERVAL := '2 ' || selector;
-	table_name TEXT;
+    table_name TEXT;
-	-- compare date column
+    -- compare date column
-	compare_date DATE := NEW.event_date;
+    compare_date DATE := NEW.event_date;
-	compare_date_name TEXT := 'event_date';
+    compare_date_name TEXT := 'event_date';
-	-- the create commands
+    -- the create commands
-	command_create_table TEXT := 'CREATE TABLE IF NOT EXISTS {TABLE_NAME} (CHECK({COMPARE_DATE_NAME} >= {START_DATE} AND {COMPARE_DATE_NAME} < {END_DATE})) INHERITS ({BASE_NAME})';
+    command_create_table TEXT := 'CREATE TABLE IF NOT EXISTS {TABLE_NAME} (CHECK({COMPARE_DATE_NAME} >= {START_DATE} AND {COMPARE_DATE_NAME} < {END_DATE})) INHERITS ({BASE_NAME})';
-	command_create_primary_key TEXT := 'ALTER TABLE {TABLE_NAME} ADD PRIMARY KEY ({BASE_TABLE}_id)';
+    command_create_primary_key TEXT := 'ALTER TABLE {TABLE_NAME} ADD PRIMARY KEY ({BASE_TABLE}_id)';
-	command_create_foreign_key_1 TEXT := 'ALTER TABLE {TABLE_NAME} ADD CONSTRAINT {TABLE_NAME}_euid_fkey FOREIGN KEY (euid) REFERENCES edit_user (edit_user_id) MATCH FULL ON UPDATE CASCADE ON DELETE SET NULL';
+    command_create_foreign_key_1 TEXT := 'ALTER TABLE {TABLE_NAME} ADD CONSTRAINT {TABLE_NAME}_euid_fkey FOREIGN KEY (euid) REFERENCES edit_user (edit_user_id) MATCH FULL ON UPDATE CASCADE ON DELETE SET NULL';
-	command_create_trigger_1 TEXT = 'CREATE TRIGGER trg_{TABLE_NAME} BEFORE INSERT OR UPDATE ON {TABLE_NAME} FOR EACH ROW EXECUTE PROCEDURE set_edit_generic()';
+    command_create_trigger_1 TEXT = 'CREATE TRIGGER trg_{TABLE_NAME} BEFORE INSERT OR UPDATE ON {TABLE_NAME} FOR EACH ROW EXECUTE PROCEDURE set_edit_generic()';
 BEGIN
-	-- we are in valid start time area
+    -- we are in valid start time area
-	IF (NEW.event_date >= start_date) THEN
+    IF (NEW.event_date >= start_date) THEN
-		-- current table name
+        -- current table name
-		table_name := base_table || '_' || to_char(NEW.event_date, timeformat);
+        table_name := base_table || '_' || to_char(NEW.event_date, timeformat);
-		BEGIN
+        BEGIN
-			EXECUTE 'INSERT INTO ' || quote_ident(table_name) || ' SELECT ($1).*' USING NEW;
+            EXECUTE 'INSERT INTO ' || quote_ident(table_name) || ' SELECT ($1).*' USING NEW;
-		-- if insert failed because of missing table, create new below
+        -- if insert failed because of missing table, create new below
-		EXCEPTION
+        EXCEPTION
-		WHEN undefined_table THEN
+        WHEN undefined_table THEN
-			-- another block, so in case the creation fails here too
+            -- another block, so in case the creation fails here too
-			BEGIN
+            BEGIN
-				-- create new table here + all indexes
+                -- create new table here + all indexes
-				start_date := date_trunc(selector, NEW.event_date);
+                start_date := date_trunc(selector, NEW.event_date);
-				end_date := date_trunc(selector, NEW.event_date + _interval);
+                end_date := date_trunc(selector, NEW.event_date + _interval);
-				-- creat table
+                -- creat table
-				EXECUTE format(REPLACE( -- end date
+                EXECUTE format(REPLACE( -- end date
-					REPLACE( -- start date
+                    REPLACE( -- start date
-						REPLACE( -- compare date name
+                        REPLACE( -- compare date name
-							REPLACE( -- base name (inherit)
+                            REPLACE( -- base name (inherit)
-								REPLACE( -- table name
+                                REPLACE( -- table name
-									command_create_table,
+                                    command_create_table,
-									'{TABLE_NAME}',
+                                    '{TABLE_NAME}',
-									table_name
+                                    table_name
-								),
+                                ),
-								'{BASE_NAME}',
+                                '{BASE_NAME}',
-								base_table
+                                base_table
-							),
+                            ),
-							'{COMPARE_DATE_NAME}',
+                            '{COMPARE_DATE_NAME}',
-							compare_date_name
+                            compare_date_name
-						),
+                        ),
-						'{START_DATE}',
+                        '{START_DATE}',
-						quote_literal(start_date)
+                        quote_literal(start_date)
-					),
+                    ),
-					'{END_DATE}',
+                    '{END_DATE}',
-					quote_literal(end_date)
+                    quote_literal(end_date)
-				));
+                ));
-				-- create all indexes and triggers
+                -- create all indexes and triggers
-				EXECUTE format(REPLACE(
+                EXECUTE format(REPLACE(
-					REPLACE(
+                    REPLACE(
-						command_create_primary_key,
+                        command_create_primary_key,
-						'{TABLE_NAME}',
+                        '{TABLE_NAME}',
-						table_name
+                        table_name
-					),
+                    ),
-					'{BASE_TABLE}',
+                    '{BASE_TABLE}',
-					base_table
+                    base_table
-				));
+                ));
-				-- FK constraints
+                -- FK constraints
-				EXECUTE format(REPLACE(command_create_foreign_key_1, '{TABLE_NAME}', table_name));
+                EXECUTE format(REPLACE(command_create_foreign_key_1, '{TABLE_NAME}', table_name));
-				-- generic trigger
+                -- generic trigger
-				EXECUTE format(REPLACE(command_create_trigger_1, '{TABLE_NAME}', table_name));
+                EXECUTE format(REPLACE(command_create_trigger_1, '{TABLE_NAME}', table_name));
 
-				-- insert try again
+                -- insert try again
-				EXECUTE 'INSERT INTO ' || quote_ident(table_name) || ' SELECT ($1).*' USING NEW;
+                EXECUTE 'INSERT INTO ' || quote_ident(table_name) || ' SELECT ($1).*' USING NEW;
-			EXCEPTION
+            EXCEPTION
-			WHEN OTHERS THEN
+            WHEN OTHERS THEN
-				-- if this faled, throw it into the overflow table (so we don't loose anything)
+                -- if this faled, throw it into the overflow table (so we don't loose anything)
-				INSERT INTO edit_log_overflow VALUES (NEW.*);
+                INSERT INTO edit_log_overflow VALUES (NEW.*);
-			END;
+            END;
-		-- other errors, insert into overlow
+        -- other errors, insert into overlow
-		WHEN OTHERS THEN
+        WHEN OTHERS THEN
-			-- if this faled, throw it into the overflow table (so we don't loose anything)
+            -- if this faled, throw it into the overflow table (so we don't loose anything)
-			INSERT INTO edit_log_overflow VALUES (NEW.*);
+            INSERT INTO edit_log_overflow VALUES (NEW.*);
-		END;
+        END;
-		-- main insert run done, check if we have to create next months table
+        -- main insert run done, check if we have to create next months table
-		BEGIN
+        BEGIN
-			-- check if next month table exists
+            -- check if next month table exists
-			table_name := base_table || '_' || to_char((SELECT NEW.event_date + _interval)::DATE, timeformat);
+            table_name := base_table || '_' || to_char((SELECT NEW.event_date + _interval)::DATE, timeformat);
-			-- RAISE NOTICE 'SEARCH NEXT: %', table_name;
+            -- RAISE NOTICE 'SEARCH NEXT: %', table_name;
-			IF  (SELECT to_regclass(table_name)) IS NULL THEN
+            IF  (SELECT to_regclass(table_name)) IS NULL THEN
-				-- move inner interval same
+                -- move inner interval same
-				start_date := date_trunc(selector, NEW.event_date + _interval);
+                start_date := date_trunc(selector, NEW.event_date + _interval);
-				end_date := date_trunc(selector, NEW.event_date + _interval_next);
+                end_date := date_trunc(selector, NEW.event_date + _interval_next);
-				-- RAISE NOTICE 'CREATE NEXT: %', table_name;
+                -- RAISE NOTICE 'CREATE NEXT: %', table_name;
-				-- create table
+                -- create table
-				EXECUTE format(REPLACE( -- end date
+                EXECUTE format(REPLACE( -- end date
-					REPLACE( -- start date
+                    REPLACE( -- start date
-						REPLACE( -- compare date name
+                        REPLACE( -- compare date name
-							REPLACE( -- base name (inherit)
+                            REPLACE( -- base name (inherit)
-								REPLACE( -- table name
+                                REPLACE( -- table name
-									command_create_table,
+                                    command_create_table,
-									'{TABLE_NAME}',
+                                    '{TABLE_NAME}',
-									table_name
+                                    table_name
-								),
+                                ),
-								'{BASE_NAME}',
+                                '{BASE_NAME}',
-								base_table
+                                base_table
-							),
+                            ),
-							'{COMPARE_DATE_NAME}',
+                            '{COMPARE_DATE_NAME}',
-							compare_date_name
+                            compare_date_name
-						),
+                        ),
-						'{START_DATE}',
+                        '{START_DATE}',
-						quote_literal(start_date)
+                        quote_literal(start_date)
-					),
+                    ),
-					'{END_DATE}',
+                    '{END_DATE}',
-					quote_literal(end_date)
+                    quote_literal(end_date)
-				));
+                ));
-				-- create all indexes and triggers
+                -- create all indexes and triggers
-				EXECUTE format(REPLACE(
+                EXECUTE format(REPLACE(
-					REPLACE(
+                    REPLACE(
-						command_create_primary_key,
+                        command_create_primary_key,
-						'{TABLE_NAME}',
+                        '{TABLE_NAME}',
-						table_name
+                        table_name
-					),
+                    ),
-					'{BASE_TABLE}',
+                    '{BASE_TABLE}',
-					base_table
+                    base_table
-				));
+                ));
-				-- FK constraints
+                -- FK constraints
-				EXECUTE format(REPLACE(command_create_foreign_key_1, '{TABLE_NAME}', table_name));
+                EXECUTE format(REPLACE(command_create_foreign_key_1, '{TABLE_NAME}', table_name));
-				-- generic trigger
+                -- generic trigger
-				EXECUTE format(REPLACE(command_create_trigger_1, '{TABLE_NAME}', table_name));
+                EXECUTE format(REPLACE(command_create_trigger_1, '{TABLE_NAME}', table_name));
-			END IF;
+            END IF;
-		EXCEPTION
+        EXCEPTION
-		WHEN OTHERS THEN
+        WHEN OTHERS THEN
-			RAISE NOTICE 'Failed to create next table: %', table_name;
+            RAISE NOTICE 'Failed to create next table: %', table_name;
-		END;
+        END;
-	ELSE
+    ELSE
-		-- if outside valid date, insert into overflow
+        -- if outside valid date, insert into overflow
-		INSERT INTO edit_log_overflow VALUES (NEW.*);
+        INSERT INTO edit_log_overflow VALUES (NEW.*);
-	END IF;
+    END IF;
-	RETURN NULL;
+    RETURN NULL;
 END
 $$
 LANGUAGE 'plpgsql';

4dev/database/function/edit_user_set_login_user_id_set_date.sql

@@ -5,22 +5,22 @@ CREATE OR REPLACE FUNCTION set_login_user_id_set_date()
 RETURNS TRIGGER AS
 $$
 BEGIN
-	-- if new is not null/empty
+    -- if new is not null/empty
-	-- and old one is null or old one different new one
+    -- and old one is null or old one different new one
-	-- set NOW()
+    -- set NOW()
-	-- if new one is NULL
+    -- if new one is NULL
-	-- set NULL
+    -- set NULL
-	IF
+    IF
-		NEW.login_user_id IS NOT NULL AND NEW.login_user_id <> '' AND
+        NEW.login_user_id IS NOT NULL AND NEW.login_user_id <> '' AND
-		(OLD.login_user_id IS NULL OR NEW.login_user_id <> OLD.login_user_id)
+        (OLD.login_user_id IS NULL OR NEW.login_user_id <> OLD.login_user_id)
-	THEN
+    THEN
-		NEW.login_user_id_set_date = NOW();
+        NEW.login_user_id_set_date = NOW();
-		NEW.login_user_id_last_revalidate = NOW();
+        NEW.login_user_id_last_revalidate = NOW();
-	ELSIF NEW.login_user_id IS NULL OR NEW.login_user_id = '' THEN
+    ELSIF NEW.login_user_id IS NULL OR NEW.login_user_id = '' THEN
-		NEW.login_user_id_set_date = NULL;
+        NEW.login_user_id_set_date = NULL;
-		NEW.login_user_id_last_revalidate = NULL;
+        NEW.login_user_id_last_revalidate = NULL;
-	END IF;
+    END IF;
-	RETURN NEW;
+    RETURN NEW;
 END;
 $$
 LANGUAGE 'plpgsql';

4dev/database/function/random_string.sql

@@ -4,15 +4,15 @@ CREATE FUNCTION random_string(randomLength int)
 RETURNS text AS
 $$
 SELECT array_to_string(
-	ARRAY(
+    ARRAY(
-		SELECT substring(
+        SELECT substring(
-			'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789',
+            'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789',
-			trunc(random() * 62)::int + 1,
+            trunc(random() * 62)::int + 1,
-			1
+            1
-		)
+        )
-		FROM generate_series(1, randomLength) AS gs(x)
+        FROM generate_series(1, randomLength) AS gs(x)
-	),
+    ),
-	''
+    ''
 )
 $$
 LANGUAGE SQL

4dev/database/function/set_date.sql

@@ -4,12 +4,12 @@ CREATE OR REPLACE FUNCTION set_date()
 RETURNS TRIGGER AS
 $$
 BEGIN
-	IF TG_OP = 'INSERT' THEN
+    IF TG_OP = 'INSERT' THEN
-		NEW.date_created := 'now';
+        NEW.date_created := 'now';
-	ELSIF TG_OP = 'UPDATE' THEN
+    ELSIF TG_OP = 'UPDATE' THEN
-		NEW.date_updated := 'now';
+        NEW.date_updated := 'now';
-	END IF;
+    END IF;
-	RETURN NEW;
+    RETURN NEW;
 END;
 $$
 LANGUAGE 'plpgsql';

4dev/database/function/set_edit_generic.sql

@@ -4,15 +4,15 @@ CREATE OR REPLACE FUNCTION set_edit_generic()
 RETURNS TRIGGER AS
 $$
 DECLARE
-	random_length INT = 12; -- that should be long enough
+    random_length INT = 25; -- that should be long enough
 BEGIN
-	IF TG_OP = 'INSERT' THEN
+    IF TG_OP = 'INSERT' THEN
-		NEW.date_created := 'now';
+        NEW.date_created := 'now';
-		NEW.cuid := random_string(random_length);
+        NEW.cuid := random_string(random_length);
-	ELSIF TG_OP = 'UPDATE' THEN
+    ELSIF TG_OP = 'UPDATE' THEN
-		NEW.date_updated := 'now';
+        NEW.date_updated := 'now';
-	END IF;
+    END IF;
-	RETURN NEW;
+    RETURN NEW;
 END;
 $$
 LANGUAGE 'plpgsql';

4dev/database/function/set_generic_uid.sql

@@ -5,17 +5,17 @@ CREATE OR REPLACE FUNCTION set_generic()
 RETURNS TRIGGER AS
 $$
 DECLARE
-	random_length INT = 32; -- long for massive data
+    random_length INT = 32; -- long for massive data
 BEGIN
-	IF TG_OP = 'INSERT' THEN
+    IF TG_OP = 'INSERT' THEN
-		NEW.date_created := 'now';
+        NEW.date_created := 'now';
-		IF NEW.uid IS NULL THEN
+        IF NEW.uid IS NULL THEN
-			NEW.uid := random_string(random_length);
+            NEW.uid := random_string(random_length);
-		END IF;
+        END IF;
-	ELSIF TG_OP = 'UPDATE' THEN
+    ELSIF TG_OP = 'UPDATE' THEN
-		NEW.date_updated := 'now';
+        NEW.date_updated := 'now';
-	END IF;
+    END IF;
-	RETURN NEW;
+    RETURN NEW;
 END;
 $$
 LANGUAGE 'plpgsql';

4dev/database/function/set_uid.sql

@@ -4,12 +4,12 @@ CREATE OR REPLACE FUNCTION set_uid()
 RETURNS TRIGGER AS
 $$
 DECLARE
-	random_length INT = 32; -- that should be long enough
+    random_length INT = 32; -- that should be long enough
 BEGIN
-	IF TG_OP = 'INSERT' THEN
+    IF TG_OP = 'INSERT' THEN
-		NEW.uid := random_string(random_length);
+        NEW.uid := random_string(random_length);
-	END IF;
+    END IF;
-	RETURN NEW;
+    RETURN NEW;
 END;
 $$
 LANGUAGE 'plpgsql';

4dev/database/function/update_function.sql

@@ -6,14 +6,14 @@
 -- RETURNS TRIGGER AS
 -- $$
 -- BEGIN
--- 	IF TG_OP = 'INSERT' THEN
+--     IF TG_OP = 'INSERT' THEN
--- 		NEW.date_created := clock_timestamp();
+--         NEW.date_created := clock_timestamp();
--- 		NEW.user_created := current_user;
+--         NEW.user_created := current_user;
--- 	ELSIF TG_OP = 'UPDATE' THEN
+--     ELSIF TG_OP = 'UPDATE' THEN
--- 		NEW.date_updated := clock_timestamp();
+--         NEW.date_updated := clock_timestamp();
--- 		NEW.user_updated := current_user;
+--         NEW.user_updated := current_user;
--- 	END IF;
+--     END IF;
--- 	RETURN NEW;
+--     RETURN NEW;
 -- END;
 -- $$
 -- LANGUAGE 'plpgsql';

4dev/database/table/edit_access.sql

@@ -7,13 +7,13 @@
 
 -- DROP TABLE edit_access;
 CREATE TABLE edit_access (
-	edit_access_id	SERIAL PRIMARY KEY,
+    edit_access_id SERIAL PRIMARY KEY,
-	enabled	SMALLINT NOT NULL DEFAULT 0,
+    enabled SMALLINT NOT NULL DEFAULT 0,
-	protected SMALLINT DEFAULT 0,
+    protected SMALLINT DEFAULT 0,
-	deleted	SMALLINT DEFAULT 0,
+    deleted SMALLINT DEFAULT 0,
-	uid	VARCHAR,
+    uid VARCHAR,
-	name	VARCHAR UNIQUE,
+    name VARCHAR UNIQUE,
-	description	VARCHAR,
+    description VARCHAR,
-	color	VARCHAR,
+    color VARCHAR,
-	additional_acl	JSONB
+    additional_acl JSONB
 ) INHERITS (edit_generic) WITHOUT OIDS;

4dev/database/table/edit_access_data.sql

@@ -7,12 +7,12 @@
 
 -- DROP TABLE edit_access_data;
 CREATE TABLE edit_access_data (
-	edit_access_data_id	SERIAL PRIMARY KEY,
+    edit_access_data_id SERIAL PRIMARY KEY,
-	edit_access_id INT NOT NULL,
+    edit_access_id INT NOT NULL,
-	FOREIGN KEY (edit_access_id) REFERENCES edit_access (edit_access_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
+    FOREIGN KEY (edit_access_id) REFERENCES edit_access (edit_access_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
-	enabled	SMALLINT NOT NULL DEFAULT 0,
+    enabled SMALLINT NOT NULL DEFAULT 0,
-	name	VARCHAR,
+    name VARCHAR,
-	value	VARCHAR
+    value VARCHAR
 ) INHERITS (edit_generic) WITHOUT OIDS;
 
 -- create a unique index for each attached data block for each edit access can

4dev/database/table/edit_access_right.sql

@@ -8,9 +8,9 @@
 
 -- DROP TABLE edit_access_right;
 CREATE TABLE edit_access_right (
-	edit_access_right_id SERIAL PRIMARY KEY,
+    edit_access_right_id SERIAL PRIMARY KEY,
-	name VARCHAR,
+    name VARCHAR,
-	level SMALLINT,
+    level SMALLINT,
-	type VARCHAR,
+    type VARCHAR,
-	UNIQUE (level,type)
+    UNIQUE (level,type)
 ) INHERITS (edit_generic) WITHOUT OIDS;

4dev/database/table/edit_access_user.sql

@@ -7,13 +7,13 @@
 
 -- DROP TABLE edit_access_user;
 CREATE TABLE edit_access_user (
-	edit_access_user_id	SERIAL PRIMARY KEY,
+    edit_access_user_id SERIAL PRIMARY KEY,
-	edit_access_id	INT NOT NULL,
+    edit_access_id INT NOT NULL,
-	FOREIGN KEY (edit_access_id) REFERENCES edit_access (edit_access_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
+    FOREIGN KEY (edit_access_id) REFERENCES edit_access (edit_access_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
-	edit_user_id	INT NOT NULL,
+    edit_user_id INT NOT NULL,
-	FOREIGN KEY (edit_user_id) REFERENCES edit_user (edit_user_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
+    FOREIGN KEY (edit_user_id) REFERENCES edit_user (edit_user_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
-	edit_access_right_id	INT NOT NULL,
+    edit_access_right_id INT NOT NULL,
-	FOREIGN KEY (edit_access_right_id) REFERENCES edit_access_right (edit_access_right_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
+    FOREIGN KEY (edit_access_right_id) REFERENCES edit_access_right (edit_access_right_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
-	edit_default	SMALLINT DEFAULT 0,
+    edit_default SMALLINT DEFAULT 0,
-	enabled	SMALLINT NOT NULL DEFAULT 0
+    enabled SMALLINT NOT NULL DEFAULT 0
 ) INHERITS (edit_generic) WITHOUT OIDS;

4dev/database/table/edit_generic.sql

@@ -7,7 +7,7 @@
 
 -- DROP TABLE edit_generic;
 CREATE TABLE edit_generic (
-	cuid	VARCHAR,
+    cuid VARCHAR,
-	date_created	TIMESTAMP WITHOUT TIME ZONE DEFAULT clock_timestamp(),
+    date_created TIMESTAMP WITHOUT TIME ZONE DEFAULT clock_timestamp(),
-	date_updated	TIMESTAMP WITHOUT TIME ZONE
+    date_updated TIMESTAMP WITHOUT TIME ZONE
 );

4dev/database/table/edit_group.sql

@@ -7,14 +7,14 @@
 
 -- DROP TABLE edit_group;
 CREATE TABLE edit_group (
-	edit_group_id	SERIAL PRIMARY KEY,
+    edit_group_id SERIAL PRIMARY KEY,
-	edit_scheme_id INT,
+    edit_scheme_id INT,
-	FOREIGN KEY (edit_scheme_id) REFERENCES edit_scheme (edit_scheme_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
+    FOREIGN KEY (edit_scheme_id) REFERENCES edit_scheme (edit_scheme_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
-	edit_access_right_id INT NOT NULL,
+    edit_access_right_id INT NOT NULL,
-	FOREIGN KEY (edit_access_right_id) REFERENCES edit_access_right (edit_access_right_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
+    FOREIGN KEY (edit_access_right_id) REFERENCES edit_access_right (edit_access_right_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
-	enabled	SMALLINT NOT NULL DEFAULT 0,
+    enabled SMALLINT NOT NULL DEFAULT 0,
-	deleted	SMALLINT DEFAULT 0,
+    deleted SMALLINT DEFAULT 0,
-	uid	VARCHAR,
+    uid VARCHAR,
-	name	VARCHAR,
+    name VARCHAR,
-	additional_acl	JSONB
+    additional_acl JSONB
 ) INHERITS (edit_generic) WITHOUT OIDS;

4dev/database/table/edit_language.sql

@@ -8,11 +8,11 @@
 
 -- DROP TABLE edit_language;
 CREATE TABLE edit_language (
-	edit_language_id SERIAL PRIMARY KEY,
+    edit_language_id SERIAL PRIMARY KEY,
-	enabled SMALLINT NOT NULL DEFAULT 0,
+    enabled SMALLINT NOT NULL DEFAULT 0,
-	lang_default SMALLINT NOT NULL DEFAULT 0,
+    lang_default SMALLINT NOT NULL DEFAULT 0,
-	long_name VARCHAR,
+    long_name VARCHAR,
-	short_name VARCHAR, -- en_US, en or en_US@latin without encoding
+    short_name VARCHAR, -- en_US, en or en_US@latin without encoding
-	iso_name VARCHAR, -- should actually be encoding
+    iso_name VARCHAR, -- should actually be encoding
-	order_number INT
+    order_number INT
 ) INHERITS (edit_generic) WITHOUT OIDS;

4dev/database/table/edit_log.sql

@@ -7,35 +7,35 @@
 
 -- DROP TABLE edit_log;
 CREATE TABLE edit_log (
-	edit_log_id	SERIAL PRIMARY KEY,
+    edit_log_id SERIAL PRIMARY KEY,
-	euid	INT, -- this is a foreign key, but I don't nedd to reference to it
+    euid INT, -- this is a foreign key, but I don't nedd to reference to it
-	FOREIGN KEY (euid) REFERENCES edit_user (edit_user_id) MATCH FULL ON UPDATE CASCADE ON DELETE SET NULL,
+    FOREIGN KEY (euid) REFERENCES edit_user (edit_user_id) MATCH FULL ON UPDATE CASCADE ON DELETE SET NULL,
-	username	VARCHAR,
+    username VARCHAR,
-	password	VARCHAR,
+    password VARCHAR,
-	event_date	TIMESTAMP WITHOUT TIME ZONE DEFAULT CURRENT_TIMESTAMP,
+    event_date TIMESTAMP WITHOUT TIME ZONE DEFAULT CURRENT_TIMESTAMP,
-	ip	VARCHAR,
+    ip VARCHAR,
-	error	TEXT,
+    error TEXT,
-	event	TEXT,
+    event TEXT,
-	data_binary	BYTEA,
+    data_binary BYTEA,
-	data	TEXT,
+    data TEXT,
-	page	VARCHAR,
+    page VARCHAR,
-	action	VARCHAR,
+    action VARCHAR,
-	action_id	VARCHAR,
+    action_id VARCHAR,
-	action_yes	VARCHAR,
+    action_yes VARCHAR,
-	action_flag	VARCHAR,
+    action_flag VARCHAR,
-	action_menu	VARCHAR,
+    action_menu VARCHAR,
-	action_loaded	VARCHAR,
+    action_loaded VARCHAR,
-	action_value	VARCHAR,
+    action_value VARCHAR,
-	action_type	VARCHAR,
+    action_type VARCHAR,
-	action_error	VARCHAR,
+    action_error VARCHAR,
-	user_agent	VARCHAR,
+    user_agent VARCHAR,
-	referer	VARCHAR,
+    referer VARCHAR,
-	script_name	VARCHAR,
+    script_name VARCHAR,
-	query_string	VARCHAR,
+    query_string VARCHAR,
-	server_name	VARCHAR,
+    server_name VARCHAR,
-	http_host	VARCHAR,
+    http_host VARCHAR,
-	http_accept	VARCHAR,
+    http_accept VARCHAR,
-	http_accept_charset	VARCHAR,
+    http_accept_charset VARCHAR,
-	http_accept_encoding	VARCHAR,
+    http_accept_encoding VARCHAR,
-	session_id	VARCHAR
+    session_id VARCHAR
 ) INHERITS (edit_generic) WITHOUT OIDS;

4dev/database/table/edit_menu_group.sql

@@ -7,10 +7,10 @@
 
 -- DROP TABLE edit_menu_group;
 CREATE TABLE edit_menu_group (
-	edit_menu_group_id	SERIAL PRIMARY KEY,
+    edit_menu_group_id SERIAL PRIMARY KEY,
-	name	VARCHAR,
+    name VARCHAR,
-	flag	VARCHAR,
+    flag VARCHAR,
-	order_number	INT NOT NULL
+    order_number INT NOT NULL
 ) INHERITS (edit_generic) WITHOUT OIDS;
 
 

4dev/database/table/edit_page.sql

@@ -7,16 +7,16 @@
 
 -- DROP TABLE edit_page;
 CREATE TABLE edit_page (
-	edit_page_id	SERIAL PRIMARY KEY,
+    edit_page_id SERIAL PRIMARY KEY,
-	content_alias_edit_page_id	INT, -- alias for page content, if the page content is defined on a different page, ege for ajax backend pages
+    content_alias_edit_page_id INT, -- alias for page content, if the page content is defined on a different page, ege for ajax backend pages
-	FOREIGN KEY (content_alias_edit_page_id) REFERENCES edit_page (edit_page_id) MATCH FULL ON DELETE RESTRICT ON UPDATE CASCADE,
+    FOREIGN KEY (content_alias_edit_page_id) REFERENCES edit_page (edit_page_id) MATCH FULL ON DELETE RESTRICT ON UPDATE CASCADE,
-	filename	VARCHAR,
+    filename VARCHAR,
-	name	VARCHAR UNIQUE,
+    name VARCHAR UNIQUE,
-	order_number INT NOT NULL,
+    order_number INT NOT NULL,
-	online	SMALLINT NOT NULL DEFAULT 0,
+    online SMALLINT NOT NULL DEFAULT 0,
-	menu	SMALLINT NOT NULL DEFAULT 0,
+    menu SMALLINT NOT NULL DEFAULT 0,
-	popup	SMALLINT NOT NULL DEFAULT 0,
+    popup SMALLINT NOT NULL DEFAULT 0,
-	popup_x	SMALLINT,
+    popup_x SMALLINT,
-	popup_y SMALLINT,
+    popup_y SMALLINT,
-	hostname	VARCHAR
+    hostname VARCHAR
 ) INHERITS (edit_generic) WITHOUT OIDS;

4dev/database/table/edit_page_access.sql

@@ -7,14 +7,14 @@
 
 -- DROP TABLE edit_page_access;
 CREATE TABLE edit_page_access (
-	edit_page_access_id	SERIAL PRIMARY KEY,
+    edit_page_access_id SERIAL PRIMARY KEY,
-	edit_group_id	INT NOT NULL,
+    edit_group_id INT NOT NULL,
-	FOREIGN KEY (edit_group_id) REFERENCES edit_group (edit_group_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
+    FOREIGN KEY (edit_group_id) REFERENCES edit_group (edit_group_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
-	edit_page_id	INT NOT NULL,
+    edit_page_id INT NOT NULL,
-	FOREIGN KEY (edit_page_id) REFERENCES edit_page (edit_page_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
+    FOREIGN KEY (edit_page_id) REFERENCES edit_page (edit_page_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
-	edit_access_right_id	INT NOT NULL,
+    edit_access_right_id INT NOT NULL,
-	FOREIGN KEY (edit_access_right_id) REFERENCES edit_access_right (edit_access_right_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
+    FOREIGN KEY (edit_access_right_id) REFERENCES edit_access_right (edit_access_right_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
-	enabled	SMALLINT NOT NULL DEFAULT 0
+    enabled SMALLINT NOT NULL DEFAULT 0
 ) INHERITS (edit_generic) WITHOUT OIDS;
 
 

4dev/database/table/edit_page_content.sql

@@ -8,13 +8,13 @@
 
 -- DROP TABLE edit_page_content;
 CREATE TABLE edit_page_content (
-	edit_page_content_id	SERIAL PRIMARY KEY,
+    edit_page_content_id SERIAL PRIMARY KEY,
-	edit_page_id	INT NOT NULL,
+    edit_page_id INT NOT NULL,
-	FOREIGN KEY (edit_page_id) REFERENCES edit_page (edit_page_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
+    FOREIGN KEY (edit_page_id) REFERENCES edit_page (edit_page_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
-	edit_access_right_id	INT NOT NULL,
+    edit_access_right_id INT NOT NULL,
-	FOREIGN KEY (edit_access_right_id) REFERENCES edit_access_right (edit_access_right_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
+    FOREIGN KEY (edit_access_right_id) REFERENCES edit_access_right (edit_access_right_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
-	uid	VARCHAR UNIQUE,
+    uid VARCHAR UNIQUE,
-	name	VARCHAR,
+    name VARCHAR,
-	order_number INT NOT NULL,
+    order_number INT NOT NULL,
-	online	SMALLINT NOT NULL DEFAULT 0
+    online SMALLINT NOT NULL DEFAULT 0
 ) INHERITS (edit_generic) WITHOUT OIDS;

4dev/database/table/edit_page_menu_group.sql

@@ -7,8 +7,8 @@
 
 -- DROP TABLE edit_page_menu_group;
 CREATE TABLE edit_page_menu_group (
-	edit_page_id INT NOT NULL,
+    edit_page_id INT NOT NULL,
-	FOREIGN KEY (edit_page_id) REFERENCES edit_page (edit_page_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
+    FOREIGN KEY (edit_page_id) REFERENCES edit_page (edit_page_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
-	edit_menu_group_id INT NOT NULL,
+    edit_menu_group_id INT NOT NULL,
-	FOREIGN KEY (edit_menu_group_id) REFERENCES edit_menu_group (edit_menu_group_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE
+    FOREIGN KEY (edit_menu_group_id) REFERENCES edit_menu_group (edit_menu_group_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE
 );

4dev/database/table/edit_page_visible_group.sql

@@ -7,8 +7,8 @@
 
 -- DROP TABLE edit_page_visible_group;
 CREATE TABLE edit_page_visible_group (
-	edit_page_id INT NOT NULL,
+    edit_page_id INT NOT NULL,
-	FOREIGN KEY (edit_page_id) REFERENCES edit_page (edit_page_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
+    FOREIGN KEY (edit_page_id) REFERENCES edit_page (edit_page_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
-	edit_visible_group_id INT NOT NULL,
+    edit_visible_group_id INT NOT NULL,
-	FOREIGN KEY (edit_visible_group_id) REFERENCES edit_visible_group (edit_visible_group_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE
+    FOREIGN KEY (edit_visible_group_id) REFERENCES edit_visible_group (edit_visible_group_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE
 );

4dev/database/table/edit_query_string.sql

@@ -7,11 +7,11 @@
 
 -- DROP TABLE edit_query_string;
 CREATE TABLE edit_query_string (
-	edit_query_string_id	SERIAL PRIMARY KEY,
+    edit_query_string_id SERIAL PRIMARY KEY,
-	edit_page_id	INT NOT NULL,
+    edit_page_id INT NOT NULL,
-	FOREIGN KEY (edit_page_id) REFERENCES edit_page (edit_page_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
+    FOREIGN KEY (edit_page_id) REFERENCES edit_page (edit_page_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
-	enabled	SMALLINT NOT NULL DEFAULT 0,
+    enabled SMALLINT NOT NULL DEFAULT 0,
-	name	VARCHAR,
+    name VARCHAR,
-	value	VARCHAR,
+    value VARCHAR,
-	dynamic	SMALLINT NOT NULL DEFAULT 0
+    dynamic SMALLINT NOT NULL DEFAULT 0
 ) INHERITS (edit_generic) WITHOUT OIDS;

4dev/database/table/edit_scheme.sql

@@ -7,10 +7,10 @@
 
 -- DROP TABLE edit_scheme;
 CREATE TABLE edit_scheme (
-	edit_scheme_id	SERIAL PRIMARY KEY,
+    edit_scheme_id SERIAL PRIMARY KEY,
-	enabled	SMALLINT NOT NULL DEFAULT 0,
+    enabled SMALLINT NOT NULL DEFAULT 0,
-	name	VARCHAR,
+    name VARCHAR,
-	header_color	VARCHAR,
+    header_color VARCHAR,
-	css_file	VARCHAR,
+    css_file VARCHAR,
-	template	VARCHAR
+    template VARCHAR
 ) INHERITS (edit_generic) WITHOUT OIDS;

4dev/database/table/edit_temp_files.sql

@@ -7,6 +7,6 @@
 
 -- DROP TABLE temp_files;
 CREATE TABLE temp_files (
-	filename	VARCHAR,
+    filename VARCHAR,
-	folder	VARCHAR
+    folder VARCHAR
 );

4dev/database/table/edit_user.sql

@@ -7,63 +7,63 @@
 
 -- DROP TABLE edit_user;
 CREATE TABLE edit_user (
-	edit_user_id	SERIAL PRIMARY KEY,
+    edit_user_id SERIAL PRIMARY KEY,
-	connect_edit_user_id	INT, -- possible reference to other user
+    connect_edit_user_id INT, -- possible reference to other user
-	FOREIGN KEY (connect_edit_user_id) REFERENCES edit_user (edit_user_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
+    FOREIGN KEY (connect_edit_user_id) REFERENCES edit_user (edit_user_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
-	edit_language_id INT NOT NULL,
+    edit_language_id INT NOT NULL,
-	FOREIGN KEY (edit_language_id) REFERENCES edit_language (edit_language_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
+    FOREIGN KEY (edit_language_id) REFERENCES edit_language (edit_language_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
-	edit_group_id INT NOT NULL,
+    edit_group_id INT NOT NULL,
-	FOREIGN KEY (edit_group_id) REFERENCES edit_group (edit_group_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
+    FOREIGN KEY (edit_group_id) REFERENCES edit_group (edit_group_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
-	edit_scheme_id INT,
+    edit_scheme_id INT,
-	FOREIGN KEY (edit_scheme_id) REFERENCES edit_scheme (edit_scheme_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
+    FOREIGN KEY (edit_scheme_id) REFERENCES edit_scheme (edit_scheme_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
-	edit_access_right_id INT NOT NULL,
+    edit_access_right_id INT NOT NULL,
-	FOREIGN KEY (edit_access_right_id) REFERENCES edit_access_right (edit_access_right_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
+    FOREIGN KEY (edit_access_right_id) REFERENCES edit_access_right (edit_access_right_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
-	-- username/password
+    -- username/password
-	username	VARCHAR UNIQUE,
+    username VARCHAR UNIQUE,
-	password	VARCHAR,
+    password VARCHAR,
-	-- name block
+    -- name block
-	first_name	VARCHAR,
+    first_name VARCHAR,
-	last_name	VARCHAR,
+    last_name VARCHAR,
-	first_name_furigana	VARCHAR,
+    first_name_furigana VARCHAR,
-	last_name_furigana	VARCHAR,
+    last_name_furigana VARCHAR,
-	-- email
+    -- email
-	email	VARCHAR,
+    email VARCHAR,
-	-- eanbled/deleted flag
+    -- eanbled/deleted flag
-	enabled	SMALLINT NOT NULL DEFAULT 0,
+    enabled SMALLINT NOT NULL DEFAULT 0,
-	deleted	SMALLINT NOT NULL DEFAULT 0,
+    deleted SMALLINT NOT NULL DEFAULT 0,
-	-- general flags
+    -- general flags
-	strict	SMALLINT DEFAULT 0,
+    strict SMALLINT DEFAULT 0,
-	locked	SMALLINT DEFAULT 0,
+    locked SMALLINT DEFAULT 0,
-	protected SMALLINT NOT NULL DEFAULT 0,
+    protected SMALLINT NOT NULL DEFAULT 0,
-	-- legacy, debug flags
+    -- legacy, debug flags
-	debug	SMALLINT NOT NULL DEFAULT 0,
+    debug SMALLINT NOT NULL DEFAULT 0,
-	db_debug	SMALLINT NOT NULL DEFAULT 0,
+    db_debug SMALLINT NOT NULL DEFAULT 0,
-	-- is admin user
+    -- is admin user
-	admin	SMALLINT NOT NULL DEFAULT 0,
+    admin SMALLINT NOT NULL DEFAULT 0,
-	-- last login log
+    -- last login log
-	last_login	TIMESTAMP WITHOUT TIME ZONE,
+    last_login TIMESTAMP WITHOUT TIME ZONE,
-	-- login error
+    -- login error
-	login_error_count	INT DEFAULT 0,
+    login_error_count INT DEFAULT 0,
-	login_error_date_last	TIMESTAMP WITHOUT TIME ZONE,
+    login_error_date_last TIMESTAMP WITHOUT TIME ZONE,
-	login_error_date_first	TIMESTAMP WITHOUT TIME ZONE,
+    login_error_date_first TIMESTAMP WITHOUT TIME ZONE,
-	-- time locked
+    -- time locked
-	lock_until	TIMESTAMP WITHOUT TIME ZONE,
+    lock_until TIMESTAMP WITHOUT TIME ZONE,
-	lock_after	TIMESTAMP WITHOUT TIME ZONE,
+    lock_after TIMESTAMP WITHOUT TIME ZONE,
-	-- password change
+    -- password change
-	password_change_date	TIMESTAMP WITHOUT TIME ZONE, -- only when password is first set or changed
+    password_change_date TIMESTAMP WITHOUT TIME ZONE, -- only when password is first set or changed
-	password_change_interval	INTERVAL, -- null if no change is needed, or d/m/y time interval
+    password_change_interval INTERVAL, -- null if no change is needed, or d/m/y time interval
-	password_reset_time	TIMESTAMP WITHOUT TIME ZONE, -- when the password reset was requested
+    password_reset_time TIMESTAMP WITHOUT TIME ZONE, -- when the password reset was requested
-	password_reset_uid	VARCHAR, -- the uid to access the password reset page
+    password_reset_uid VARCHAR, -- the uid to access the password reset page
-	-- _GET login id for direct login
+    -- _GET login id for direct login
-	login_user_id	VARCHAR UNIQUE, -- the loginUserId, at least 32 chars
+    login_user_id VARCHAR UNIQUE, -- the loginUserId, at least 32 chars
-	login_user_id_set_date	TIMESTAMP WITHOUT TIME ZONE, -- when above uid was set
+    login_user_id_set_date TIMESTAMP WITHOUT TIME ZONE, -- when above uid was set
-	login_user_id_last_revalidate	TIMESTAMP WITHOUT TIME ZONE, -- when the last login was done with user name and password
+    login_user_id_last_revalidate TIMESTAMP WITHOUT TIME ZONE, -- when the last login was done with user name and password
-	login_user_id_valid_from	TIMESTAMP WITHOUT TIME ZONE, -- if set, from when the above uid is valid
+    login_user_id_valid_from TIMESTAMP WITHOUT TIME ZONE, -- if set, from when the above uid is valid
-	login_user_id_valid_until	TIMESTAMP WITHOUT TIME ZONE, -- if set, until when the above uid is valid
+    login_user_id_valid_until TIMESTAMP WITHOUT TIME ZONE, -- if set, until when the above uid is valid
-	login_user_id_revalidate_after	INTERVAL, -- user must login to revalidated loginUserId after set days, 0 for forever
+    login_user_id_revalidate_after INTERVAL, -- user must login to revalidated loginUserId after set days, 0 for forever
-	login_user_id_locked	SMALLINT DEFAULT 0, -- lock for loginUserId, but still allow normal login
+    login_user_id_locked SMALLINT DEFAULT 0, -- lock for loginUserId, but still allow normal login
-	-- additional ACL json block
+    -- additional ACL json block
-	additional_acl	JSONB -- additional ACL as JSON string (can be set by other pages)
+    additional_acl JSONB -- additional ACL as JSON string (can be set by other pages)
 ) INHERITS (edit_generic) WITHOUT OIDS;
 
 -- create unique index

4dev/database/table/edit_visible_group.sql

@@ -7,7 +7,7 @@
 
 -- DROP TABLE edit_visible_group;
 CREATE TABLE edit_visible_group (
-	edit_visible_group_id	SERIAL PRIMARY KEY,
+    edit_visible_group_id SERIAL PRIMARY KEY,
-	name	VARCHAR,
+    name VARCHAR,
-	flag	VARCHAR
+    flag VARCHAR
 ) INHERITS (edit_generic) WITHOUT OIDS;

4dev/database/table/generic.sql

@@ -7,7 +7,7 @@
 
 -- DROP TABLE generic;
 CREATE TABLE generic (
-	date_created	TIMESTAMP WITHOUT TIME ZONE DEFAULT clock_timestamp(),
+    date_created TIMESTAMP WITHOUT TIME ZONE DEFAULT clock_timestamp(),
-	date_updated	TIMESTAMP WITHOUT TIME ZONE,
+    date_updated TIMESTAMP WITHOUT TIME ZONE,
-	uid	VARCHAR
+    uid VARCHAR
 );

4dev/tests/CoreLibsConvertByteTest.php

@@ -16,7 +16,6 @@ use PHPUnit\Framework\TestCase;
  */
 final class CoreLibsConvertByteTest extends TestCase
 {
-
 	/**
 	 * Undocumented function
 	 *
@@ -24,7 +23,31 @@ final class CoreLibsConvertByteTest extends TestCase
 	 */
 	public function byteProvider(): array
 	{
+		/*
+		 * 0: input string
+		 * 1: default flags
+		 * 2: BYTE_FORMAT_SI
+		 * 3: BYTE_FORMAT_NOSPACE
+		 * 4: BYTE_FORMAT_ADJUST
+		 * 5: BYTE_FORMAT_SI | BYTE_FORMAT_NOSPACE
+		 */
 		return [
+			'string number' => [
+				0 => '1024',
+				1 => '1 KB',
+				2 => '1.02 KiB',
+				3 => '1KB',
+				4 => '1.00 KB',
+				5 => '1.02KiB',
+			],
+			'invalud string number' => [
+				0 => '1024 MB',
+				1 => '1024 MB',
+				2 => '1024 MB',
+				3 => '1024 MB',
+				4 => '1024 MB',
+				5 => '1024 MB',
+			],
 			'negative number' => [
 				0 => -123123123,
 				1 => '-117.42 MB',

4dev/tests/CoreLibsCreateEmailTest.php

@@ -113,7 +113,10 @@ final class CoreLibsCreateEmailTest extends TestCase
 				'日本語ｶﾀｶﾅﾊﾟ',
 				'ISO-2022-JP',
 				true,
-				'"=?ISO-2022-JP?B?GyRCRnxLXDhsGyhCPz8/Pz8=?=" <test@test.com>'
+				// was ok php 8.1
+				// '"=?ISO-2022-JP?B?GyRCRnxLXDhsGyhCPz8/Pz8=?=" <test@test.com>'
+				// below ok php 8.1.12, 2022/12/9
+				'"=?ISO-2022-JP?B?GyRCRnxLXDhsGyhCPz8/Pz8/?=" <test@test.com>'
 			]
 		];
 	}
@@ -124,6 +127,11 @@ final class CoreLibsCreateEmailTest extends TestCase
 	 * @dataProvider encodeEmailNameProvider
 	 * @testdox encode email $email, name $name, encoding $encoding, folding $kv_folding will be $expected [$_dataName]
 	 *
+	 * @param  string      $email
+	 * @param  string|null $name
+	 * @param  string|null $encoding
+	 * @param  bool|null   $kv_folding
+	 * @param  string      $expected
 	 * @return void
 	 */
 	public function testEncodeEmailName(

4dev/tests/CoreLibsDBIOTest.php

@@ -1189,7 +1189,13 @@ final class CoreLibsDBIOTest extends TestCase
 
 		$this->assertEquals(
 			$expected,
-			$db->dbEscapeBytea($input)
+			$db->dbEscapeBytea($input),
+			'Assert error to bytea'
+		);
+		$this->assertEquals(
+			$input,
+			$db->dbUnescapeBytea($expected),
+			'Assert error from bytes'
 		);
 
 		$db->dbClose();

4dev/update/20220617_edit_user_login_update/20220617-edit_user_login_user_id_add.sql

@@ -26,22 +26,22 @@ CREATE OR REPLACE FUNCTION set_login_user_id_set_date()
 RETURNS TRIGGER AS
 $$
 BEGIN
-	-- if new is not null/empty
+    -- if new is not null/empty
-	-- and old one is null or old one different new one
+    -- and old one is null or old one different new one
-	-- set NOW()
+    -- set NOW()
-	-- if new one is NULL
+    -- if new one is NULL
-	-- set NULL
+    -- set NULL
-	IF
+    IF
-		NEW.login_user_id IS NOT NULL AND NEW.login_user_id <> '' AND
+        NEW.login_user_id IS NOT NULL AND NEW.login_user_id <> '' AND
-		(OLD.login_user_id IS NULL OR NEW.login_user_id <> OLD.login_user_id)
+        (OLD.login_user_id IS NULL OR NEW.login_user_id <> OLD.login_user_id)
-	THEN
+    THEN
-		NEW.login_user_id_set_date = NOW();
+        NEW.login_user_id_set_date = NOW();
-		NEW.login_user_id_last_revalidate = NOW();
+        NEW.login_user_id_last_revalidate = NOW();
-	ELSIF NEW.login_user_id IS NULL OR NEW.login_user_id = '' THEN
+    ELSIF NEW.login_user_id IS NULL OR NEW.login_user_id = '' THEN
-		NEW.login_user_id_set_date = NULL;
+        NEW.login_user_id_set_date = NULL;
-		NEW.login_user_id_last_revalidate = NULL;
+        NEW.login_user_id_last_revalidate = NULL;
-	END IF;
+    END IF;
-	RETURN NEW;
+    RETURN NEW;
 END;
 $$
 LANGUAGE 'plpgsql';

www/admin/class_test.byte.php

@@ -50,21 +50,22 @@ print '<div><h1>' . $PAGE_NAME . '</h1></div>';
 $byte = 254779258;
 $string = '242.98 MB';
 // static
-print "S::BYTE TO: $byte: " . $byte_class::humanReadableByteFormat($byte) . "<br>";
+print "S::BYTE TO (calls as var): $byte: " . $byte_class::humanReadableByteFormat($byte) . "<br>";
-print "S::BYTE TO: $byte: " . $byte_class::humanReadableByteFormat($byte, Byte::BYTE_FORMAT_SI) . "<br>";
+print "S::BYTE TO: $byte: " . Byte::humanReadableByteFormat($byte) . "<br>";
-print "S::BYTE TO: $byte: " . $byte_class::humanReadableByteFormat($byte, Byte::BYTE_FORMAT_ADJUST) . "<br>";
+print "S::BYTE TO: $byte: " . Byte::humanReadableByteFormat($byte, Byte::BYTE_FORMAT_SI) . "<br>";
-print "S::BYTE TO: $byte: " . $byte_class::humanReadableByteFormat($byte, Byte::BYTE_FORMAT_NOSPACE) . "<br>";
+print "S::BYTE TO: $byte: " . Byte::humanReadableByteFormat($byte, Byte::BYTE_FORMAT_ADJUST) . "<br>";
-print "S::BYTE FROM: $string: " . $byte_class::stringByteFormat($string) . "<br>";
+print "S::BYTE TO: $byte: " . Byte::humanReadableByteFormat($byte, Byte::BYTE_FORMAT_NOSPACE) . "<br>";
+print "S::BYTE FROM: $string: " . Byte::stringByteFormat($string) . "<br>";
 //
 $byte = 314572800;
 $string = '300 MB';
-print "S::BYTE TO: $byte: " . $byte_class::humanReadableByteFormat($byte) . "<br>";
+print "S::BYTE TO: $byte: " . Byte::humanReadableByteFormat($byte) . "<br>";
-print "S::BYTE TO: $byte: " . $byte_class::humanReadableByteFormat($byte, Byte::BYTE_FORMAT_SI) . "<br>";
+print "S::BYTE TO: $byte: " . Byte::humanReadableByteFormat($byte, Byte::BYTE_FORMAT_SI) . "<br>";
-print "S::BYTE TO: $byte: " . $byte_class::humanReadableByteFormat($byte, Byte::BYTE_FORMAT_ADJUST) . "<br>";
+print "S::BYTE TO: $byte: " . Byte::humanReadableByteFormat($byte, Byte::BYTE_FORMAT_ADJUST) . "<br>";
 print "S::BYTE TO: $byte: "
-	. $byte_class::humanReadableByteFormat($byte, Byte::BYTE_FORMAT_ADJUST | Byte::BYTE_FORMAT_NOSPACE) . "<br>";
+	. Byte::humanReadableByteFormat($byte, Byte::BYTE_FORMAT_ADJUST | Byte::BYTE_FORMAT_NOSPACE) . "<br>";
-print "S::BYTE TO: $byte: " . $byte_class::humanReadableByteFormat($byte, Byte::BYTE_FORMAT_NOSPACE) . "<br>";
+print "S::BYTE TO: $byte: " . Byte::humanReadableByteFormat($byte, Byte::BYTE_FORMAT_NOSPACE) . "<br>";
-print "S::BYTE FROM: $string: " . $byte_class::stringByteFormat($string) . "<br>";
+print "S::BYTE FROM: $string: " . Byte::stringByteFormat($string) . "<br>";
 
 // *** BYTES TEST ***
 $bytes = [

www/configs/config.master.php

@@ -249,7 +249,7 @@ if ($is_secure) {
 	define('HOST_PROTOCOL', 'http://');
 }
 // define the db config set name, the db config and the db schema
-define('DB_CONFIG_NAME', $SITE_CONFIG[HOST_NAME]['db_host']);
+define('DB_CONFIG_NAME', $SITE_CONFIG[HOST_NAME]['db_host'] ?? '');
 define('DB_CONFIG', $DB_CONFIG[DB_CONFIG_NAME] ?? []);
 // because we can't change constant, but we want to for db debug flag
 $GLOBALS['DB_CONFIG_SET'] = DB_CONFIG;
@@ -268,9 +268,9 @@ define('SITE_ENCODING', $SITE_CONFIG[HOST_NAME]['site_encoding'] ?? DEFAULT_ENCO
 define('LOGIN_ENABLED', $SITE_CONFIG[HOST_NAME]['login_enabled'] ?? false);
 define('AUTH', $SITE_CONFIG[HOST_NAME]['auth'] ?? false);
 // paths
-// define('CSV_PATH', $PATHS[TARGET]['csv_path']);
+// define('CSV_PATH', $PATHS[TARGET]['csv_path'] ?? '');
-// define('EXPORT_SCRIPT', $PATHS[TARGET]['perl_bin']);
+// define('EXPORT_SCRIPT', $PATHS[TARGET]['perl_bin'] ?? '');
-// define('REDIRECT_URL', $PATHS[TARGET]['redirect_url']);
+// define('REDIRECT_URL', $PATHS[TARGET]['redirect_url'] ?? '');
 
 // show all errors if debug_all & show_error_handling are enabled
 define('SHOW_ALL_ERRORS', true);

www/includes/edit_base.php

@@ -112,7 +112,7 @@ if (defined('LAYOUT')) {
 }
 // set table width
 $table_width = '100%';
-
+$ADMIN_STYLESHEET = 'edit.css';
 // define all needed smarty stuff for the general HTML/page building
 $HEADER['CSS'] = CSS;
 $HEADER['DEFAULT_ENCODING'] = DEFAULT_ENCODING;

www/lib/CoreLibs/Convert/Byte.php

@@ -26,13 +26,16 @@ class Byte
 	 * Source Idea: SOURCE: https://programming.guide/worlds-most-copied-so-snippet.html
 	 *
 	 * The class itself hast the following defined
-	 * BYTE_FORMAT_NOSPACE [1] turn off spaces between number and extension
+	 * BYTE_FORMAT_NOSPACE [1] turn off spaces between number and suffix
 	 * BYTE_FORMAT_ADJUST  [2] use sprintf to always print two decimals
 	 * BYTE_FORMAT_SI      [3] use si standard 1000 instead of bytes 1024
 	 * To use the constant from outside use class::CONSTANT
 	 *
 	 * @param  string|int|float $bytes bytes as string int or pure int
 	 * @param  int              $flags bitwise flag with use space turned on
+	 *                                 BYTE_FORMAT_NOSPACE: no space between number and suffix
+	 *                                 BYTE_FORMAT_ADJUST: sprintf adjusted two 2 decimals
+	 *                                 BYTE_FORMAT_SI: use 1000 instead of 1024
 	 * @return string                  converted byte number (float) with suffix
 	 */
 	public static function humanReadableByteFormat($bytes, int $flags = 0): string
@@ -62,7 +65,7 @@ class Byte
 			// si or normal
 			$unit = $si ? 1000 : 1024;
 			// always positive
-			$abs_bytes = $bytes == PHP_INT_MIN ? PHP_INT_MAX : abs($bytes);
+			$abs_bytes = $bytes == PHP_INT_MIN ? PHP_INT_MAX : abs((float)$bytes);
 			// smaller than unit is always B
 			if ($abs_bytes < $unit) {
 				return $bytes . 'B';
@@ -110,6 +113,7 @@ class Byte
 	 *
 	 * @param  string|int|float $number any string or number to convert
 	 * @param  int              $flags  bitwise flag with use space turned on
+	 *                                  BYTE_FORMAT_SI: use 1000 instead of 1024
 	 * @return string|int|float         converted value or original value
 	 */
 	public static function stringByteFormat($number, int $flags = 0)

www/lib/CoreLibs/DB/IO.php

@@ -1488,12 +1488,17 @@ class IO
 
 	/**
 	 * escape data for writing to bytea type column field
-	 * @param  string $bytea bytea to escape
+	 * @param  string $data data to escape to bytea
-	 * @return string        escaped bytea
+	 * @return string       escaped bytea
 	 */
-	public function dbEscapeBytea($bytea)
+	public function dbEscapeBytea($data)
 	{
-		return $this->db_functions->__dbEscapeBytea($bytea);
+		return $this->db_functions->__dbEscapeBytea($data);
+	}
+
+	public function dbUnescapeBytea($bytea)
+	{
+		return $this->db_functions->__dbUnescapeBytea($bytea);
 	}
 
 	/**

www/lib/CoreLibs/DB/SQL/PgSQL.php

@@ -559,15 +559,26 @@ class PgSQL implements \CoreLibs\DB\SQL\SqlInterface\SqlFunctions
 	/**
 	 * wrapper for pg_escape_byte
 	 *
-	 * @param  string $bytea bytea data stream
+	 * @param  string $data data stream
-	 * @return string        escaped bytea string
+	 * @return string       escaped bytea string
 	 */
-	public function __dbEscapeBytea(string $bytea): string
+	public function __dbEscapeBytea(string $data): string
 	{
 		if ($this->dbh === false || is_bool($this->dbh)) {
 			return '';
 		}
-		return pg_escape_bytea($this->dbh, $bytea);
+		return pg_escape_bytea($this->dbh, $data);
+	}
+
+	/**
+	 * unescape bytea data from postgesql
+	 *
+	 * @param  string $bytea Bytea data stream
+	 * @return string        Unescaped bytea data
+	 */
+	public function __dbUnescapeBytea(string $bytea): string
+	{
+		return pg_unescape_bytea($bytea);
 	}
 
 	/**

www/lib/CoreLibs/DB/SQL/SqlInterface/SqlFunctions.php

@@ -217,7 +217,15 @@ interface SqlFunctions
 	 * @param string $bytea
 	 * @return string
 	 */
-	public function __dbEscapeBytea(string $bytea): string;
+	public function __dbEscapeBytea(string $data): string;
+
+	/**
+	 * Undocumented function
+	 *
+	 * @param  string $bytea
+	 * @return string
+	 */
+	public function __dbUnescapeBytea(string $bytea): string;
 
 	/**
 	 * Undocumented function

www/lib/CoreLibs/Template/SmartyExtend.php

@@ -465,7 +465,7 @@ class SmartyExtend extends \Smarty
 			$this->HEADER['JAVASCRIPT'] = $this->ADMIN_JAVASCRIPT ? $this->ADMIN_JAVASCRIPT : ADMIN_JAVASCRIPT;
 			// the page name
 			$this->DATA['page_name'] = $this->page_name;
-			$this->DATA['table_width'] = empty($this->PAGE_WIDTH) ?: PAGE_WIDTH;
+			$this->DATA['table_width'] = !empty($this->PAGE_WIDTH) ?: PAGE_WIDTH;
 			$this->DATA['form_name'] = $this->DATA['FORM_NAME'];
 			// for tinymce special
 			$this->DATA['TINYMCE_LANG'] = $this->lang_short;