Commit cb5996ca authored by Prasad's avatar Prasad
Browse files

Rolled back fix in adodb lib (as it failed to work with MySQL 5.5.x).

Adjusted schema to make it friendly to STRICT_TRANS_TABLE mode.
parent 59d831f0
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -750,7 +750,8 @@ class ADODB_DataDict {
			if ($fdefts) {
				if (substr($this->connection->databaseType,0,5) == 'mysql') {
					$ftype = 'TIMESTAMP';
					$fdefault = ' CURRENT_TIMESTAMP'; /* STRICT_TRANS_TABLES fix */
					// Fix works only for MySQL 5.6 (which allows one or more column to have default timestamp
					// $fdefault = ' CURRENT_TIMESTAMP'; /* STRICT_TRANS_TABLES fix */
				} else {
					$fdefault = $this->connection->sysTimeStamp;
				}
+6 −0
Original line number Diff line number Diff line
@@ -28,8 +28,11 @@
			<deftimestamp />
		</field>
		<field name="date_modified" type="T">
			<!-- Troublesome with STRICT_TRANS_TABLE mode depends on MySQL 5.5 or 5.6+ -->
			<!--
			<notnull />
			<deftimestamp />
			-->
		</field>
		<field name="modified_user_id" type="C" size="36" />
		<field name="title" type="C" size="50" />
@@ -1780,8 +1783,11 @@
			<deftimestamp />
		</field>
		<field name="date_modified" type="T">
            <!-- Troublesome with STRICT_TRANS_TABLE mode depends on MySQL 5.5 or 5.6+ -->
			<!--
			<notnull />
			<deftimestamp />
			-->
		</field>
		<field name="assigned_user_id" type="C" size="36" />
		<field name="is_published" type="C" size="3">