Merge branch 'develop'

Author: helje5

Database/PostgreSQL/pg-build-schema.psql

@@ -12,6 +12,10 @@ ALTER TABLE object_acl
 
 ALTER TABLE document ADD COLUMN company_id INT NULL;
 ALTER TABLE document ADD COLUMN job_id     INT NULL;
+ALTER TABLE document ADD COLUMN keywords   TEXT NULL;
+ALTER TABLE document ADD COLUMN tags_array TEXT[] GENERATED ALWAYS 
+            AS (string_to_array(keywords, ', ')) STORED;
+CREATE INDEX document_tags_gin ON document USING GIN (tags_array);
 
 CREATE TABLE ctags (
   entity VARCHAR NOT NULL,
@@ -33,6 +37,9 @@ ALTER TABLE company ADD COLUMN family_status VARCHAR(255) NULL;
 ALTER TABLE company ADD COLUMN citizenship   VARCHAR(255) NULL; -- CSV?!
 ALTER TABLE company ADD COLUMN dayofdeath    TIMESTAMP WITH TIME ZONE NULL;
 ALTER TABLE company ADD COLUMN modern_password VARCHAR(255) NULL;
+ALTER TABLE company ADD COLUMN tags_array TEXT[] GENERATED ALWAYS 
+            AS (string_to_array(keywords, ', ')) STORED;
+CREATE INDEX company_tags_gin ON company USING GIN (tags_array);
 
 -- district of a city (eg Magdeburg "Nord")
 ALTER TABLE address ADD COLUMN district VARCHAR(255) NULL;
@@ -52,7 +59,8 @@ ALTER TABLE address   ADD CONSTRAINT company_unique_adrtype
 
 
 -- prepare for project hierarchies
-ALTER TABLE project ADD COLUMN parent_project_id INT NULL;
+ALTER TABLE project ADD COLUMN parent_project_id INT          NULL;
+ALTER TABLE project ADD COLUMN source_url        VARCHAR(255) NULL;
 
 CREATE TABLE login_token (
   token           VARCHAR(4096) PRIMARY KEY,
@@ -65,15 +73,27 @@ CREATE TABLE login_token (
   expiration_date TIMESTAMP WITH TIME ZONE NULL
 );
 
-ALTER TABLE job ADD COLUMN owner_id INT;
+ALTER TABLE job ADD COLUMN owner_id   INT;
 UPDATE job SET owner_id = creator_id WHERE owner_id IS NULL;
-ALTER TABLE job ADD COLUMN date_id INT;
-ALTER TABLE job ADD COLUMN url     TEXT;
+ALTER TABLE job ADD COLUMN date_id    INT;
+ALTER TABLE job ADD COLUMN url        TEXT;
+ALTER TABLE job ADD COLUMN tags_array TEXT[] GENERATED ALWAYS 
+         AS (string_to_array(keywords, ', ')) STORED;
+CREATE INDEX job_tags_gin ON job USING GIN (tags_array);
 
 ALTER TABLE date_x ADD COLUMN project_id          INT;
 ALTER TABLE date_x ADD COLUMN url                 TEXT;
 ALTER TABLE date_x ADD COLUMN location_id         INT;
 ALTER TABLE date_x ADD COLUMN location_id_version INT;
+ALTER TABLE date_x ADD COLUMN tags_array TEXT[] GENERATED ALWAYS 
+         AS (string_to_array(apt_type, ', ')) STORED;
+ALTER TABLE date_x ADD COLUMN write_access_ids       INT[] GENERATED ALWAYS 
+         AS (string_to_array(write_access_list, ',')::INT[]) STORED;
+ALTER TABLE date_x ADD COLUMN resource_names_array   TEXT[] GENERATED ALWAYS 
+         AS (string_to_array(resource_names, ', ')) STORED;
+CREATE INDEX date_tags_gin      ON date_x USING GIN (tags_array);
+CREATE INDEX date_writeacl_gin  ON date_x USING GIN (write_access_ids);
+CREATE INDEX date_resources_gin ON date_x USING GIN (resource_names_array);
 
 -- pg-update-1.0to5.4.psql, used to be a separate file
 
@@ -97,7 +117,8 @@ ALTER TABLE project_company_assignment
 
 -- field to connect documents and notes to contacts
 -- Also in pg-update-1.x-to-5.5.psql
-ALTER TABLE document ADD COLUMN company_id INT NULL;
+ALTER TABLE document ADD COLUMN company_id INT          NULL;
+ALTER TABLE document ADD COLUMN source_url VARCHAR(255) NULL;
 
 
 -- both do not work on SX:
@@ -561,25 +582,25 @@ ALTER TABLE document ADD COLUMN text_content_object_version INT      NULL;
 -- 56+ - things changed in 2025
 UPDATE table_version SET table_version = 55 WHERE table_name = '_model';
 UPDATE table_version SET table_version = 56 WHERE table_name = 'address';
-UPDATE table_version SET table_version = 56 WHERE table_name = 'company';
+UPDATE table_version SET table_version = 57 WHERE table_name = 'company';
 UPDATE table_version SET table_version = 56 WHERE table_name = 'company_value';
 UPDATE table_version SET table_version = 56
  WHERE table_name = 'company_category';
 UPDATE table_version SET table_version = 55 
  WHERE table_name = 'company_assignment';
-UPDATE table_version SET table_version = 56 WHERE table_name = 'date';
+UPDATE table_version SET table_version = 57 WHERE table_name = 'date';
 UPDATE table_version SET table_version = 56 WHERE table_name = 'date_info';
 UPDATE table_version SET table_version = 56
  WHERE table_name = 'date_company_assignment';
 UPDATE table_version SET table_version = 56
  WHERE table_name = 'appointment_resource';
-UPDATE table_version SET table_version = 56 WHERE table_name = 'job';
+UPDATE table_version SET table_version = 57 WHERE table_name = 'job';
 UPDATE table_version SET table_version = 57 WHERE table_name = 'job_history';
-UPDATE table_version SET table_version = 56 WHERE table_name = 'project';
+UPDATE table_version SET table_version = 57 WHERE table_name = 'project';
 UPDATE table_version SET table_version = 56 WHERE table_name = 'project_info';
 UPDATE table_version SET table_version = 55
  WHERE table_name = 'project_company_assignment';
-UPDATE table_version SET table_version = 56 WHERE table_name = 'document';
+UPDATE table_version SET table_version = 58 WHERE table_name = 'document';
 UPDATE table_version SET table_version = 55
  WHERE table_name = 'document_version';
 UPDATE table_version SET table_version = 55

Database/PostgreSQL/pg-update-1.0to5.4.psql

@@ -261,13 +261,17 @@ - (NSArray *)primaryFetch {
   // it is when aptType is still set
   // if aptType is nil or "" view/sort is not allowed or aptType is unspecified
   // so this must be filtered anyway
-  if (([aptTypes count]) && ([dates count])) {
+  // Special case: "__none__" in aptTypes means include untyped appointments
+  if (([aptTypes count] > 0) && ([dates count] > 0)) {
+    BOOL           includeUntyped = [aptTypes containsObject:@"__none__"];
     NSEnumerator   *e  = [dates objectEnumerator];
     NSMutableArray *ma = [NSMutableArray array];
     id             one = nil;
-    while ((one = [e nextObject]))
-      if ([[one valueForKey:@"aptType"] length])
+    while ((one = [e nextObject])) {
+      NSString *type = [one valueForKey:@"aptType"];
+      if ([type length] > 0 || includeUntyped)
         [ma addObject:one];
+    }
     //dates = [ma copy];
     //AUTORELEASE(dates);
     dates = ma;

DocumentAPI/OGoScheduler/SkyAptDataSource.m

@@ -80,7 +80,9 @@ - (id)initWithUserDefaults:(NSUserDefaults *)_ud
   DO $$
   BEGIN
     BEGIN
-      EXECUTE 'UPDATE my_table SET missing_column = 42';
+      EXECUTE 'UPDATE person SET modern_password = ''$sha1'' 
+               WHERE company_id = $id
+               AND (modern_password != ''$sha1'' OR modern_password IS NULL)
     EXCEPTION
       WHEN undefined_column THEN
         RAISE NOTICE 'Column does not exist, update skipped.';

Logic/LSAccount/LSLoginAccountCommand.m

@@ -60,9 +60,8 @@ - (void)setReturnValue:(id)_object {
 - (void)_prepareForExecutionInContext:(id)_context {
   id obj            = [self object];
   id isExtraAccount = [obj valueForKey:@"isExtraAccount"];
-  id account        = [_context valueForKey:LSAccountKey];
 
-  [self assert:([[account valueForKey:@"companyId"] intValue] == 10000)
+  [self assert:[_context isRoot]
         reason:@"Only root can change accounts"];
 
   if ([isExtraAccount boolValue]) {

Logic/LSAccount/LSSetAccountCommand.m

@@ -109,21 +109,14 @@ - (void)_setStaffInContext:(LSCommandContext *)_context {
   }
 }
 
-- (BOOL)isRootId:(NSNumber *)_pkey inContext:(LSCommandContext *)_ctx {
-  return [_pkey intValue] == 10000 ? YES : NO; // ROOT
-}
-
 - (void)_prepareForExecutionInContext:(id)_context {
   NSString *prefix;
   id obj;
-  id user;
-  
-  obj  = [self object];
-  user = [_context valueForKey:LSAccountKey];
 
-  [self assert:
-          [self isRootId:[user valueForKey:@"companyId"] inContext:_context]
-        reason: @"Only root can change login status!"];
+  obj = [self object];
+
+  [self assert:[_context isRoot]
+        reason:@"Only root can change login status!"];
 
   prefix = [NSString stringWithFormat:@"OGo%@",[obj valueForKey:@"companyId"]];
 

Logic/LSAddress/LSChangeLoginStatusCommand.m

@@ -109,21 +109,15 @@ - (void)_separateNotesInContext:(id)_context {
     [notes clear];
 }
 
-- (BOOL)isRootID:(NSNumber *)_pkey {
-  return [_pkey intValue] == 10000 ? YES : NO;
-}
-
 - (void)_executeInContext:(id)_context {
-  id user;
   id isAccount;
 
   [self assert:([self object] != nil) reason:  @"no object available"];
 
-  user      = [_context valueForKey:LSAccountKey];
   isAccount = [[self object] valueForKey:@"isAccount"];
 
   if ((isAccount != nil) && ([isAccount boolValue])) {
-    [self assert:[self isRootID:[user valueForKey:@"companyId"]]
+    [self assert:[_context isRoot]
           reason:@"Only root can delete accounts!"];
   }
   if (![[_context accessManager] operation:@"w"

Logic/LSAddress/LSDeleteCompanyCommand.m

@@ -95,8 +95,8 @@ - (void)_prepareForExecutionInContext:(id)_context {
 
   if (![[_context class] useLDAPAuthorization]) {
     [self assert:[login isEqual:[self->user valueForKey:@"companyId"]]
-	  reason:
-	    @"only root is allowed to access preferences of other accounts"];
+          reason:
+            @"only root is allowed to access preferences of other accounts"];
   }
 
   [self _checkLdapAccessInContext:_context];

Logic/LSAddress/LSGetUserDefaultsCommand.m

@@ -38,12 +38,9 @@ - (BOOL)isSessionLogEnabled {
 /* run command */
 
 - (void)_prepareForExecutionInContext:(id)_context {
-  id account;
-  
-  account = [_context valueForKey:LSAccountKey];
-  [self assert:(account != nil)
+  [self assert:([_context valueForKey:LSAccountKey] != nil)
         reason:@"missing super user account"];
-  [self assert:([[account valueForKey:@"companyId"] intValue] == 10000)
+  [self assert:[_context isRoot]
         reason:@"active user has no super user access"];
 }
 

Logic/LSBase/LSSuperUserCommand.m

@@ -67,6 +67,8 @@
 - (NSUserDefaults *)userDefaults;
 - (SkyAccessManager *)accessManager;
 
+- (BOOL)isRoot;
+
 /* flushing caches */
 
 - (void)flush;