Update schema version

etc/default_data

@@ -1,4 +1,3 @@
-INSERT INTO schemainfo (version) VALUES('1.0.5');
 
 INSERT INTO circuittype (name) VALUES ('DS3');
 INSERT INTO circuittype (name) VALUES ('xDSL');

lib/DBUTIL.pm

@@ -456,22 +456,25 @@ CREATE USER $CONFIG{DB_NETDOT_USER} WITH PASSWORD '$CONFIG{DB_NETDOT_PASS}' NOCR
 
 sub insert_default_data{
     my @data;
+
+    # Insert current schema version
+    # Get version number from library
+    my $version = `grep 'our \$VERSION' ../lib/Netdot.pm`;
+    chomp($version);
+    $version =~ s/.*\=\s+"(.*)";/$1/;
+    push @data, "INSERT INTO schemainfo (version) VALUES('$version');";
+
     my $file = $CONFIG{DEFAULT_DATA};
     if ( -f $file) {
-	print "Inserting default data\n";
 	open (DEFAULT, "<$file") or die "Can't open $file: $!";
 	foreach (<DEFAULT>) {
 	    next unless ( /\w+/ );
-	    if ( /INSERT INTO (\w+)/ ){
-		my $t = $1;
-		$t = lc($t);
-		s/INSERT INTO \w+/INSERT INTO $t/;
-	    }
 	    push @data, $_;
 	}	
     }else{
 	die "Can't find $file";
     }
+    print "Inserting default data\n";
     &db_query(\@data);
 }
 

upgrade/updatedb

@@ -51,11 +51,14 @@ if ( $schema_version eq '1.0.1' ){
 
     &upg_104_105();
 
+}elsif ( $schema_version eq '1.0.5' ){
+
+    &upg_105_106();
+
 }else{
     die "Unsupported version for this upgrade: $schema_version\n";
 }
 
-
 &processdata(\@statements);
 &dbdisconnect();
 
@@ -313,3 +316,8 @@ sub upg_104_105 {
     push @statements, "UPDATE schemainfo SET version='1.0.5' WHERE id=1;";
 
 }
+
+#########################################################################
+sub upg_105_106 {
+    push @statements, "UPDATE schemainfo SET version='1.0.6' WHERE id=1;",
+}