From e3a53ffc7abdeeaf31d1d378695c1cba883098ac Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Mon, 17 Dec 2007 22:19:23 +0000 Subject: Remove now redundant mysql files from share/sql and replace with mysql_README.txt --- share/sql/mysql-agents.sql | 24 ------------------------ share/sql/mysql-inventoryfolders.sql | 34 ---------------------------------- share/sql/mysql-inventoryitems.sql | 32 -------------------------------- share/sql/mysql-logs.sql | 10 ---------- share/sql/mysql-regions.sql | 30 ------------------------------ share/sql/mysql-reservations.txt | 16 ---------------- share/sql/mysql-users.sql | 34 ---------------------------------- share/sql/mysql_README.txt | 12 ++++++++++++ 8 files changed, 12 insertions(+), 180 deletions(-) delete mode 100644 share/sql/mysql-agents.sql delete mode 100644 share/sql/mysql-inventoryfolders.sql delete mode 100644 share/sql/mysql-inventoryitems.sql delete mode 100644 share/sql/mysql-logs.sql delete mode 100644 share/sql/mysql-regions.sql delete mode 100644 share/sql/mysql-reservations.txt delete mode 100644 share/sql/mysql-users.sql create mode 100644 share/sql/mysql_README.txt diff --git a/share/sql/mysql-agents.sql b/share/sql/mysql-agents.sql deleted file mode 100644 index 8194ca9..0000000 --- a/share/sql/mysql-agents.sql +++ /dev/null @@ -1,24 +0,0 @@ -SET FOREIGN_KEY_CHECKS=0; --- ---------------------------- --- Table structure for agents --- ---------------------------- -CREATE TABLE `agents` ( - `UUID` varchar(36) NOT NULL, - `sessionID` varchar(36) NOT NULL, - `secureSessionID` varchar(36) NOT NULL, - `agentIP` varchar(16) NOT NULL, - `agentPort` int(11) NOT NULL, - `agentOnline` tinyint(4) NOT NULL, - `loginTime` int(11) NOT NULL, - `logoutTime` int(11) NOT NULL, - `currentRegion` varchar(36) NOT NULL, - `currentHandle` bigint(20) unsigned NOT NULL, - `currentPos` varchar(64) NOT NULL, - PRIMARY KEY (`UUID`), - UNIQUE KEY `session` (`sessionID`), - UNIQUE KEY `ssession` (`secureSessionID`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; - --- ---------------------------- --- Records --- ---------------------------- diff --git a/share/sql/mysql-inventoryfolders.sql b/share/sql/mysql-inventoryfolders.sql deleted file mode 100644 index af6ee08..0000000 --- a/share/sql/mysql-inventoryfolders.sql +++ /dev/null @@ -1,34 +0,0 @@ --- phpMyAdmin SQL Dump --- version 2.11.2.2deb1 --- http://www.phpmyadmin.net --- --- Host: localhost --- Generation Time: Nov 23, 2007 at 10:19 PM --- Server version: 5.0.45 --- PHP Version: 5.2.4-2 - -SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO"; - --- --- Database: `opensim` --- - --- -------------------------------------------------------- - --- --- Table structure for table `inventoryfolders` --- - -CREATE TABLE IF NOT EXISTS `inventoryfolders` ( - `folderID` varchar(36) NOT NULL default '', - `agentID` varchar(36) default NULL, - `parentFolderID` varchar(36) default NULL, - `folderName` varchar(64) default NULL, - PRIMARY KEY (`folderID`), - KEY `owner` (`agentID`), - KEY `parent` (`parentFolderID`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; - --- --- Dumping data for table `inventoryfolders` --- diff --git a/share/sql/mysql-inventoryitems.sql b/share/sql/mysql-inventoryitems.sql deleted file mode 100644 index dea12e8..0000000 --- a/share/sql/mysql-inventoryitems.sql +++ /dev/null @@ -1,32 +0,0 @@ --- PHP Version: 5.2.4-2 - -SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO"; - --- --- Database: `opensim` --- - --- -------------------------------------------------------- - --- --- Table structure for table `inventoryitems` --- - -CREATE TABLE IF NOT EXISTS `inventoryitems` ( - `inventoryID` varchar(36) NOT NULL default '', - `assetID` varchar(36) default NULL, - `type` int(11) default NULL, - `parentFolderID` varchar(36) default NULL, - `avatarID` varchar(36) default NULL, - `inventoryName` varchar(64) default NULL, - `inventoryDescription` varchar(64) default NULL, - `inventoryNextPermissions` int(10) unsigned default NULL, - `inventoryCurrentPermissions` int(10) unsigned default NULL, - PRIMARY KEY (`inventoryID`), - KEY `owner` (`avatarID`), - KEY `folder` (`parentFolderID`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; - --- --- Dumping data for table `inventoryitems` --- diff --git a/share/sql/mysql-logs.sql b/share/sql/mysql-logs.sql deleted file mode 100644 index 05c19e8..0000000 --- a/share/sql/mysql-logs.sql +++ /dev/null @@ -1,10 +0,0 @@ -CREATE TABLE `logs` ( - `logID` int(10) unsigned NOT NULL auto_increment, - `target` varchar(36) default NULL, - `server` varchar(64) default NULL, - `method` varchar(64) default NULL, - `arguments` varchar(255) default NULL, - `priority` int(11) default NULL, - `message` text, - PRIMARY KEY (`logID`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 \ No newline at end of file diff --git a/share/sql/mysql-regions.sql b/share/sql/mysql-regions.sql deleted file mode 100644 index 9301af2..0000000 --- a/share/sql/mysql-regions.sql +++ /dev/null @@ -1,30 +0,0 @@ -CREATE TABLE `regions` ( - `uuid` varchar(36) NOT NULL, - `regionHandle` bigint(20) unsigned NOT NULL, - `regionName` varchar(32) default NULL, - `regionRecvKey` varchar(128) default NULL, - `regionSendKey` varchar(128) default NULL, - `regionSecret` varchar(128) default NULL, - `regionDataURI` varchar(255) default NULL, - `serverIP` varchar(64) default NULL, - `serverPort` int(10) unsigned default NULL, - `serverURI` varchar(255) default NULL, - `locX` int(10) unsigned default NULL, - `locY` int(10) unsigned default NULL, - `locZ` int(10) unsigned default NULL, - `eastOverrideHandle` bigint(20) unsigned default NULL, - `westOverrideHandle` bigint(20) unsigned default NULL, - `southOverrideHandle` bigint(20) unsigned default NULL, - `northOverrideHandle` bigint(20) unsigned default NULL, - `regionAssetURI` varchar(255) default NULL, - `regionAssetRecvKey` varchar(128) default NULL, - `regionAssetSendKey` varchar(128) default NULL, - `regionUserURI` varchar(255) default NULL, - `regionUserRecvKey` varchar(128) default NULL, - `regionUserSendKey` varchar(128) default NULL, `regionMapTexture` varchar(36) default NULL, - `serverHttpPort` int(10) default NULL, `serverRemotingPort` int(10) default NULL, - PRIMARY KEY (`uuid`), - KEY `regionName` (`regionName`), - KEY `regionHandle` (`regionHandle`), - KEY `overrideHandles` (`eastOverrideHandle`,`westOverrideHandle`,`southOverrideHandle`,`northOverrideHandle`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED diff --git a/share/sql/mysql-reservations.txt b/share/sql/mysql-reservations.txt deleted file mode 100644 index 9dab31d..0000000 --- a/share/sql/mysql-reservations.txt +++ /dev/null @@ -1,16 +0,0 @@ -CREATE TABLE `reservations` ( - `resID` int(10) unsigned NOT NULL auto_increment, - `userUUID` varchar(36) default NULL, - `gridSendKey` varchar(64) default NULL, - `gridRecvKey` varchar(64) default NULL, - `resName` varchar(255) default NULL, - `resCompany` varchar(128) default NULL, - `resXMin` int(10) unsigned default NULL, - `resXMax` int(10) unsigned default NULL, - `resYMin` int(10) unsigned default NULL, - `resYMax` int(10) unsigned default NULL, - `status` int(10) unsigned default NULL, - PRIMARY KEY (`resID`), - KEY `resident` (`userUUID`), - KEY `coords` (`resXMin`,`resXMax`,`resYMin`,`resYMax`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=32 ; diff --git a/share/sql/mysql-users.sql b/share/sql/mysql-users.sql deleted file mode 100644 index 5ce4d1c..0000000 --- a/share/sql/mysql-users.sql +++ /dev/null @@ -1,34 +0,0 @@ -SET FOREIGN_KEY_CHECKS=0; --- ---------------------------- --- Table structure for users --- ---------------------------- -CREATE TABLE `users` ( - `UUID` varchar(36) NOT NULL default '', - `username` varchar(32) NOT NULL, - `lastname` varchar(32) NOT NULL, - `passwordHash` varchar(32) NOT NULL, - `passwordSalt` varchar(32) NOT NULL, - `homeRegion` bigint(20) unsigned default NULL, - `homeLocationX` float default NULL, - `homeLocationY` float default NULL, - `homeLocationZ` float default NULL, - `homeLookAtX` float default NULL, - `homeLookAtY` float default NULL, - `homeLookAtZ` float default NULL, - `created` int(11) NOT NULL, - `lastLogin` int(11) NOT NULL, - `userInventoryURI` varchar(255) default NULL, - `userAssetURI` varchar(255) default NULL, - `profileCanDoMask` int(10) unsigned default NULL, - `profileWantDoMask` int(10) unsigned default NULL, - `profileAboutText` text, - `profileFirstText` text, - `profileImage` varchar(36) default NULL, - `profileFirstImage` varchar(36) default NULL, - PRIMARY KEY (`UUID`), - UNIQUE KEY `usernames` (`username`,`lastname`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; - --- ---------------------------- --- Records --- ---------------------------- diff --git a/share/sql/mysql_README.txt b/share/sql/mysql_README.txt new file mode 100644 index 0000000..6907c7a --- /dev/null +++ b/share/sql/mysql_README.txt @@ -0,0 +1,12 @@ +mysql_README + +This directory used to contain sql files for mysql that needed to be manually sourced in order to +set up the database tables required by OpenSim. This is no longer necessary - OpenSim now sets +up these tables automatically. All you need to do is +create the database that OpenSim is to use and set the configuration in bin/mysql_connection.ini +(using bin/mysql_connection.ini.example as a reference). + +If you do need to source the mysql files manually, they can be found in OpenSim/Framework/Data.MySQL/Resources + +Please note that if you are setting up a MSSQL database, the appropriate mssql files do still need to be +executed manually. -- cgit v1.1