Tim Landscheidt has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/340233 )
Change subject: Port sql to Python
......................................................................
Port sql to Python
Change-Id: I038d14fb73a9bfe633003a6ab89d712510f61f61
---
M debian/changelog
M debian/control
M misctools/sql
M tox.ini
4 files changed, 98 insertions(+), 115 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/labs/toollabs
refs/changes/33/340233/1
diff --git a/debian/changelog b/debian/changelog
index 0d8b543..fe312ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+toollabs (1.20~dev) trusty; urgency=medium
+
+ * Port sql to Python
+
+ -- Tim Landscheidt <t...@tim-landscheidt.de> Mon, 27 Feb 2017 18:13:24 +0000
+
toollabs (1.19) trusty; urgency=medium
* Remove toolwatcher
diff --git a/debian/control b/debian/control
index 3c9c82c..8c6dc30 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@
Package: misctools
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}, ${python:Depends},
- mariadb-client-core-5.5, python, python-mysql.connector
+ mariadb-client-core-5.5, python, python3, python-mysql.connector
Description: Miscellaneous Labs-specific tools
Miscellaneous Labs-specific Tools used on Tool Labs
diff --git a/misctools/sql b/misctools/sql
index 65f5314..9621886 100755
--- a/misctools/sql
+++ b/misctools/sql
@@ -1,120 +1,93 @@
-#!/bin/bash
+#!/usr/bin/python3
+#
+# Copyright (C) 2017 Tim Landscheidt
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# this tool allow you to connect quickly to sql database
-# it should work for all newbies
+import argparse
+import logging
+import os
+import os.path
+import socket
+import sys
-verbose=0
+parser = argparse.ArgumentParser(description='Connect to or run SQL query ' +
+ 'on replica or Tools database server',
+ epilog='Report bugs to Phabricator: ' +
+ 'https://phabricator.wikimedia.org')
+parser.add_argument('-v', '--verbose', action='store_true', default=False,
+ help='show debugging information')
+parser.add_argument('dbname', metavar='DATABASE NAME|WIKI NAME',
+ help='for example commonswiki_p or enwiki')
+parser.add_argument('sqlquery', metavar='SQL QUERY', nargs=argparse.REMAINDER,
+ help='SQL query; multiple words will be joined by spaces')
-function Log {
-if [ $verbose -eq 1 ];then
- echo "$1"
-fi
-}
+args = parser.parse_args()
-if [ $# -lt 1 ];then
- echo "Usage: \"sql <database name|wiki name> [-vh]\" type sql --help for
more help"
- exit 0
-fi
+# Set up logging.
+logging.basicConfig(stream=sys.stderr,
+ format='%(message)s',
+ level=logging.DEBUG if args.verbose else logging.WARN)
-if [ "$1" = "-h" ] || [ "$1" == "--help" ];then
- echo "Usage: sql <database>[_p] [-vh] [command(s)]"
- echo
- echo "This tool allows you to easily open a connection to sql database
without having to provide the credentials or a database host server"
- echo "Example: sql frwiki_p"
- echo
- echo "Parameters:"
- echo " -v: verbose - produce various information about the resolution
of db"
- echo
- echo "Report bugs to phabricator: https://phabricator.wikimedia.org";
- exit 0
-fi
+exec_args = ['mysql']
-for i
-do
- if [ "$i" = "-v" ] || [ "$i" = "--verbose" ]
- then
- verbose=1
- fi
-done
+if os.path.isfile(os.path.expanduser('~/replica.my.cnf')):
+ exec_args += ['--defaults-file=' + os.path.expanduser('~/replica.my.cnf')]
+elif not(os.path.isfile(os.path.expanduser('~/.my.cnf'))):
+ exec_args += ['-p']
+ logging.warn('There is no configuration file for mysql to use, ' +
+ 'you will probably be unable to access the database')
-if [ ! -f ~/replica.my.cnf ] && [ ! -f ~/.my.cnf ]
-then
- Log "WARNING: There is no configuration file for mysql to use, you will
probably be unable to access the database"
-fi
+# These aliases have historically been supported; no new ones should
+# be added here.
+if args.dbname in ['commons', 'cs', 'de', 'en', 'fr', 'wikidata']:
+ server = args.dbname + 'wiki.labsdb'
+ db = args.dbname + 'wiki_p'
+elif args.dbname in ['meta', 'meta_p']:
+ #
https://wikitech.wikimedia.org/wiki/Help:Tool_Labs/Database#Metadata_database;
+ # not to be confused with metawiki_p.
+ server = 's7.labsdb'
+ db = 'meta_p'
+elif args.dbname == 'local':
+ server = 'tools-db'
+ db = None
+else:
+ logging.debug('This database name is not hardcoded, ' +
+ 'falling back to DNS resolution')
+ if args.dbname.endswith('_p'):
+ db = args.dbname
+ else:
+ db = args.dbname + '_p'
+ server = db[:- len('_p')] + '.labsdb'
+ try:
+ socket.gethostbyname(server)
+ logging.debug('Resolved to %s %s', server, db)
+ except socket.gaierror:
+ errmsg = 'Could not find requested database'
+ if db != args.dbname:
+ errmsg += "\nMake sure to ask for a db in format of <wiki>_p"
+ sys.exit(errmsg)
-param=""
-# check if the user has a replica file
-if [ -f ~/replica.my.cnf ];then
- param=" --defaults-file=~/replica.my.cnf"
-else
- if [ ! -f ~/.my.cnf ];then
- param=" -p"
- fi
-fi
+logging.debug('Connecting to %s', server)
+exec_args += ['-h', server]
+if db:
+ exec_args += [db]
-server="enwiki.labsdb"
-db="enwiki_p"
+if args.sqlquery:
+ if len(args.sqlquery) > 1:
+ logging.warn('More than one argument given; ' +
+ 'joining SQL query words with spaces.')
+ exec_args += ['-e', ' '.join(args.sqlquery)]
-case "$1" in
- "en" | "enwiki" | "enwiki_p")
- server="enwiki.labsdb"
- db="enwiki_p"
- ;;
- "de" | "dewiki" | "dewiki_p")
- server="dewiki.labsdb"
- db="dewiki_p"
- ;;
- "fr" | "frwiki" | "frwiki_p")
- server="frwiki.labsdb"
- db="frwiki_p"
- ;;
- "cs" | "cswiki" | "cswiki_p")
- server="cswiki.labsdb"
- db="cswiki_p"
- ;;
- "commons" | "commonswiki" | "commonswiki_p")
- server="commonswiki.labsdb"
- db="commonswiki_p"
- ;;
- "wikidata" | "wikidatawiki" | "wikidatawiki_p")
- server="wikidatawiki.labsdb"
- db="wikidatawiki_p"
- ;;
- "meta" | "meta_p")
- # Not to confuse with metawiki[_p]
- #
https://wikitech.wikimedia.org/wiki/Nova_Resource:Tools/Help#Metadata_database
- server="s7.labsdb"
- db="meta_p"
- ;;
- "local")
- server=tools-db
- db=""
- if [ -f ~/.my.cnf ];then
- param=""
- fi
- ;;
- *)
- # we don't know what the database is so we check if it exist first
- Log "This database name is not known by sql script, fallback to dblist
resolution"
- db="${1%_p}_p"
- server="${db%_p}.labsdb"
- if getent hosts -- "$server" > /dev/null
- then
- Log "Resolved to $server $db"
- else
- echo "Could not find requested database"
- if [ "$db" != "$1" ]; then
- echo 'Make sure to ask for a db in format of <wiki>_p'
- fi
- exit 1
- fi
- ;;
-esac
-
-shift
-Log "Connecting to $server"
-if [ $# -lt 1 ]; then
- exec mysql $param -h $server $db "$@"
-else
- echo "$@" | mysql $param -h $server $db
-fi
+os.execvp('mysql', exec_args)
diff --git a/tox.ini b/tox.ini
index 3954ce5..98015f7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,12 +1,16 @@
[tox]
minversion = 1.6
-envlist = py27, flake8
+envlist = py27, py34, flake8
[testenv]
-basepython = python2.7
-commands = python -m doctest jobutils/bin/jsub
+basepython =
+ py27: python2.7
+ py34: python3.4
+commands =
+ py27: python -m doctest jobutils/bin/jsub
+ py34: python -m doctest misctools/sql
[testenv:flake8]
basepython = python2.7
-commands = flake8 jobutils/bin/jsub
+commands = flake8 jobutils/bin/jsub misctools/sql
deps = flake8
--
To view, visit https://gerrit.wikimedia.org/r/340233
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I038d14fb73a9bfe633003a6ab89d712510f61f61
Gerrit-PatchSet: 1
Gerrit-Project: labs/toollabs
Gerrit-Branch: master
Gerrit-Owner: Tim Landscheidt <t...@tim-landscheidt.de>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
