* Align new fields upgrade sql to have the same 'not null' and default settings as when an inventoryitems table is newly created

* Normalize logging titles in database code, though this doesn't yet cover invoking code

2 files changed, 7 insertions, 7 deletions

diff --git a/OpenSim/Data/MySQL/Resources/CreateItemsTable.sql b/OpenSim/Data/MySQL/Resources/CreateItemsTable.sql
index 24ebccd..ffdbe17 100644
--- a/OpenSim/Data/MySQL/Resources/CreateItemsTable.sql
+++ b/OpenSim/Data/MySQL/Resources/CreateItemsTable.sql
@@ -12,12 +12,12 @@ CREATE TABLE `inventoryitems` (
   `creatorID` varchar(36) default NULL,
   `inventoryBasePermissions` int(10) unsigned NOT NULL default 0,
   `inventoryEveryOnePermissions` int(10) unsigned NOT NULL default 0,
-  `salePrice` int(11) default NULL,
-  `saleType` tinyint(4) default NULL,
-  `creationDate` int(11) default NULL,
-  `groupID` varchar(36) default NULL,
-  `groupOwned` tinyint(4) default NULL,
-  `flags` int(11) unsigned default NULL,
+  `salePrice` int(11) NOT NULL default 0,
+  `saleType` tinyint(4) NOT NULL default 0,
+  `creationDate` int(11) NOT NULL default 0,
+  `groupID` varchar(36) NOT NULL default '00000000-0000-0000-0000-000000000000',
+  `groupOwned` tinyint(4) NOT NULL default 0,
+  `flags` int(11) unsigned NOT NULL default 0,
   PRIMARY KEY  (`inventoryID`),
   KEY `owner` (`avatarID`),
   KEY `folder` (`parentFolderID`)
diff --git a/OpenSim/Data/MySQL/Resources/UpgradeItemsTableToVersion3.sql b/OpenSim/Data/MySQL/Resources/UpgradeItemsTableToVersion3.sql
index 5bd6994..b4108ab 100644
--- a/OpenSim/Data/MySQL/Resources/UpgradeItemsTableToVersion3.sql
+++ b/OpenSim/Data/MySQL/Resources/UpgradeItemsTableToVersion3.sql
@@ -1,7 +1,7 @@
 ALTER TABLE `inventoryitems` 
         ADD COLUMN `salePrice` int(11) NOT NULL default 0,
         ADD COLUMN `saleType` tinyint(4) NOT NULL default 0,
-        ADD COLUMN `creationDate` int(11) NOT NULL default 3000,
+        ADD COLUMN `creationDate` int(11) NOT NULL default 0,
         ADD COLUMN `groupID` varchar(36) NOT NULL default '00000000-0000-0000-0000-000000000000',
         ADD COLUMN `groupOwned` tinyint(4) NOT NULL default 0,
         ADD COLUMN `flags` int(11) unsigned NOT NULL default 0,