tests adapted to full names

Author: ea-rus

tests/test_sdk.py

@@ -101,15 +101,15 @@ def check_model(self, model, database, mock_post):
         pred_df = model.predict(query, params={ 'x': '1' })
 
         check_sql_call(mock_post,
-                       f'SELECT m.* FROM (SELECT a FROM t1) as t JOIN {model.project.name}.{model_name} AS m USING x="1"')
+                       f'SELECT m.* FROM (SELECT * FROM {query.database} (select a from t1)) AS t JOIN {model.project.name}.{model_name} AS m USING x="1"')
         assert (pred_df == pd.DataFrame(data_out)).all().bool()
 
         # time series prediction
         query = database.query('select * from t1 where type="house" and saledate>latest')
         model.predict(query)
 
         check_sql_call(mock_post,
-                       f"SELECT m.* FROM (SELECT * FROM t1 WHERE type = 'house' AND saledate > LATEST) as t JOIN {model.project.name}.{model_name} AS m")
+                       f'SELECT m.* FROM (SELECT * FROM {query.database} (select * from t1 where type="house" and saledate>latest)) as t JOIN {model.project.name}.{model_name} AS m')
         assert (pred_df == pd.DataFrame(data_out)).all().bool()
 
         # -----------  model managing  --------------
@@ -176,12 +176,12 @@ def check_table(self, table, mock_post):
         table2 = table.filter(a=3, b='2').limit(3)
         table2.fetch()
         str(table2)
-        check_sql_call(mock_post, f'SELECT * FROM {table2.name} WHERE a = 3 AND b = \'2\' LIMIT 3')
+        check_sql_call(mock_post, f'SELECT * FROM {table2.db.name}.{table2.name} WHERE a = 3 AND b = \'2\' LIMIT 3')
 
         # last
         table2 = table.filter(a=3).track('type')
         table2.fetch()
-        check_sql_call(mock_post, f'SELECT * FROM {table2.name} WHERE a = 3 AND type > last')
+        check_sql_call(mock_post, f'SELECT * FROM {table2.db.name}.{table2.name} WHERE a = 3 AND type > last')
 
 
 class Test(BaseFlow):
@@ -476,6 +476,7 @@ def check_database(self, database, mock_post):
         sql = 'select * from tbl1'
         query = database.query(sql)
         assert query.sql == sql
+        table0 = database.tables.tbl0
 
         result = pd.DataFrame([{'s': '1'}, {'s': 'a'}])
         response_mock(mock_post, result)
@@ -498,8 +499,8 @@ def check_database(self, database, mock_post):
         self.check_table(table)
 
         # create from query
-        table2 = database.create_table('t2', query)
-        check_sql_call(mock_post, f'create table {database.name}.t2 (select * from tbl1)')
+        table2 = database.create_table('t2', table0)
+        check_sql_call(mock_post, f'create table {database.name}.t2 (select * from {database.name}.tbl0)')
 
         assert table2.name == 't2'
         self.check_table(table2)
@@ -508,14 +509,14 @@ def check_database(self, database, mock_post):
         table1 = database.get_table('t1')
         table1 = table1.filter(b=2)
         table3 = database.create_table('t3', table1)
-        check_sql_call(mock_post, f'create table {database.name}.t3 (SELECT * FROM t1 WHERE b = 2)')
+        check_sql_call(mock_post, f'create table {database.name}.t3 (SELECT * FROM {table1.db.name}.t1 WHERE b = 2)')
 
         assert table3.name == 't3'
         self.check_table(table3)
 
         # drop table
         database.drop_table('t3')
-        check_sql_call(mock_post, f'drop table t3')
+        check_sql_call(mock_post, f'drop table {database.name}.t3')
 
 
     @patch('requests.Session.post')
@@ -942,6 +943,8 @@ def check_database(self, database, mock_post):
         query = database.query(sql)
         assert query.sql == sql
 
+        table0 = database.tables.tbl0
+
         result = pd.DataFrame([{'s': '1'}, {'s': 'a'}])
         response_mock(mock_post, result)
 
@@ -964,12 +967,12 @@ def check_database(self, database, mock_post):
         self.check_table(table)
 
         # create from query
-        table2 = database.tables.create('t2', query)
-        check_sql_call(mock_post, f'create table {database.name}.t2 (select * from tbl1)')
+        table2 = database.tables.create('t2', table0)
+        check_sql_call(mock_post, f'create table {database.name}.t2 (select * from {database.name}.tbl0)')
 
         # create with replace
