db2text 0.2.1__tar.gz → 0.2.2__tar.gz

{db2text-0.2.1/db2text.egg-info → db2text-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: db2text
-Version: 0.2.1
+Version: 0.2.2
 Summary: database to text
 Home-page: https://gitee.com/chenc224/dbt
 Author: Chen chuan

{db2text-0.2.1 → db2text-0.2.2}/database2text/datafile/dbtmanual.md

@@ -115,7 +115,7 @@ pdfdir=指定pdf文件放在哪个目录，未指定则放在dotdir目录下
 
 filename=dot和pdf文件名，不带扩展名
 
-dotcmd=neato    指定graphviz布局算法，可以选择dot，neato,twopi,circo,fdp,sfdp,patchwork和osage这些，未指定使用neato
+dotcmd=neato    指定graphviz布局算法，可以选择twopi、circo、fdp和osage这些，未指定使用fdp。不建议使用dot，patchwork，布局严重有问题，也不建议使用neato、sfdp，生成的pdf尺寸有点问题。
 
 page= 页名称列表，用空格隔开，如 用户类 权限相关 交易 流程控制等 other/其它
 

{db2text-0.2.1 → db2text-0.2.2}/database2text/datafile/dot.mb

@@ -1,9 +1,11 @@
 graph 表结构 {
-	size = "8,11"
-#	page="8.5,11";
+	size = "8.5,11";
+	margin=0;
+	pad=0.1;
+	page="8.5,11";
 #	charset=utf8;
-#	ratio="auto"
-	dpi = 300
+	ratio="fill"
+#	dpi = 300
 #	rankdir = "TR"
 #	node[shape=record fontname="wqy-zenhei" size="30,30"]
 	node[shape=plaintext fontname="wqy-zenhei"]

{db2text-0.2.1 → db2text-0.2.2}/database2text/datafile/sample/oracle/all.txt

@@ -48,7 +48,7 @@ table=ts.*
 dotdir=test/oracle
 pdfdir=local/oracle
 filename=lofta
-dotcmd=osage
+#dotcmd=fdp
 page=份额类 other
 
 份额类=ts[a-f].*

{db2text-0.2.1 → db2text-0.2.2}/database2text/mssql.py

@@ -11,7 +11,7 @@ class mssql(object):
     def ana_TABLE(otype):
         dbdata["sql"]["TABLE"]={}
         dbdata["exp"]["TABLE"]=[]
-        sql="SELECT table_catalog,table_schema,table_name FROM INFORMATION_SCHEMA.TABLES where table_type='BASE TABLE'"
+        sql="SELECT table_catalog,table_schema,table_name FROM INFORMATION_SCHEMA.TABLES where table_type='BASE TABLE' order by 3"
         if 目录:
             sql=f"{sql} and table_catalog='{目录}'"
         if 集合:

{db2text-0.2.1 → db2text-0.2.2}/database2text/mysql.py

@@ -7,7 +7,7 @@ from database2text.tool import *
 
 class mysql(object):
     def ana_TABLE(otype):
-        for oname, in db.exec(f"select table_name from information_schema.tables where table_schema='{database}' and table_type='BASE TABLE'"):
+        for oname, in db.exec(f"select table_name from information_schema.tables where table_schema='{database}' and table_type='BASE TABLE' order by 1"):
             if 检查匹配(otype,oname):
                 continue
             res=db.res1("show create table %s" %(oname))

{db2text-0.2.1 → db2text-0.2.2}/database2text/opengauss.py

@@ -9,7 +9,7 @@ from database2text.tool import *
 
 class opengauss(object):
     def ana_TABLE(otype):
-        for 表id,表名 in db.exec(f"select oid,relname from pg_class where relkind='r' and relnamespace=(select oid from pg_namespace where nspname='{stdata['schema']}')"):
+        for 表id,表名 in db.exec(f"select oid,relname from pg_class where relkind='r' and relnamespace=(select oid from pg_namespace where nspname='{stdata['schema']}') order by oid"):
             odata=db.res1(f"select pg_get_tabledef({表id})")
             oridata=[]
             coldata=[]

{db2text-0.2.1 → db2text-0.2.2}/database2text/oracle11.py

@@ -7,7 +7,7 @@ from database2text.tool import *
 
 class oracle(object):
     def ana_TABLE(otype):
-        for oname, in db.exec("select object_name from all_objects where object_type=:ot and owner=:owner",ot=otype,owner=owner):
+        for oname, in db.exec("select object_name from all_objects where object_type=:ot and owner=:owner order by 1",ot=otype,owner=owner):
             if 检查匹配(otype,oname):
                 continue
             if oname.startswith("SYS_EXPORT_TABLE"):

{db2text-0.2.1 → db2text-0.2.2}/database2text/tool.py

@@ -118,9 +118,14 @@ class dot(object):
     def __init__(self,arg):
         模板文件=pathlib.Path.joinpath(pathlib.Path(__file__).parent,"datafile","dot.mb")
         模板=open(模板文件,encoding="utf8").read()
-        分页数据=set()
+        分页数据=[]
         for page in arg.get("page","如果没有设置page就搞一个默认的").split():
-            分页数据.add(arg.get(page,"输出剩下的所有表"))
+            if page in ["other","其它","其他"]:
+                if arg.get(page,"输出剩下的所有表") not in 分页数据:
+                    分页数据.append(arg.get(page,"输出剩下的所有表"))
+            elif page in arg:
+                if arg[page] not in 分页数据:
+                    分页数据.append(arg[page])
         文件序号=0
         已经使用=set()
         dot列表=[]
@@ -142,12 +147,11 @@ class dot(object):
                 fdot.write(jinja2.Template(模板).render(data))
                 fdot.close()
                 dot列表.append(dotname)
-                if "dotcmd" in arg:
-                    pdfname=os.path.join(arg.get("pdfdir","."),f"{arg['filename']}_{文件序号}.pdf")
-                    pdf列表.append(pdfname)
-                    cmd="%s -Tpdf %s -o %s" %(arg["dotcmd"],dotname,pdfname)
-                    print(cmd)
-                    os.system(cmd)
+                pdfname=os.path.join(arg.get("pdfdir","."),f"{arg['filename']}_{文件序号}.pdf")
+                pdf列表.append(pdfname)
+                cmd='%s -Tpdf %s -o %s' %(arg.get("dotcmd","fdp"),dotname,pdfname)
+                print(cmd)
+                os.system(cmd)
         if len(pdf列表)>0:
             import PyPDF3
             pdfout=PyPDF3.PdfFileMerger()

{db2text-0.2.1 → db2text-0.2.2/db2text.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: db2text
-Version: 0.2.1
+Version: 0.2.2
 Summary: database to text
 Home-page: https://gitee.com/chenc224/dbt
 Author: Chen chuan

{db2text-0.2.1 → db2text-0.2.2}/setup.py

@@ -8,7 +8,7 @@ with open("README.md", "r",encoding='utf-8') as fh:
 
 setuptools.setup(
     name="db2text",
-    version="0.2.1",
+    version="0.2.2",
     author="Chen chuan",
     author_email="kcchen@139.com",
     description="database to text",