Skip to content

Commit 9a0f33a

Browse files
ChM40ChM40
committed
Clean depreciated Code
1 parent 656883e commit 9a0f33a

File tree

1 file changed

+1
-218
lines changed

1 file changed

+1
-218
lines changed

‎Sources/AuditTrail/AuditTrail.cs‎

Lines changed: 1 addition & 218 deletions
Original file line numberDiff line numberDiff line change
@@ -289,11 +289,7 @@ public AuditTrail(Exception ex, TextFormat textFormat = TextFormat.Txt)
289289

290290
// - - - - - -
291291

292-
#if SQLLITE
293-
[SQLite.Net.Attributes.PrimaryKey]
294-
#else
295292
[DB_Attributes.PrimaryKey]
296-
#endif
297293
public Int64 PK { get; set; }
298294

299295
public DateTime TimeStamp { get; set; }
@@ -302,11 +298,8 @@ public AuditTrail(Exception ex, TextFormat textFormat = TextFormat.Txt)
302298

303299
public ErrorLevel Level { get; set; }
304300

305-
#if SQLLITE
306-
[SQLite.Net.Attributes.Ignore]
307-
#else
301+
308302
[DB_Attributes.Ignore]
309-
#endif
310303
public string sLevel
311304
{
312305
get
@@ -330,11 +323,7 @@ public string sLevel
330323

331324
public Int64 Ticks { get; set; }
332325

333-
#if SQLLITE
334-
[SQLite.Net.Attributes.Ignore]
335-
#else
336326
[DB_Attributes.Ignore]
337-
#endif
338327
public TimeSpan Duration
339328
{
340329
get => new TimeSpan(Ticks);
@@ -360,11 +349,7 @@ public TimeSpan Duration
360349
#endif
361350
// - - - - - - - - - - - - - - - - - - - - - - - - - - - -
362351

363-
#if SQLLITE
364-
[SQLite.Net.Attributes.IgnoreAttribute]
365-
#else
366352
[DB_Attributes.Ignore]
367-
#endif
368353
public bool HasData { get { return !string.IsNullOrEmpty(DataIn) || !string.IsNullOrEmpty(DataOut); } }
369354

370355
// - - - - - -
@@ -408,205 +393,3 @@ public override string ToString()
408393
}
409394
}
410395
}
411-
412-
/* --------------------------------------------------------------------------------------------------------------------------------------
413-
414-
#if WPF
415-
using System.Windows.Media;
416-
#endif
417-
418-
namespace ZPF.Data
419-
{
420-
public class AuditTrail
421-
{
422-
423-
// - - - - - -
424-
425-
#region SQLCreate
426-
public static readonly string SQLCreate_SQLite =
427-
@"
428-
CREATE TABLE AuditTrail (
429-
PK INTEGER PRIMARY KEY AUTOINCREMENT,
430-
TimeStamp datetime NOT NULL,
431-
432-
Parent INTEGER NULL,
433-
IsBusiness bool DEFAULT 0,
434-
Level int NOT NULL,
435-
Tag varchar(128) NOT NULL,
436-
Application varchar(32) NULL,
437-
Message varchar(1024) NOT NULL,
438-
Ticks INTEGER NULL,
439-
440-
DataIn text NULL,
441-
DataInType varchar(128) NULL,
442-
DataOut text NULL,
443-
DataOutType varchar(128) NULL,
444-
445-
TerminalID varchar(128) NULL,
446-
TerminalIP varchar(128) NULL,
447-
448-
FKUser varchar(128) NULL,
449-
ItemID varchar(128) NULL,
450-
ItemType varchar(128) NULL
451-
);
452-
453-
CREATE VIEW [V_AuditTrail_Last100]
454-
AS
455-
SELECT TOP (100) PK, TimeStamp, [Level], Tag, Message, DataIn, DataOut, TerminalID, FKUser, ItemID, ItemType
456-
FROM AuditTrail
457-
ORDER BY PK DESC
458-
";
459-
460-
public static readonly string SQLCreate_MSSQL =
461-
@"
462-
CREATE TABLE [AuditTrail](
463-
[PK] bigint IDENTITY(1000,1) NOT NULL,
464-
[TimeStamp] datetime NOT NULL,
465-
466-
Parent bigint NULL,
467-
IsBusiness bit DEFAULT 0,
468-
[Level] int NOT NULL,
469-
[Tag] varchar(128) NOT NULL,
470-
Application varchar(32) NULL,
471-
[Message] varchar(1024) NOT NULL,
472-
Ticks bigint NULL,
473-
474-
[DataIn] text NULL,
475-
[DataInType] varchar(128) NULL,
476-
[DataOut] text NULL,
477-
[DataOutType] varchar(128) NULL,
478-
479-
[TerminalID] varchar(128) NULL,
480-
[TerminalIP] varchar(128) NULL,
481-
482-
[FKUser] varchar(128) NULL,
483-
[ItemID] varchar(128) NULL,
484-
[ItemType] varchar(128) NULL,
485-
CONSTRAINT PK_AuditTrail PRIMARY KEY(PK)
486-
);
487-
488-
ALTER TABLE [AuditTrail] ADD CONSTRAINT [DF_AuditTrail_TimeStamp] DEFAULT (getdate()) FOR [TimeStamp];
489-
490-
CREATE INDEX [IX_AuditTrail_Tag] ON [AuditTrail] ( [Tag] ASC );
491-
CREATE INDEX [IX_AuditTrail_TS] ON [AuditTrail] ( [TimeStamp] ASC );
492-
CREATE INDEX [IX_AuditTrail_LEVEL] ON [AuditTrail] ( [Level] ASC );
493-
CREATE INDEX [IX_AuditTrail_APP] ON [AuditTrail] ( [Application] ASC );
494-
495-
CREATE VIEW [V_AuditTrail_Last100]
496-
AS
497-
SELECT TOP (100) PK, TimeStamp, [Level], Tag, Message, DataIn, DataOut, TerminalID, FKUser, ItemID, ItemType
498-
FROM AuditTrail
499-
ORDER BY PK DESC;
500-
";
501-
502-
public static readonly string SQLCreate_MYSQL =
503-
@"
504-
CREATE TABLE `AuditTrail` (
505-
`PK` bigint(20) NOT NULL AUTO_INCREMENT,
506-
`TimeStamp` DATETIME NOT NULL,
507-
508-
`Parent` bigint(20) NULL,
509-
`IsBusiness` bool DEFAULT 0,
510-
`Level` INT(11) NOT NULL,
511-
`Tag` VARCHAR(128) NOT NULL,
512-
`Application` varchar(32) NULL,
513-
`Message` VARCHAR(1024) NOT NULL,
514-
`Ticks` bigint(20) NULL,
515-
516-
`DataIn` TEXT NULL,
517-
`DataInType` VARCHAR(128) NULL DEFAULT NULL,
518-
`DataOut` TEXT NULL,
519-
`DataOutType` VARCHAR(128) NULL DEFAULT NULL,
520-
521-
`TerminalID` VARCHAR(128) NULL DEFAULT NULL,
522-
`TerminalIP` VARCHAR(128) NULL DEFAULT NULL,
523-
524-
`FKUser` VARCHAR(128) NULL DEFAULT NULL,
525-
`ItemID` VARCHAR(128) NULL DEFAULT NULL,
526-
`ItemType` VARCHAR(128) NULL DEFAULT NULL,
527-
528-
PRIMARY KEY (`PK`),
529-
INDEX `Tag` (`Tag`),
530-
INDEX `TimeStamp` (`TimeStamp`)
531-
)
532-
COLLATE='latin1_swedish_ci'
533-
ENGINE=InnoDB;
534-
";
535-
536-
537-
public static readonly string SQLCreate_PGSQL =
538-
@"
539-
540-
CREATE TABLE public.audittrail (
541-
pk BIGSERIAL,
542-
"timestamp" TIMESTAMP WITHOUT TIME ZONE NOT NULL,
543-
parent BIGINT,
544-
isbusiness BOOLEAN DEFAULT false,
545-
level INTEGER NOT NULL,
546-
tag VARCHAR(128) NOT NULL,
547-
application VARCHAR(32),
548-
message VARCHAR(1024) NOT NULL,
549-
ticks BIGINT,
550-
datain TEXT,
551-
dataintype VARCHAR(128),
552-
dataout TEXT,
553-
dataouttype VARCHAR(128),
554-
terminalid VARCHAR(128),
555-
terminalip VARCHAR(128),
556-
fkuser VARCHAR(128),
557-
itemid VARCHAR(128),
558-
itemtype VARCHAR(128),
559-
timestampapp TIMESTAMP WITHOUT TIME ZONE,
560-
fkstructure BIGINT DEFAULT '-1'::integer,
561-
timestampdb TIMESTAMP WITHOUT TIME ZONE DEFAULT now(),
562-
CONSTRAINT pk_audittrail PRIMARY KEY(pk),
563-
CONSTRAINT audittrail_fk FOREIGN KEY (fkstructure)
564-
REFERENCES public.structure(pk)
565-
ON DELETE NO ACTION
566-
ON UPDATE NO ACTION
567-
NOT DEFERRABLE
568-
)
569-
WITH (oids = true);
570-
571-
CREATE INDEX ix_audittrail_app ON public.audittrail
572-
USING btree (application COLLATE pg_catalog."default");
573-
574-
CREATE INDEX ix_audittrail_level ON public.audittrail
575-
USING btree (level);
576-
577-
CREATE INDEX ix_audittrail_tag ON public.audittrail
578-
USING btree (tag COLLATE pg_catalog."default");
579-
580-
CREATE INDEX ix_audittrail_ts ON public.audittrail
581-
USING btree ("timestamp");
582-
";
583-
584-
#endregion
585-
586-
587-
// - - - - - -
588-
589-
public AuditTrailList Copy2AuditTrailList()
590-
{
591-
AuditTrailList o = new AuditTrailList();
592-
o.CopyPropertyValues(this, true);
593-
return o;
594-
}
595-
}
596-
597-
public class AuditTrailList : AuditTrail
598-
{
599-
public string Login { get; set; }
600-
601-
// - - - - - -
602-
603-
public AuditTrail Copy2AuditTrail()
604-
{
605-
AuditTrail o = new AuditTrail();
606-
o.CopyPropertyValues(this, true);
607-
return o;
608-
}
609-
}
610-
}
611-
612-
*/

0 commit comments

Comments
 (0)