revise amulet search to consider of seed1 value,

[amulettoolsmh4/main.git] / model / db_supports.py

diff --git a/model/db_supports.py b/model/db_supports.py
index da18ae6..b8bf68f 100644 (file)
--- a/model/db_supports.py
+++ b/model/db_supports.py
@@ -248,7 +248,16 @@ SEED2_SKILL2_TABLE_SELECT_ALL_SQL = u"""select {seed}, {skill_id1}, {skill_id2},
         skill_id5=SEED2_SKILL2_COL_SKILL2_ID5,
         skill_id6=SEED2_SKILL2_COL_SKILL2_ID6,
         skill_id7=SEED2_SKILL2_COL_SKILL2_ID7)
-
+SEED2_SKILL2_TABLE_SELECT_ALL_FROM_SEED2_SQL = u"""select {skill_id1}, {skill_id2}, 
+    {skill_id3}, {skill_id4}, {skill_id5}, {skill_id6}, {skill_id7} from {{table_name}} where {seed}={{seed2}}""".format(
+        seed=SEED2_SKILL2_COL_SEED2,
+        skill_id1=SEED2_SKILL2_COL_SKILL2_ID1,
+        skill_id2=SEED2_SKILL2_COL_SKILL2_ID2,
+        skill_id3=SEED2_SKILL2_COL_SKILL2_ID3,
+        skill_id4=SEED2_SKILL2_COL_SKILL2_ID4,
+        skill_id5=SEED2_SKILL2_COL_SKILL2_ID5,
+        skill_id6=SEED2_SKILL2_COL_SKILL2_ID6,
+        skill_id7=SEED2_SKILL2_COL_SKILL2_ID7)
 # for seed2 to threshold1
 u""" SEED2から判定値1へのテーブル """
 SEED2_THRESHOLD1_TABLE_NAME = u"seed2_threshold1"
@@ -662,6 +671,18 @@ SEED1_TENUN555_TABLE_SELECT_ALL_FROM_SEED1_SQL = u"""select id, {table_no}, {res
         skill1_id4=SEED1_TENUN_COL_SKILL1_4,
         skill1_id5=SEED1_TENUN_COL_SKILL1_5,
         skill1_id6=SEED1_TENUN_COL_SKILL1_6)
+# extract skill1 by place
+SEED1_TENUN555_TABLE_SELECT_SEED1_SQL = u"""select
+    {seed1} from {table_name} """.format(
+        seed1=SEED1_TENUN_COL_SEED1,
+        table_name=SEED1_TENUN555_TABLE)
+# count seed1 number with skill1 and place
+SEED1_TENUN555_TABLE_COUNT_SEED1_SQL = u"""select
+    count({seed1}) from {table_name} """.format(
+        seed1=SEED1_TENUN_COL_SEED1,
+        table_name=SEED1_TENUN555_TABLE)
+
+# tenun888
 SEED1_TENUN888_TABLE_CREATE_SQL =  u"""create table if not exists {table_name}
     (id integer primary key, {table_no} integer, {seed} integer unique, {result_num} integer,
     {amulet_id1} integer, {amulet_id2} integer, {amulet_id3} integer,
@@ -766,3 +787,14 @@ SEED1_TENUN888_TABLE_SELECT_ALL_FROM_SEED1_SQL = u"""select id, {table_no}, {res
         skill1_id5=SEED1_TENUN_COL_SKILL1_5,
         skill1_id6=SEED1_TENUN_COL_SKILL1_6,
         skill1_id7=SEED1_TENUN_COL_SKILL1_7)
+
+# extract skill1 by place
+SEED1_TENUN888_TABLE_SELECT_SEED1_SQL = u"""select
+    {seed1} from {table_name} """.format(
+        seed1=SEED1_TENUN_COL_SEED1,
+        table_name=SEED1_TENUN888_TABLE)
+# count seed1 number with skill1 and place
+SEED1_TENUN888_TABLE_COUNT_SEED1_SQL = u"""select
+    count({seed1}) from {table_name} """.format(
+        seed1=SEED1_TENUN_COL_SEED1,
+        table_name=SEED1_TENUN888_TABLE)