From: <min...@us...> - 2006-08-31 20:23:39
|
Revision: 14438 http://svn.sourceforge.net/gallery/?rev=14438&view=rev Author: mindless Date: 2006-08-31 13:23:32 -0700 (Thu, 31 Aug 2006) Log Message: ----------- Fix for db2: no quotes around default for numeric column.. DEFAULT 0 not DEFAULT '0' Modified Paths: -------------- trunk/gallery2/lib/tools/bin/generate-sql.php trunk/gallery2/modules/core/classes/GalleryStorage/schema.tpl Modified: trunk/gallery2/lib/tools/bin/generate-sql.php =================================================================== --- trunk/gallery2/lib/tools/bin/generate-sql.php 2006-08-31 17:50:52 UTC (rev 14437) +++ trunk/gallery2/lib/tools/bin/generate-sql.php 2006-08-31 20:23:32 UTC (rev 14438) @@ -958,6 +958,23 @@ 'TIMESTAMP-' => 'datestamp')); } + function columnDefinition($child, $includeNotNull=true, $includeDefault=true) { + $output = parent::columnDefinition($child, $includeNotNull, false); + + /* DB2 -> Make sure DEFAULT expression doesn't have quotes for numeric */ + if ($includeDefault) { + $defaultValue = $this->getDefaultElement($child); + if (isset($defaultValue)) { + if ($child[1]['content'] != 'INTEGER' && $child[1]['content'] != 'BOOLEAN') { + $defaultValue = "'$defaultValue'"; + } + $output .= " DEFAULT $defaultValue"; + } + } + + return $output; + } + function createSql($node, $index, $lastPeerIndex, $parent) { $output = ''; Modified: trunk/gallery2/modules/core/classes/GalleryStorage/schema.tpl =================================================================== --- trunk/gallery2/modules/core/classes/GalleryStorage/schema.tpl 2006-08-31 17:50:52 UTC (rev 14437) +++ trunk/gallery2/modules/core/classes/GalleryStorage/schema.tpl 2006-08-31 20:23:32 UTC (rev 14438) @@ -2732,7 +2732,7 @@ # A_GalleryAccessMap_1.0 DROP INDEX DB_TABLE_PREFIXAccessMap_33666; -ALTER TABLE DB_TABLE_PREFIXAccessMap ADD COLUMN DB_COLUMN_PREFIXuserOrGroupId INTEGER DEFAULT '0' NOT NULL; +ALTER TABLE DB_TABLE_PREFIXAccessMap ADD COLUMN DB_COLUMN_PREFIXuserOrGroupId INTEGER NOT NULL DEFAULT 0; UPDATE DB_TABLE_PREFIXSchema SET DB_COLUMN_PREFIXmajor=1, DB_COLUMN_PREFIXminor=1 @@ -2897,7 +2897,7 @@ WHERE DB_COLUMN_PREFIXname='User' AND DB_COLUMN_PREFIXmajor=1 AND DB_COLUMN_PREFIXminor=0; # A_GalleryUser_1.1 -ALTER TABLE DB_TABLE_PREFIXUser ADD COLUMN DB_COLUMN_PREFIXlocked SMALLINT DEFAULT '0'; +ALTER TABLE DB_TABLE_PREFIXUser ADD COLUMN DB_COLUMN_PREFIXlocked SMALLINT DEFAULT 0; UPDATE DB_TABLE_PREFIXSchema SET DB_COLUMN_PREFIXmajor=1, DB_COLUMN_PREFIXminor=2 @@ -3550,7 +3550,7 @@ DB_COLUMN_PREFIXhashedPassword VARCHAR(128), DB_COLUMN_PREFIXemail VARCHAR(255), DB_COLUMN_PREFIXlanguage VARCHAR(128), - DB_COLUMN_PREFIXlocked SMALLINT DEFAULT '0' + DB_COLUMN_PREFIXlocked SMALLINT DEFAULT 0 ); ALTER TABLE DB_TABLE_PREFIXUser ADD PRIMARY KEY (DB_COLUMN_PREFIXid); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |