Changeset 146 for trunk/Modules/User/ModuleUser.pas

Timestamp:

Dec 29, 2023, 11:44:26 PM (5 months ago)

Author:

chronos

Message:

• Modified: Unit names without U prefix.

File:

• trunk/Modules/User/ModuleUser.pas (moved) (moved from trunk/Modules/User/UModuleUser.pas ) (11 diffs)

trunk/Modules/User/ModuleUser.pas

@@ -1 @@
-unit UModuleUser;
+unit ModuleUser;
 
 interface
 
 uses
-  Classes, SysUtils, UModularSystem, UUser, UModuleBase, UWebPage;
+  Classes, SysUtils, UModularSystem, User, ModuleBase, UWebPage;
 
 type
@@ -30 +30 @@
 
 uses
-  UCore, USqlDatabase, UUserControlPage;
+  Core, USqlDatabase, UserControlPage;
 
 { TModuleUser }
@@ -84 +84 @@
     DbRows := TDbRows.Create;
 
-    Core.CommonDatabase.Query(DbRows,
+    Core.Core.CommonDatabase.Query(DbRows,
     'CREATE TABLE IF NOT EXISTS `User` (' +
     '  `Id` int(11) NOT NULL AUTO_INCREMENT,' +
@@ -96 +96 @@
     ') ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;');
 
-    Core.CommonDatabase.Query(DbRows,
+    Core.Core.CommonDatabase.Query(DbRows,
     'CREATE TABLE IF NOT EXISTS `UserOnline` (' +
     '  `Id` int(11) NOT NULL AUTO_INCREMENT,' +
@@ -110 +110 @@
     ') ENGINE=MEMORY  DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=1 ;');
 
-    Core.CommonDatabase.Query(DbRows,
+    Core.Core.CommonDatabase.Query(DbRows,
     'CREATE TABLE IF NOT EXISTS `PermissionGroup` (' +
     '  `Id` int(11) NOT NULL AUTO_INCREMENT,' +
@@ -117 +117 @@
     ') ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=1 ;');
 
-    Core.CommonDatabase.Query(DbRows,
+    Core.Core.CommonDatabase.Query(DbRows,
     'CREATE TABLE IF NOT EXISTS `PermissionGroupAssignment` (' +
     '  `Id` int(11) NOT NULL AUTO_INCREMENT,' +
@@ -129 +129 @@
     ') ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=1 ;');
 
-    Core.CommonDatabase.Query(DbRows,
+    Core.Core.CommonDatabase.Query(DbRows,
     'CREATE TABLE IF NOT EXISTS `PermissionOperation` (' +
     '  `Id` int(11) NOT NULL AUTO_INCREMENT,' +
@@ -143 +143 @@
     ') ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=1 ;');
 
-    Core.CommonDatabase.Query(DbRows,
+    Core.Core.CommonDatabase.Query(DbRows,
     '  CREATE TABLE IF NOT EXISTS `PermissionUserAssignment` (' +
     '  `Id` int(11) NOT NULL AUTO_INCREMENT,' +
@@ -155 +155 @@
     ') ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=1 ;');
 
-    Core.CommonDatabase.Query(DbRows,
+    Core.Core.CommonDatabase.Query(DbRows,
     'ALTER TABLE `PermissionGroupAssignment`' +
     '  ADD CONSTRAINT `PermissionGroupAssignment_ibfk_1` FOREIGN KEY (`Group`) REFERENCES `permissiongroup` (`Id`),' +
@@ -161 +161 @@
     '  ADD CONSTRAINT `PermissionGroupAssignment_ibfk_3` FOREIGN KEY (`AssignedOperation`) REFERENCES `permissionoperation` (`Id`);');
 
-    Core.CommonDatabase.Query(DbRows,
+    Core.Core.CommonDatabase.Query(DbRows,
     'ALTER TABLE `PermissionUserAssignment`' +
     '  ADD CONSTRAINT `PermissionUserAssignment_ibfk_1` FOREIGN KEY (`User`) REFERENCES `user` (`Id`),' +
@@ -180 +180 @@
     DbRows := TDbRows.Create;
 
-    Core.CommonDatabase.Query(DbRows, 'DROP TABLE IF EXISTS `PermissionUserAssignment`');
-    Core.CommonDatabase.Query(DbRows, 'DROP TABLE IF EXISTS `PermissionGroupAssignment`');
-    Core.CommonDatabase.Query(DbRows, 'DROP TABLE IF EXISTS `PermissionGroup`');
-    Core.CommonDatabase.Query(DbRows, 'DROP TABLE IF EXISTS `PermissionOperation`');
-    Core.CommonDatabase.Query(DbRows, 'DROP TABLE IF EXISTS `User`');
-    Core.CommonDatabase.Query(DbRows, 'DROP TABLE IF EXISTS `UserOnline`');
+    Core.Core.CommonDatabase.Query(DbRows, 'DROP TABLE IF EXISTS `PermissionUserAssignment`');
+    Core.Core.CommonDatabase.Query(DbRows, 'DROP TABLE IF EXISTS `PermissionGroupAssignment`');
+    Core.Core.CommonDatabase.Query(DbRows, 'DROP TABLE IF EXISTS `PermissionGroup`');
+    Core.Core.CommonDatabase.Query(DbRows, 'DROP TABLE IF EXISTS `PermissionOperation`');
+    Core.Core.CommonDatabase.Query(DbRows, 'DROP TABLE IF EXISTS `User`');
+    Core.Core.CommonDatabase.Query(DbRows, 'DROP TABLE IF EXISTS `UserOnline`');
   finally
     DbRows.Free;