From c9741cca05ae498bb3044a116311a1fd7970317a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=91=D0=BE=D1=80=D0=BE=D0=B4=D0=B8=D0=BD=20=D0=A0=D0=BE?= =?UTF-8?q?=D0=BC=D0=B0=D0=BD?= Date: Thu, 17 Jan 2019 11:36:12 +0300 Subject: [PATCH] =?UTF-8?q?=D0=92=20=D1=81=D0=BB=D0=BE=D0=B2=D0=B0=D1=80?= =?UTF-8?q?=D0=B5=20=D1=8D=D0=BB=D0=B5=D0=BC=D0=B5=D0=BD=D1=82=D1=8B=20?= =?UTF-8?q?=D0=B2=20=D0=BD=D0=B5=D1=81=D0=BE=D1=80=D1=82=D0=B8=D1=80=D0=BE?= =?UTF-8?q?=D0=B2=D0=B0=D0=BD=D0=BD=D0=BE=D0=BC=20=D0=B2=D0=B8=D0=B4=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lybmods/lybpqconn.py | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/lybmods/lybpqconn.py b/lybmods/lybpqconn.py index 8a59483..ee2c1ba 100644 --- a/lybmods/lybpqconn.py +++ b/lybmods/lybpqconn.py @@ -11,22 +11,22 @@ conn.set_isolation_level(psycopg2.extensions.ISOLATION_LEVEL_AUTOCOMMIT) def create_schema(): cur = conn.cursor() - d = { - lybcfg.pwd_table_name: lybtools.AUTH_SCHEMA, - lybcfg.sess_table_name: lybtools.SESS_SCHEMA, - lybcfg.cat_table_name: lybtools.CAT_SCHEMA, - lybcfg.doc_table_name: lybtools.DOC_SCHEMA, - lybcfg.bin_table_name: lybtools.BIN_SCHEMA, - lybcfg.docbin_table_name: lybtools.DOCBIN_SCHEMA, - lybcfg.grpcat_access_table: lybtools.GRPCAT_ACCESS_SCHEMA, - lybcfg.grpdoc_access_table: lybtools.GRPDOC_ACCESS_SCHEMA, - lybcfg.pwdcat_access_table: lybtools.PWDCAT_ACCESS_SCHEMA, - lybcfg.pwddoc_access_table: lybtools.PWDDOC_ACCESS_SCHEMA - } - for k in d.keys(): + l = [ + (lybcfg.pwd_table_name, lybtools.AUTH_SCHEMA), + (lybcfg.sess_table_name, lybtools.SESS_SCHEMA), + (lybcfg.cat_table_name, lybtools.CAT_SCHEMA), + (lybcfg.doc_table_name, lybtools.DOC_SCHEMA), + (lybcfg.bin_table_name, lybtools.BIN_SCHEMA), + (lybcfg.docbin_table_name, lybtools.DOCBIN_SCHEMA), + (lybcfg.grpcat_access_table, lybtools.GRPCAT_ACCESS_SCHEMA), + (lybcfg.grpdoc_access_table, lybtools.GRPDOC_ACCESS_SCHEMA), + (lybcfg.pwdcat_access_table, lybtools.PWDCAT_ACCESS_SCHEMA), + (lybcfg.pwddoc_access_table, lybtools.PWDDOC_ACCESS_SCHEMA) + ] + for k in l: try: - cur.execute('SELECT COUNT(*) FROM %s' % k) + cur.execute('SELECT COUNT(*) FROM %s' % k[0]) except: - cur.execute(d[k]) + cur.execute(k[1]) conn.commit()