Create vagrant packaging sample config

Changed ixed columns to text type
pgRouting · Jun 24, 2013 · 0dc0681 · 0dc0681
1 parent 44b462e
commit 0dc0681
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,7 @@ bin/*
 Sample/*
 .vagrant
 osm2pgrouting
+tools/vagrant/packaging.sh
 *.o
 *~
 .project

diff --git a/src/Export2DB.cpp b/src/Export2DB.cpp
@@ -80,7 +80,7 @@ void Export2DB::createTables()
         std::cout << "Nodes table created" << std::endl;
     }
 
-    std::string create_ways("CREATE TABLE " + tables_prefix + "ways (gid bigint, class_id integer not null, length double precision, name char(200), x1 double precision, y1 double precision, x2 double precision, y2 double precision, reverse_cost double precision, rule text, to_cost double precision, maxspeed_forward integer, maxspeed_backward integer, osm_id bigint, priority double precision DEFAULT 1);"
+    std::string create_ways("CREATE TABLE " + tables_prefix + "ways (gid bigint, class_id integer not null, length double precision, name text, x1 double precision, y1 double precision, x2 double precision, y2 double precision, reverse_cost double precision, rule text, to_cost double precision, maxspeed_forward integer, maxspeed_backward integer, osm_id bigint, priority double precision DEFAULT 1);"
             + " SELECT AddGeometryColumn('" + tables_prefix + "ways','the_geom',4326,'LINESTRING',2);");
 	result = PQexec(mycon, create_ways.c_str());
 	if (PQresultStatus(result) != PGRES_COMMAND_OK)
@@ -94,7 +94,7 @@ void Export2DB::createTables()
         std::cout << "Ways table created" << std::endl;
     }
 
-    std::string create_types("CREATE TABLE " + tables_prefix + "types (id integer PRIMARY KEY, name char(200));");
+    std::string create_types("CREATE TABLE " + tables_prefix + "types (id integer PRIMARY KEY, name text);");
 	result = PQexec(mycon, create_types.c_str());
 	if (PQresultStatus(result) != PGRES_COMMAND_OK)
     {
@@ -118,7 +118,7 @@ void Export2DB::createTables()
         std::cout << "Way_tag table created" << std::endl;
     }
 
-    std::string create_relations("CREATE TABLE " + tables_prefix + "relations (relation_id bigint, type_id integer, class_id integer, name character varying(200));");
+    std::string create_relations("CREATE TABLE " + tables_prefix + "relations (relation_id bigint, type_id integer, class_id integer, name text);");
 	result = PQexec(mycon, create_relations.c_str());
     if (PQresultStatus(result) != PGRES_COMMAND_OK)
     {
@@ -142,7 +142,7 @@ void Export2DB::createTables()
         std::cout << "Relation_ways table created" << std::endl;
     }
 
-    std::string create_classes("CREATE TABLE " + tables_prefix + "classes (id integer PRIMARY KEY, type_id integer, name char(200), cost double precision, priority double precision, default_maxspeed integer);");
+    std::string create_classes("CREATE TABLE " + tables_prefix + "classes (id integer PRIMARY KEY, type_id integer, name text, cost double precision, priority double precision, default_maxspeed integer);");
 	result = PQexec(mycon, create_classes.c_str());
     if (PQresultStatus(result) != PGRES_COMMAND_OK)
     {

diff --git a/tools/vagrant/packaging.sh b/tools/vagrant/packaging.sh
@@ -3,13 +3,13 @@
 # Vagrant - Virtualized Development 
 # Copyright(c) pgRouting Contributors
 #
-# Prepare packaging
+# Prepare packaging (sample)
 # ------------------------------------------------------------------------------
 
-echo "DEBEMAIL=mail@example.com" > ~/.bash_aliases
-echo "DEBFULLNAME='First Last'" >> ~/.bash_aliases
+echo "DEBEMAIL=daniel@georepublic.de" > ~/.bash_aliases
+echo "DEBFULLNAME='Daniel Kastl (Georepublic)'" >> ~/.bash_aliases
 
-git config --global user.name "First Last"
-git config --global user.email "mail@example.com"
+git config --global user.name "Daniel Kastl"
+git config --global user.email "daniel@georepublic.de"
 git config --global core.editor vim
 git config --global color.ui true
diff --git a/tools/vagrant/packaging.sh.sample b/tools/vagrant/packaging.sh.sample
@@ -0,0 +1,15 @@
+#!/bin/bash
+# ------------------------------------------------------------------------------
+# Vagrant - Virtualized Development 
+# Copyright(c) pgRouting Contributors
+#
+# Prepare packaging (sample)
+# ------------------------------------------------------------------------------
+
+echo "DEBEMAIL=mail@example.com" > ~/.bash_aliases
+echo "DEBFULLNAME='First Last'" >> ~/.bash_aliases
+
+git config --global user.name "First Last"
+git config --global user.email "mail@example.com"
+git config --global core.editor vim
+git config --global color.ui true