|
|
@ -125,11 +125,10 @@ def makeSphinxDbSourceQuerySql(pdb, db, table,pkey_name): |
|
|
|
sql = "SELECT "+pkey_name+' as id,' + field_str + " FROM " + table + " where id >= $start AND id <= $end" |
|
|
|
sql = "SELECT "+pkey_name+' as id,' + field_str + " FROM " + table + " where id >= $start AND id <= $end" |
|
|
|
return sql |
|
|
|
return sql |
|
|
|
|
|
|
|
|
|
|
|
def makeSphinxDbSource(pdb, db, table): |
|
|
|
def makeSphinxDbSource(pdb, db, table, pkey_name): |
|
|
|
|
|
|
|
|
|
|
|
db_info = pSqliteDb('databases').field('username,password').where('name=?', (db,)).find() |
|
|
|
db_info = pSqliteDb('databases').field('username,password').where('name=?', (db,)).find() |
|
|
|
port = getDbPort() |
|
|
|
port = getDbPort() |
|
|
|
pkey_name = getTablePk(pdb, db, table) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
conf = ''' |
|
|
|
conf = ''' |
|
|
@ -210,7 +209,7 @@ def makeSqlToSphinxDb(pdb, db, table = []): |
|
|
|
if pkey_name == '': |
|
|
|
if pkey_name == '': |
|
|
|
continue |
|
|
|
continue |
|
|
|
|
|
|
|
|
|
|
|
conf += makeSphinxDbSource(pdb, db, table_name) |
|
|
|
conf += makeSphinxDbSource(pdb, db, table_name, pkey_name) |
|
|
|
# print(conf) |
|
|
|
# print(conf) |
|
|
|
# print(table_name+':'+pkey_name) |
|
|
|
# print(table_name+':'+pkey_name) |
|
|
|
# db_field_str = makeSqlToSphinxTable(db,table_name) |
|
|
|
# db_field_str = makeSqlToSphinxTable(db,table_name) |
|
|
|