-        database.tables.create('t2', query, replace=True)
-        check_sql_call(mock_post, f'create or replace table {database.name}.t2 (select * from tbl1)')
+        database.tables.create('t2', table0, replace=True)
+        check_sql_call(mock_post, f'create or replace table {database.name}.t2 (select * from {database.name}.tbl0)')
 
 
         assert table2.name == 't2'
@@ -978,11 +981,11 @@ def check_database(self, database, mock_post):
         # -- insert into table --
         # from dataframe
         table2.insert(pd.DataFrame([{'s': '1', 'x': 1}, {'s': 'a', 'x': 2}]))
-        check_sql_call(mock_post, "INSERT INTO t2(s, x) VALUES ('1', 1), ('a', 2)")
+        check_sql_call(mock_post, f"INSERT INTO {table2.db.name}.t2(s, x) VALUES ('1', 1), ('a', 2)")
 
         # from query
         table2.insert(query)
-        check_sql_call(mock_post, f"INSERT INTO {database.name}.t2 (select * from tbl1)")
+        check_sql_call(mock_post, f"INSERT INTO {database.name}.t2 (select * from {query.database}(select * from tbl1))")
 
         # -- delete in table --
         table2.delete(a=1, b='2')
@@ -991,24 +994,24 @@ def check_database(self, database, mock_post):
         # -- update table --
         # from query
         table2.update(query, on=['a', 'b'])
-        check_sql_call(mock_post, f"UPDATE {database.name}.t2 ON a, b FROM (select * from tbl1)")
+        check_sql_call(mock_post, f"UPDATE {database.name}.t2 ON a, b FROM (select * from  {query.database}(select * from tbl1))")
 
         # from dict
         table2.update({'a': '1', 'b': 1}, filters={'x': 3})
-        check_sql_call(mock_post, f"UPDATE t2 SET a='1', b=1 WHERE x=3")
+        check_sql_call(mock_post, f"UPDATE {table2.db.name}.t2 SET a='1', b=1 WHERE x=3")
 
         # create from table
         table1 = database.tables.t1
         table1 = table1.filter(b=2)
         table3 = database.tables.create('t3', table1)
-        check_sql_call(mock_post, f'create table {database.name}.t3 (SELECT * FROM t1 WHERE b = 2)')
+        check_sql_call(mock_post, f'create table {database.name}.t3 (SELECT * FROM {table1.db.name}.t1 WHERE b = 2)')
 
         assert table3.name == 't3'
         self.check_table(table3)
 
         # drop table
         database.tables.drop('t3')
-        check_sql_call(mock_post, f'drop table t3')
+        check_sql_call(mock_post, f'drop table {database.name}.t3')
 
     @patch('requests.Session.post')
     def check_project_jobs(self, project, mock_post):
@@ -1124,7 +1127,7 @@ def check_project_kb(self, project, model, database, mock_post):
         check_sql_call(
             mock_post,
             f''' insert into {project.name}.{kb.name} (
-               select * from tbl2 where a=1
+               select * from {database.name}.tbl2 where a=1
             )'''
         )
 
@@ -1148,7 +1151,7 @@ def check_project_kb(self, project, model, database, mock_post):
         check_sql_call(
             mock_post,
             f'''
-            CREATE KNOWLEDGE_BASE kb2
+            CREATE KNOWLEDGE_BASE {project.name}.kb2
               USING model={model_name}, 
               metadata_columns=['date', 'author'],
               k='v'
@@ -1168,7 +1171,7 @@ def check_project_kb(self, project, model, database, mock_post):
         check_sql_call(
             mock_post,
             f'''
-            CREATE KNOWLEDGE_BASE kb2
+            CREATE KNOWLEDGE_BASE {project.name}.kb2
               USING storage={table_name}, 
               content_columns=['review'],
               id_column='num'
@@ -1181,9 +1184,10 @@ def check_project_kb(self, project, model, database, mock_post):
 
         check_sql_call(
             mock_post,
-            "DROP KNOWLEDGE_BASE kb2"
+            f"DROP KNOWLEDGE_BASE {project.name}.kb2"
         )
 
+
 class TestAgents():
     @patch('requests.Session.get')
     def test_list(self, mock_get):