Ticket #40579: convert_to_postgresql.patch

jobs/PortIndex2PGSQL.tcl

@@ -1 +1 @@
 #!/opt/local/bin/tclsh
 # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
 #
-# PortIndex2MySQL.tcl
+# PortIndex2PGSQL.tcl
 # Kevin Van Vechten | kevin@opendarwin.org
 # 3-Oct-2002
 # Juan Manuel Palacios | jmpp@macports.org
 # 22-Nov-2007
+# Eric Le Lay | elelay@macports.org
+# 24-sept-2013
 # $Id$
 #
+# Copyright (c) 2013 Eric Le Lay, The Macports Project
 # Copyright (c) 2007 Juan Manuel Palacios, The MacPorts Project.
 # Copyright (c) 2003 Apple Inc.
 # Copyright (c) 2002 Kevin Van Vechten. 
@@ -39 +42 @@
 
 
 #####
-# The PortIndex2MySQL script populates a database with key information extracted
+# The PortIndex2PGSQL script populates a database with key information extracted
 # from the Portfiles in the ports tree pointed to by the sources.conf file in a
 # MacPorts installation, found by loading its macports1.0 tcl package and initializing
 # it with 'mportinit' below. Main use of the resulting database is providing live
@@ -68 +71 @@
 
 #set SPAM_LOVERS example@hostname.com
 
-set SUBJECT "PortIndex2MySQL run failure on $DATE"
+set SUBJECT "PortIndex2PGSQL run failure on $DATE"
 set FROM macports-mgr@lists.macosforge.org
 set HEADERS "To: $SPAM_LOVERS\r\nFrom: $FROM\r\nSubject: $SUBJECT\r\n\r\n"
 
@@ -160 +163 @@
 
 # SQL string escaping.
 proc sql_escape {str} {
-    regsub -all -- {'} $str {\\'} str
-    regsub -all -- {"} $str {\\"} str
-    regsub -all -- {\n} $str {\\n} str
+    regsub -all -- {'} $str {''} str
     return $str
 }
 
@@ -171 +172 @@
 
 # Check if there are any stray sibling jobs before moving on, bail in such case.
 if {[file exists $lockfile]} {
-    puts $runlog_fd "PortIndex2MySQL lock file found, is another job running?" 
+    puts $runlog_fd "PortIndex2PGSQL lock file found, is another job running?" 
     terminate 1
 } else {
     set lockfile_fd [open $lockfile a]
@@ -210 +211 @@
 set portsdb_user macports
 set passwdfile "/opt/local/share/macports/resources/portmgr/password_file"
 set portsdb_passwd [getpasswd $passwdfile]
-set portsdb_cmd [macports::findBinary mysql5]
+set portsdb_cmd [macports::findBinary psql]
 
 
 # Flat text file to which sql statements are written.
@@ -241 +242 @@
     # Initial creation of database tables: log, portfiles, categories, maintainers, dependencies, variants and platforms.
     # Do we need any other?
     puts $sqlfile_fd "DROP TABLE IF EXISTS log;"
-    puts $sqlfile_fd "CREATE TABLE log (activity VARCHAR(255), activity_time TIMESTAMP(14)) DEFAULT CHARSET=utf8;"
+    puts $sqlfile_fd "CREATE TABLE log (activity VARCHAR(255), activity_time TIMESTAMP);"
     
     puts $sqlfile_fd "DROP TABLE IF EXISTS portfiles;"
-    puts $sqlfile_fd "CREATE TABLE portfiles (name VARCHAR(255) PRIMARY KEY NOT NULL, path VARCHAR(255), version VARCHAR(255),  description TEXT) DEFAULT CHARSET=utf8;"
+    puts $sqlfile_fd "CREATE TABLE portfiles (name VARCHAR(255) PRIMARY KEY NOT NULL, path VARCHAR(255), version VARCHAR(255),  description TEXT);"
     
     puts $sqlfile_fd "DROP TABLE IF EXISTS categories;"
-    puts $sqlfile_fd "CREATE TABLE categories (portfile VARCHAR(255), category VARCHAR(255), is_primary INTEGER) DEFAULT CHARSET=utf8;"
+    puts $sqlfile_fd "CREATE TABLE categories (portfile VARCHAR(255), category VARCHAR(255), is_primary INTEGER);"
     
     puts $sqlfile_fd "DROP TABLE IF EXISTS maintainers;"
-    puts $sqlfile_fd "CREATE TABLE maintainers (portfile VARCHAR(255), maintainer VARCHAR(255), is_primary INTEGER) DEFAULT CHARSET=utf8;"
+    puts $sqlfile_fd "CREATE TABLE maintainers (portfile VARCHAR(255), maintainer VARCHAR(255), is_primary INTEGER);"
     
     puts $sqlfile_fd "DROP TABLE IF EXISTS dependencies;"
-    puts $sqlfile_fd "CREATE TABLE dependencies (portfile VARCHAR(255), library VARCHAR(255)) DEFAULT CHARSET=utf8;"
+    puts $sqlfile_fd "CREATE TABLE dependencies (portfile VARCHAR(255), library VARCHAR(255));"
     
     puts $sqlfile_fd "DROP TABLE IF EXISTS variants;"
-    puts $sqlfile_fd "CREATE TABLE variants (portfile VARCHAR(255), variant VARCHAR(255)) DEFAULT CHARSET=utf8;"
+    puts $sqlfile_fd "CREATE TABLE variants (portfile VARCHAR(255), variant VARCHAR(255));"
     
     puts $sqlfile_fd "DROP TABLE IF EXISTS platforms;"
-    puts $sqlfile_fd "CREATE TABLE platforms (portfile VARCHAR(255), platform VARCHAR(255)) DEFAULT CHARSET=utf8;"
+    puts $sqlfile_fd "CREATE TABLE platforms (portfile VARCHAR(255), platform VARCHAR(255));"
 
     puts $sqlfile_fd "DROP TABLE IF EXISTS licenses;"
-    puts $sqlfile_fd "CREATE TABLE licenses (portfile VARCHAR(255), license VARCHAR(255)) DEFAULT CHARSET=utf8;"
+    puts $sqlfile_fd "CREATE TABLE licenses (portfile VARCHAR(255), license VARCHAR(255));"
 } else {
     # if we are not creating tables from scratch, remove the old data
     puts $sqlfile_fd "TRUNCATE log;"
@@ -414 +415 @@
     terminate 1
 }
 
-if {[catch {exec -- $portsdb_cmd --host=$portsdb_host --user=$portsdb_user --password=$portsdb_passwd --database=$portsdb_name <@ $sqlfile_fd} errstr]} {
+# psql will read the password from the file all by itself...
+global env
+set env(PGPASSFILE) $passwdfile
+if {[catch {exec -- $portsdb_cmd -q --host=$portsdb_host $portsdb_name $portsdb_user <@ $sqlfile_fd} errstr]} {
     ui_error "${::errorCode}: $errstr"
     cleanup sqlfile lockfile
     terminate 1