From b5f321a3aeff1b04f9dbdfbfe1b00460095864ab Mon Sep 17 00:00:00 2001 From: xperthunter Date: Mon, 2 May 2022 10:15:41 -0700 Subject: [PATCH] moved old methods of specdb to arch --- {specdb => arch}/specdb | 0 {specdb => arch}/specdb.py | 41 ++------------------- specdb/__pycache__/__init__.cpython-37.pyc | Bin 161 -> 138 bytes specdb/__pycache__/specdb.cpython-37.pyc | Bin 30723 -> 30746 bytes 4 files changed, 4 insertions(+), 37 deletions(-) rename {specdb => arch}/specdb (100%) rename {specdb => arch}/specdb.py (99%) diff --git a/specdb/specdb b/arch/specdb similarity index 100% rename from specdb/specdb rename to arch/specdb diff --git a/specdb/specdb.py b/arch/specdb.py similarity index 99% rename from specdb/specdb.py rename to arch/specdb.py index 5862e22..88f6235 100644 --- a/specdb/specdb.py +++ b/arch/specdb.py @@ -113,7 +113,7 @@ def forms(table=None, num=None): comment_split = line.split(' -- ') comment = comment_split[-1] form_dic[table_name] = ruamel.yaml.comments.CommentedMap() - form_dic.yaml_add_eol_comment(comment, table_name) + form_dic.yaml_add_eol_comment(comment, table_name, column=25) elif re.search(r' -- ', line): if table_name in table: @@ -127,7 +127,7 @@ def forms(table=None, num=None): form_dic[table_name][column] = SQL_TYPES[sql_type] pad = 30 - len(column) form_dic[table_name].yaml_add_eol_comment( - f"{' '*pad}{comment}", column) + comment, column, column=35) yaml = ruamel.yaml.YAML() yaml.preserve_quotes = True @@ -238,6 +238,7 @@ def find_uniq_constraint(table=None, cursor=None): sql = f"SELECT sql FROM sqlite_master WHERE type='table' AND name='{table}'" cursor.execute(sql) schema = cursor.fetchone() + print(schema) entries = [ tmp.strip() for tmp in schema[0].splitlines() if tmp.find("UNIQUE")>=0 ] @@ -1538,6 +1539,7 @@ def backup(db=None, object_dir='objects', backup_file='backup.txt'): return True + def restore(backup=None, backup_file=None, object_dir=None): """ This function performs the restore function from an incremental backup @@ -1574,38 +1576,3 @@ def restore(backup=None, backup_file=None, object_dir=None): # Restoration is complete return True - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/specdb/__pycache__/__init__.cpython-37.pyc b/specdb/__pycache__/__init__.cpython-37.pyc index aedb2289af45a47299c886340214f996768a713a..3aa4caa1583f7f1a1bc3c94a4882930b9626416c 100644 GIT binary patch delta 87 zcmZ3;*u}`}#LLUY00avZvXdAl@=DsV068fP!3>&=ek&P@7=b(l@yl30v^ce>SU)?h eC^0=zKgc!M)iKD~Lq90MGq@l%*~MvMwHg5Bs1!N? delta 110 zcmeBTT*%1l#LLUY00e!ptKvi_@=Ats068fPQ4A@J!3>&ARjdYjhI$5mnvA!&6MWJy9Ege04UJZ^v}ukfxKNe}}GBq8Ef*lcodaM{i7=Il*K z!p2x4YKyVZV_Q*FsI}H=vA9+pYdgr;m#sLpwH{|6DY{IMZbI zx95J}Ip?19z0TRmv+S<3%-iJkX4>d4v?$Wck9i+*i4S{K@w%&j&6#m!`~@s@61nS zrd(RK=ACkgqe^w@jAEPYo}J3lvZ#AzDqADjxR<_j#93ulsn2kvypycRHlCAmrd-7~ zIfqx9Dd(tnm*nN9e8IvL(^w>9znys(6Y%GukApr}(kD40jF}ai z413Bk$(T)ZXwI8#DThY(I_!YECfT^taHgD-Omjt?$qj~U4@)_r*A&gY*KWD$u%da6 zuyG}&$dO9=wV8in^Ow>K0uEy!!Rx4HK}BmB;eGlfodm^ZXJd8ZKz_dXAg^}0+jQ$A zdf$+t2R!|{(RY13rgNCV%uFVtVIvxj=}Eqd1iS!fBB&m|QMBb>H#?smY%{W1CiBpL zfy2jq)ShAI!|4kB=0$4AUBmKB#~eF>v31DZszxTH`+GnZhx5<}6X&TAoP7YB;x zl5?LZUd8sL-!G0Zwp(m3nLTS9T0e09L{lXtN;`yK5l2hPS+h7zVQqdp@CDYsg90>(08ngvq0lPoN;jfs2q-6XsRg_c4@JPZ zc&MTzYY&=xfhO@{#bUNfI4ZBI>?MKe>W>e_H2F5u84C^Q{PV5z8^u6ntl;Yy2WOj^ z;TT!M2=<4ypm?wHTJ}J?waVqFSV+n-`+Pr-QA2g{W^{HUNlZu5;Cz)BtSQSKB5A-m z9Ev6b&h9HVbW*|`shP(f6fe{)W=GSk_E~$G+<7B){Gy$o5pSqVHhiD7W7+H5I-5JX z{OjAg+WmYtL~cJ#x}~|Zt3~FqnrQ`9oOEWErYHM&IAMh2F@6uGKMJf8J@r*{E;OH+ zX@q*CdXOR~$#;qS>Wk(KVhW~Tyre@Uep&p!ejYm{SZ#5-Xx`lavjLw7ELb=3g{#e& zUM+ugdVy&D2q*=P0gn;X41VFNc^ax+z~jJ=0j!%p0h}L3!rw5Ha$r$IHG49>wV}gJ z_37cI8*7kkT6Dh7iJk0 zZ>^|Q??>~y0BrTy=4I4ppNslvd`Gx%PWqCSF2+uzm#%sxgY}4<=7z#+Fbv0r>YQE- ze@1jQFAsecx~~BZ1e0AF$m)+rHJt~MYZnYa^73Z@K?wMa@PHoF;sc>@EU1Ny5Z@2o z0fMO{l14DBsabrVc(-|R`4lwY0B#0u1@eGffakP>`<>o4-| z<09Rn&bk+4r0?a57IfP|A;nDYl9*#KNkP>XmEeVKNx*D`-KG&O+CAX)k4N@b1hfIkl&aQo5+M$&n?~ zM|xnP(A#S1pqXlGW1ZsFwmGa-{JX6t7ip;G$`ke6#X>A>U(ohE=KT#IN6WlI!Ua5B z4{1TVznHFYOw&h9x?adA^zf7DF5h_3=6@z0X|HmPIqwp_hJ4}Q>}6e|VRIEbmG0PF ziqk#O(J^}+^_8x*ypK&-HQkYX2Bl>94+Nx!2QPf#hfma9Y{euB}WZ?zn zkEVE&bh@~va~^v$J=ysX^C2}%W~g>rY{=lJ#p*4^Y)W)*X>1xL754yR1l4WrRIa2M zQUsn=(`39)pi?HDeW4vmej2*B#mOy&HE*H$Dj?U`NG;PrN1;`1?EG!0PK&JWa(085 z*S(mXNe8=+DY=u7%hF=!ucQ5jsN7aZ=4suw)CVu{oq$}R5c{_+S5P}B<4BZW2t1?}W!ErmcxGH|C*BPD7HaE)~2T z=!*^V4+v`Y`6&nK<-ip{DNqJnl!eo#E`+uScmXITn680{3x%mk+`n_dCPWvRGCZd9 zn=CDkf`B`uY5n1-ZdI;tWAHOTD{v=p5AZGEV*(wGGOY)NKjK%8lZ1aFS|W4V?IIGX z@qb7H(-9vsF0z#A8XVI3Xs&VbcT5JkuaS? z@d*DEQ~w%xO5Bmy%9eSFItNGDi{gdB`Rpa}(cm&x zo?gT+b4)x%{oAYw7hvdZgf7ZDKOQOo8I;pDoC6uArYli7B?>PB3V~XvW}{UMlmOE1 zWoXqwD&a-fuDVn?OC#4TJ$%_D9g#1MCGJ0FDBOfG2?yz)Jv%Jh##x ftup}Ph-cu%(zt%KKC_(Iy(`E{#h-W8vZen6;4R%p delta 4145 zcmai%3vg7`8OQIryL)%Dd9WlQ4?@C*kc178jJ!e+G$2WcKtdjZu7=G`?gp3aD`#&4 z#Ent#fsay(oVH%9~SFa9jBIykJh4AJ6deDRqND#|8r51ai+}d zFW))mJCFOl&f%_8Y~LxCyDm4^tI)q!@BUD~^5NXWF7}d`F}Ogy?iyP2{)D#st+X~Z zV_I3S^jQ<`w0p`otxUMhnN#_OC+(hA`Nz~(Kz*LH$H*#GCR}M(S{c^(zrcJ(*LgNY$KlwvkP$-gJ&ZeG|F#H<$kAnX}S)rApeFb`f(|D@LB_NayZj zCCbDMyLYP4n30}Qs2oz#-b2dWYC3mXWy;8%+mvmJ!Mc=gXBzC|4K9W2{HDuXHk|2*__(C-5JrIO;xnUxz1hvB?NNjnU(?34<3?qd^9 zvaWLzM`2vz` z1RyOZd>~F1v@g{xcX)SraMTP3Jwsu0@bW}FYaD=HV1Z-izDm`msl6rK4s;un==*^?OD3p9(jDwnb* zF?-&IdHvKumQ0Ms4Y`};jO+AOUmB55h->D>i*Cj|gq-D##L1>+XeeTA7oMt1*u9y7 zDwm@Yp(3LsN&=Y($v`Hel(ih>dfp`V*Hjdzs5j^w)1#@NbL-koJ$xB;@EU2k-`5nd z?~9W)OWBc3N$r!W40~JQ8%*$y_;+Ag;rD3zcuspqPfK^NzrCZk)6dTl=hu~$$FP02 z5l#*ANKyveUD)Xe&?I)%RcW@x#8lm^*`rYQ;#46SN|r|QC?!ooJYQGjI!MDWiFfN3 zvV)nTg=_xL!Dfh&#ck{yaddH64^F`!0_=?;{QxKjehB=C5Xj^Ms&_h#0aVliIM^Tn5mLrzh zVP%cRBO@UyD5;<=COJ9kL7E$MqPkeFa4c!=;oa0j{`*hUy!;Co-GPJ)Xt3i<*}D;)|e#dnn-i>QMZs7;agqU5Byj#o?B+X6dbdw2^K6C~$xf z^r0q%j6_V2#6yN|>ik<6`!>PSk|{G3F#_3qzi_rLoqHojZUOcI*8&B=HNcZ%YwH%x zt^(qr)>7AU>dlB_t$|sGFy0Ty-Q_y_g{Mtt`^7D-#a~RizO7bH`isc4_2zy3;uDv4 zmWuifC6h8jahq{JaK=@L=2k#D?_x;spp|Xv1JQ7ZF2peBL3CdVTn0$T%0PJnO+*W> z@K`Kj+F>Hy-;6O-M1DK!jOB`?j0orVqUS25kFQW26RU2an_%9*<3V0fjl}@uO-7A^f+7B}J ze5PUJI!Ctjyfk}*NO#myp5NEe!Mc!@UeD^N9vd+9^DY#=&YFCrSRkLDVR*5jbMdU- zV1s7>xs1%2CUIlu+}Y2fQ*Ln9xBg5#-C5;&k%o)J-#Rz47e(Wi>5cbMJD|x_<3GVv zX?^Jo=@uj>-DiDl5A3SdVDws$wTHk*;#a8pQS8 z-LqS;G(2fLy9ttX;|cN4?&@NkH|QD~4)00XA7tBBH1t%kgy`rgbG=3yhKTnpWUpoJ z>N(8h)n+j>pwh8)lfRA?k(tu$pL$mtkwKG!CVAe?B6iV=$z2%o0J{lv&CBnU=fEXn zpX~ui($r}vdFkrWcckpK-=LmgRy2`F%9OOUn7%t2j`Kfb&T&AV8CQ|zpvrHT36*0W zf87ttfS8q{d=ANVsM64-Hach~=z?6gbt!v0Gq&|%E&nPg%le`6S0KMCn)()yB?tPJ z``|G7aI(MVfVjVJrG~OW$^K?v7kgJUZokea%S=6b?b0Eh+dj$uBsPa)@=`m))w24Y zfF?{VKKE9Lk3wy}X7t<+*s&ls^*7ONe_j6~_O{6MSC_y{fqFj_hH-6DLO&u@}Tl z-pJ-;+WGm8p~pzS!(MPPrrtp4rL^;-Q3*5yUzutSnpm3NF>@&R`7EFisFj+KihvRc z^p%PCN6X4w8ogtE)K-dfScxM?^)f&G&#lJ6%f