From 246d2ab61993d4c05dd1d1382d0c4210963f896b Mon Sep 17 00:00:00 2001
From: bradymiller <bradymiller@users.sourceforge.net>
Date: Fri, 25 May 2012 18:04:33 -0700
Subject: [PATCH] several more TYPE->ENGINE conversions for mysql 5.5
 compliance

---
 contrib/forms/activity_impact/table.sql            | 2 +-
 contrib/forms/additional_studies/table.sql         | 2 +-
 contrib/forms/example/SQL.php                      | 2 +-
 contrib/forms/high_risk_screening_record/table.sql | 2 +-
 contrib/forms/xmlformgen/xslt/table.sql.xslt       | 4 ++--
 interface/forms/ankleinjury/table.sql              | 2 +-
 interface/forms/bronchitis/table.sql               | 2 +-
 interface/forms/note/table.sql                     | 2 +-
 interface/forms/prior_auth/table.sql               | 2 +-
 interface/forms/ros/table.sql                      | 2 +-
 10 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/contrib/forms/activity_impact/table.sql b/contrib/forms/activity_impact/table.sql
index 6ad0f6b7a..b155256c5 100644
--- a/contrib/forms/activity_impact/table.sql
+++ b/contrib/forms/activity_impact/table.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `form_activity_impact` (
   `activity`            tinyint(4)   NOT NULL DEFAULT 0,
   `activity_impact`           text NOT NULL DEFAULT '',
   PRIMARY KEY (id)
-) TYPE=InnoDB;
+) ENGINE=InnoDB;
diff --git a/contrib/forms/additional_studies/table.sql b/contrib/forms/additional_studies/table.sql
index 70550bcb1..290e31c37 100644
--- a/contrib/forms/additional_studies/table.sql
+++ b/contrib/forms/additional_studies/table.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `form_additional_studies` (
   `activity`            tinyint(4)   NOT NULL DEFAULT 0,
   `additional_studies`  text NOT NULL DEFAULT '',
   PRIMARY KEY (id)
-) TYPE=InnoDB;
+) ENGINE=InnoDB;
diff --git a/contrib/forms/example/SQL.php b/contrib/forms/example/SQL.php
index bb6f68a65..2a06ffebc 100644
--- a/contrib/forms/example/SQL.php
+++ b/contrib/forms/example/SQL.php
@@ -17,7 +17,7 @@ $create = "
 		KEY `id` (`id`),
 		`reason` longtext,
 		`cats` longtext
-	) TYPE=MyISAM
+	) ENGINE=MyISAM
 	";
 	
 echo "Connecting To SQL<br>";
diff --git a/contrib/forms/high_risk_screening_record/table.sql b/contrib/forms/high_risk_screening_record/table.sql
index b1cc697bc..805ece55c 100644
--- a/contrib/forms/high_risk_screening_record/table.sql
+++ b/contrib/forms/high_risk_screening_record/table.sql
@@ -23,4 +23,4 @@ record_13	longtext,
 
 
 PRIMARY KEY (id)
-) TYPE=MyISAM;
+) ENGINE=MyISAM;
diff --git a/contrib/forms/xmlformgen/xslt/table.sql.xslt b/contrib/forms/xmlformgen/xslt/table.sql.xslt
index 4dad33ad7..0225490dc 100644
--- a/contrib/forms/xmlformgen/xslt/table.sql.xslt
+++ b/contrib/forms/xmlformgen/xslt/table.sql.xslt
@@ -90,7 +90,7 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 </xsl:if>
 </xsl:for-each>
 <xsl:text disable-output-escaping="yes"><![CDATA[PRIMARY KEY (id)
-) TYPE=InnoDB;
+) ENGINE=InnoDB;
 ]]></xsl:text>
 <xsl:if test="//list">
 <xsl:for-each select="//list">
@@ -142,7 +142,7 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
     /* how to compare this item to items of the previous level */
     subordinaterelationship varchar(20) default NULL,
     PRIMARY KEY (id)
-) TYPE=InnoDB;
+) ENGINE=InnoDB;
 ]]></xsl:text>
 <xsl:for-each select="//signature">
 <!-- FIXME: how to add signatures only if they're not already there? -->
diff --git a/interface/forms/ankleinjury/table.sql b/interface/forms/ankleinjury/table.sql
index 7e6b2d8b2..96ac73b25 100755
--- a/interface/forms/ankleinjury/table.sql
+++ b/interface/forms/ankleinjury/table.sql
@@ -24,4 +24,4 @@ ankle_diagnosis4 varchar(255),
 ankle_plan longtext,
 ankle_additional_diagnisis longtext,
 PRIMARY KEY (id)
-) TYPE=MyISAM;
+) ENGINE=MyISAM;
diff --git a/interface/forms/bronchitis/table.sql b/interface/forms/bronchitis/table.sql
index bda7fc3cd..71f7558dd 100644
--- a/interface/forms/bronchitis/table.sql
+++ b/interface/forms/bronchitis/table.sql
@@ -89,4 +89,4 @@ diagnosis4_bronchitis_form varchar(255),
 bronchitis_additional_diagnosis longtext,
 bronchitis_treatment longtext,
 PRIMARY KEY (id)
-) TYPE=MyISAM;
+) ENGINE=MyISAM;
diff --git a/interface/forms/note/table.sql b/interface/forms/note/table.sql
index a8278dfcd..178049b57 100644
--- a/interface/forms/note/table.sql
+++ b/interface/forms/note/table.sql
@@ -11,4 +11,4 @@ message longtext,
 doctor varchar(255),
 date_of_signature datetime default NULL,
 PRIMARY KEY (id)
-) TYPE=MyISAM;
+) ENGINE=MyISAM;
diff --git a/interface/forms/prior_auth/table.sql b/interface/forms/prior_auth/table.sql
index cc25c7bb4..ce4b0cf20 100644
--- a/interface/forms/prior_auth/table.sql
+++ b/interface/forms/prior_auth/table.sql
@@ -6,4 +6,4 @@ CREATE TABLE `form_prior_auth` (
   `prior_auth_number` varchar(35) default NULL,
   `comments` varchar(255) default NULL,
   PRIMARY KEY  (`id`)
-) TYPE=MyISAM;
\ No newline at end of file
+) ENGINE=MyISAM;
diff --git a/interface/forms/ros/table.sql b/interface/forms/ros/table.sql
index fa9242df0..6362913f2 100755
--- a/interface/forms/ros/table.sql
+++ b/interface/forms/ros/table.sql
@@ -142,5 +142,5 @@ CREATE TABLE `form_ros` (
 	`hiv` varchar(3) NOT NULL default 'N/A',
 	`hai_status` varchar(3) NOT NULL default 'N/A',
 	PRIMARY KEY (id)
-	) type=InnoDB;
+	) ENGINE=InnoDB;
 
-- 
2.11.4.GIT