4 files changed, 43 insertions, 7 deletions
diff --git a/docs/sql/mysql-strict.sql b/docs/sql/mysql-strict.sql
index b8770ee..10efe1f 100644
--- a/docs/sql/mysql-strict.sql
+++ b/docs/sql/mysql-strict.sql
@@ -18,7 +18,7 @@ CREATE TABLE `gammu` (
 -- Dumping data for table `gammu`
 -- 
 
-INSERT INTO `gammu` (`Version`) VALUES (16);
+INSERT INTO `gammu` (`Version`) VALUES (17);
 
 -- --------------------------------------------------------
 
@@ -39,6 +39,7 @@ CREATE TABLE `inbox` (
   `ID` integer unsigned NOT NULL auto_increment,
   `RecipientID` text NOT NULL,
   `Processed` enum('false','true') NOT NULL default 'false',
+  `Status` integer NOT NULL default '-1',
   PRIMARY KEY `ID` (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 AUTO_INCREMENT=1 ;
 
@@ -74,6 +75,8 @@ CREATE TABLE `outbox` (
   `CreatorID` text NOT NULL,
   `Retries` int(3) default 0,
   `Priority` integer default 0,
+  `Status` enum('SendingOK','SendingOKNoReport','SendingError','DeliveryOK','DeliveryFailed','DeliveryPending','DeliveryUnknown','Error','Reserved') NOT NULL default 'Reserved',
+  `StatusCode` integer NOT NULL default '-1',
   PRIMARY KEY `ID` (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
 
@@ -99,6 +102,8 @@ CREATE TABLE `outbox_multipart` (
   `TextDecoded` text,
   `ID` integer unsigned NOT NULL default '0',
   `SequencePosition` integer NOT NULL default '1',
+  `Status` enum('SendingOK','SendingOKNoReport','SendingError','DeliveryOK','DeliveryFailed','DeliveryPending','DeliveryUnknown','Error','Reserved') NOT NULL default 'Reserved',
+  `StatusCode` integer NOT NULL default '-1',
   PRIMARY KEY (`ID`, `SequencePosition`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
 
@@ -161,6 +166,7 @@ CREATE TABLE `sentitems` (
   `TPMR` integer NOT NULL default '-1',
   `RelativeValidity` integer NOT NULL default '-1',
   `CreatorID` text NOT NULL,
+  `StatusCode` integer NOT NULL default '-1',
   PRIMARY KEY (`ID`, `SequencePosition`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
 
diff --git a/docs/sql/mysql.sql b/docs/sql/mysql.sql
index a342f6a..df94747 100644
--- a/docs/sql/mysql.sql
+++ b/docs/sql/mysql.sql
@@ -18,7 +18,7 @@ CREATE TABLE `gammu` (
 -- Dumping data for table `gammu`
 -- 
 
-INSERT INTO `gammu` (`Version`) VALUES (16);
+INSERT INTO `gammu` (`Version`) VALUES (17);
 
 -- --------------------------------------------------------
 
@@ -39,6 +39,7 @@ CREATE TABLE `inbox` (
   `ID` integer unsigned NOT NULL auto_increment,
   `RecipientID` text NOT NULL,
   `Processed` enum('false','true') NOT NULL default 'false',
+  `Status` integer NOT NULL default '-1',
   PRIMARY KEY `ID` (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 AUTO_INCREMENT=1 ;
 
@@ -74,6 +75,8 @@ CREATE TABLE `outbox` (
   `CreatorID` text NOT NULL,
   `Retries` int(3) default 0,
   `Priority` integer default 0,
+  `Status` enum('SendingOK','SendingOKNoReport','SendingError','DeliveryOK','DeliveryFailed','DeliveryPending','DeliveryUnknown','Error','Reserved') NOT NULL default 'Reserved',
+  `StatusCode` integer NOT NULL default '-1',
   PRIMARY KEY `ID` (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
 
@@ -99,6 +102,8 @@ CREATE TABLE `outbox_multipart` (
   `TextDecoded` text,
   `ID` integer unsigned NOT NULL default '0',
   `SequencePosition` integer NOT NULL default '1',
+  `Status` enum('SendingOK','SendingOKNoReport','SendingError','DeliveryOK','DeliveryFailed','DeliveryPending','DeliveryUnknown','Error','Reserved') NOT NULL default 'Reserved',
+  `StatusCode` integer NOT NULL default '-1',
   PRIMARY KEY (`ID`, `SequencePosition`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
 
@@ -161,6 +166,7 @@ CREATE TABLE `sentitems` (
   `TPMR` integer NOT NULL default '-1',
   `RelativeValidity` integer NOT NULL default '-1',
   `CreatorID` text NOT NULL,
+  `StatusCode` integer NOT NULL default '-1',
   PRIMARY KEY (`ID`, `SequencePosition`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
 
diff --git a/docs/sql/pgsql.sql b/docs/sql/pgsql.sql
index 7288d78..b549d11 100644
--- a/docs/sql/pgsql.sql
+++ b/docs/sql/pgsql.sql
@@ -61,7 +61,7 @@ CREATE TABLE gammu (
 -- Dumping data for table "gammu"
 -- 
 
-INSERT INTO gammu ("Version") VALUES (16);
+INSERT INTO gammu ("Version") VALUES (17);
 
 -- --------------------------------------------------------
 
@@ -82,6 +82,7 @@ CREATE TABLE inbox (
   "ID" serial PRIMARY KEY,
   "RecipientID" text NOT NULL,
   "Processed" boolean NOT NULL DEFAULT 'false',
+  "Status" integer NOT NULL DEFAULT '-1',
   CHECK ("Coding" IN 
   ('Default_No_Compression','Unicode_No_Compression','8bit','Default_Compression','Unicode_Compression')) 
 );
@@ -125,9 +126,14 @@ CREATE TABLE outbox (
   "CreatorID" text NOT NULL,
   "Retries" integer DEFAULT '0',
   "Priority" integer DEFAULT '0',
+  "Status" varchar(255) NOT NULL DEFAULT 'Reserved',
+  "StatusCode" integer NOT NULL DEFAULT '-1',
   CHECK ("Coding" IN 
   ('Default_No_Compression','Unicode_No_Compression','8bit','Default_Compression','Unicode_Compression')),
-  CHECK ("DeliveryReport" IN ('default','yes','no'))
+  CHECK ("DeliveryReport" IN ('default','yes','no')),
+  CHECK ("Status" IN 
+  ('SendingOK','SendingOKNoReport','SendingError','DeliveryOK','DeliveryFailed','DeliveryPending',
+  'DeliveryUnknown','Error','Reserved'))
 );
 
 CREATE INDEX outbox_date ON outbox("SendingDateTime", "SendingTimeOut");
@@ -159,9 +165,14 @@ CREATE TABLE outbox_multipart (
   "TextDecoded" text DEFAULT NULL,
   "ID" serial,
   "SequencePosition" integer NOT NULL DEFAULT '1',
+  "Status" varchar(255) NOT NULL DEFAULT 'Reserved',
+  "StatusCode" integer NOT NULL DEFAULT '-1',
   PRIMARY KEY ("ID", "SequencePosition"),
   CHECK ("Coding" IN 
-  ('Default_No_Compression','Unicode_No_Compression','8bit','Default_Compression','Unicode_Compression'))
+  ('Default_No_Compression','Unicode_No_Compression','8bit','Default_Compression','Unicode_Compression')),
+  CHECK ("Status" IN 
+  ('SendingOK','SendingOKNoReport','SendingError','DeliveryOK','DeliveryFailed','DeliveryPending',
+  'DeliveryUnknown','Error','Reserved'))
 );
 
 -- 
@@ -231,6 +242,7 @@ CREATE TABLE sentitems (
   "TPMR" integer NOT NULL DEFAULT '-1',
   "RelativeValidity" integer NOT NULL DEFAULT '-1',
   "CreatorID" text NOT NULL,
+  "StatusCode" integer NOT NULL DEFAULT '-1',
   CHECK ("Status" IN 
   ('SendingOK','SendingOKNoReport','SendingError','DeliveryOK','DeliveryFailed','DeliveryPending',
   'DeliveryUnknown','Error')),
diff --git a/docs/sql/sqlite.sql b/docs/sql/sqlite.sql
index f7c5915..cb05865 100644
--- a/docs/sql/sqlite.sql
+++ b/docs/sql/sqlite.sql
@@ -2,7 +2,7 @@ CREATE TABLE gammu (
   Version INTEGER NOT NULL DEFAULT '0' PRIMARY KEY
 );
 
-INSERT INTO gammu (Version) VALUES (16);
+INSERT INTO gammu (Version) VALUES (17);
 
 CREATE TABLE inbox (
   UpdatedInDB NUMERIC NOT NULL DEFAULT (datetime('now')),
@@ -17,6 +17,7 @@ CREATE TABLE inbox (
   ID INTEGER PRIMARY KEY AUTOINCREMENT,
   RecipientID TEXT NOT NULL,
   Processed TEXT NOT NULL DEFAULT 'false',
+  Status INTEGER NOT NULL DEFAULT '-1',
   CHECK (Coding IN 
   ('Default_No_Compression','Unicode_No_Compression','8bit','Default_Compression','Unicode_Compression')) 
 );
@@ -47,9 +48,14 @@ CREATE TABLE outbox (
   CreatorID TEXT NOT NULL,
   Retries INTEGER DEFAULT '0',
   Priority INTEGER DEFAULT '0',
+  Status TEXT NOT NULL DEFAULT 'Reserved',
+  StatusCode INTEGER NOT NULL DEFAULT '-1',
   CHECK (Coding IN 
   ('Default_No_Compression','Unicode_No_Compression','8bit','Default_Compression','Unicode_Compression')),
-  CHECK (DeliveryReport IN ('default','yes','no'))
+  CHECK (DeliveryReport IN ('default','yes','no')),
+  CHECK (Status IN 
+  ('SendingOK','SendingOKNoReport','SendingError','DeliveryOK','DeliveryFailed','DeliveryPending',
+  'DeliveryUnknown','Error','Reserved'))
 );
 
 CREATE INDEX outbox_date ON outbox(SendingDateTime, SendingTimeOut);
@@ -68,8 +74,13 @@ CREATE TABLE outbox_multipart (
   TextDecoded TEXT DEFAULT NULL,
   ID INTEGER,
   SequencePosition INTEGER NOT NULL DEFAULT '1',
+  Status TEXT NOT NULL DEFAULT 'Reserved',
+  StatusCode INTEGER NOT NULL DEFAULT '-1',
   CHECK (Coding IN 
   ('Default_No_Compression','Unicode_No_Compression','8bit','Default_Compression','Unicode_Compression')),
+  CHECK (Status IN 
+  ('SendingOK','SendingOKNoReport','SendingError','DeliveryOK','DeliveryFailed','DeliveryPending',
+  'DeliveryUnknown','Error','Reserved')),
  PRIMARY KEY (ID, SequencePosition)
 );
 
@@ -116,6 +127,7 @@ CREATE TABLE sentitems (
   TPMR INTEGER NOT NULL DEFAULT '-1',
   RelativeValidity INTEGER NOT NULL DEFAULT '-1',
   CreatorID TEXT NOT NULL,
+  StatusCode INTEGER NOT NULL DEFAULT '-1',
   CHECK (Status IN 
   ('SendingOK','SendingOKNoReport','SendingError','DeliveryOK','DeliveryFailed','DeliveryPending',
   'DeliveryUnknown','Error')),