@@ -22,7 +22,7 @@ int setup(){
2222 "CREATE TABLE IF NOT EXISTS "
2323 "waste("
2424 "id INTEGER PRIMARY KEY"
25- ", client_id INTEGER NOT NULL"
25+ ", cnpj VARCHAR(20) NOT NULL"
2626 ", quantity INTEGER NOT NULL"
2727 ", value INTEGER NOT NULL"
2828 ", month SMALLINT NOT NULL"
@@ -107,8 +107,10 @@ int main()
107107 scanf ("%d" , & month );
108108 printf ("Ano: " );
109109 scanf ("%d" , & year );
110+ // Remove line breaks
111+ strtok (cnpj , "\n\r" );
110112 // execute database operations
111- insertWaste (1 , qtd , value , month , year );
113+ insertWaste (cnpj , qtd , value , month , year );
112114 }
113115 else if (opt == 3 ) {
114116 getchar (); // consume the last Enter key input
@@ -178,18 +180,17 @@ int createClient(char cnpj[20], char razao_social[50], char nome_fantasia[50]) {
178180 }
179181}
180182
181- int insertWaste (int client_id , int quantity , int value , int month , int year ){
183+ int insertWaste (char cnpj [ 20 ] , int quantity , int value , int month , int year ){
182184 try {
183185 sqlite3_open ("sqlite.db" , & db );
184186 char * query = sqlite3_mprintf (
185- "INSERT INTO waste(client_id , quantity, value, month, year) VALUES(%d , %d, %d, %d, %d)"
186- , client_id , quantity , value , month , year
187+ "INSERT INTO waste(cnpj , quantity, value, month, year) VALUES(%Q , %d, %d, %d, %d)"
188+ , cnpj , quantity , value , month , year
187189 );
188190 sqlite3_exec (db , query , The_Callback , NULL , NULL );
189191 printf ("Residuo cadastrado com sucesso: \n" );
190- sqlite3_exec (db , "SELECT a.id, b. cnpj, b.razao_social , quantity, value, month, year"
192+ sqlite3_exec (db , "SELECT trim( cnpj) , quantity, value, month, year"
191193 " FROM waste a"
192- " INNER JOIN clients b ON a.client_id = b.id"
193194 " WHERE ROWID = last_insert_rowid()"
194195 , The_Callback , NULL , NULL );
195196 sqlite3_free (query );
@@ -205,9 +206,8 @@ int selectWastesByDate(int month, int year) {
205206 try {
206207 sqlite3_open ("sqlite.db" , & db );
207208 char * query = sqlite3_mprintf (
208- "SELECT a.id, b. cnpj, b.razao_social , quantity, value, month, year"
209+ "SELECT cnpj, quantity, value, month, year"
209210 " FROM waste a"
210- " INNER JOIN clients b ON a.client_id = b.id"
211211 " WHERE a.month like %d and a.year like %d"
212212 , month , year
213213 );
0 commit comments