Commit bb366115 authored by Leigh B Stoller's avatar Leigh B Stoller
Browse files

Fix for "text" which is the same as "text default NULL".

parent 952d847c
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# #
# EMULAB-COPYRIGHT # EMULAB-COPYRIGHT
# Copyright (c) 2000-2002, 2006, 2007, 2010 University of Utah and the Flux Group. # Copyright (c) 2000-2011 University of Utah and the Flux Group.
# All rights reserved. # All rights reserved.
# #
...@@ -251,6 +251,12 @@ sub read_schema($) { ...@@ -251,6 +251,12 @@ sub read_schema($) {
my ($name, $definition) = ($1, $2); my ($name, $definition) = ($1, $2);
debug("Found column $name with type $definition\n"); debug("Found column $name with type $definition\n");
# Canonicalize.
if ($definition eq "text") {
debug(" Converting to 'text default NULL'\n");
$definition = "text default NULL";
}
# Change timestamp(14) to timestamp! # Change timestamp(14) to timestamp!
$definition =~ s/timestamp NOT NULL default.*/timestamp NOT NULL/g; $definition =~ s/timestamp NOT NULL default.*/timestamp NOT NULL/g;
$definition =~ s/timestamp\(14\)/timestamp/g; $definition =~ s/timestamp\(14\)/timestamp/g;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment