Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Add IN-operator normalizating and the SQLITE_NORMALIZE_CLI compile-time option for generating a stand-alone program. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | normalize |
Files: | files | file ages | folders |
SHA3-256: |
d77dbb398afa80c1b3373c55f278491e |
User & Date: | drh 2018-01-08 19:18:27.144 |
Context
2018-01-08
| ||
19:29 | Special handling of the NULL keyword. Sometimes it is a literal, and sometimes it is a keyword. (check-in: db5d138e97 user: drh tags: normalize) | |
19:18 | Add IN-operator normalizating and the SQLITE_NORMALIZE_CLI compile-time option for generating a stand-alone program. (check-in: d77dbb398a user: drh tags: normalize) | |
16:54 | First code for an auxiliary function that will normalize an SQL statement. (check-in: 84814aac81 user: drh tags: normalize) | |
Changes
Changes to ext/misc/normalize.c.
︙ | ︙ | |||
31 32 33 34 35 36 37 | ** (3) Lowercase all ASCII characters. ** ** (4) If an IN or NOT IN operator is followed by a list of 1 or more ** values, convert that list into "(?,?,?)". ** ** The purpose of normalization is two-fold: ** | | | > > > > > > > > | > > > > | 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 | ** (3) Lowercase all ASCII characters. ** ** (4) If an IN or NOT IN operator is followed by a list of 1 or more ** values, convert that list into "(?,?,?)". ** ** The purpose of normalization is two-fold: ** ** (1) Sanitize queries by removing potentially private or sensitive ** information contained in literals. ** ** (2) Identify structurally identical queries by comparing their ** normalized forms. ** ** Command-Line Utility ** -------------------- ** ** This file also contains code for a command-line utility that converts ** SQL queries in text files into their normalized forms. To build the ** command-line program, compile this file with -DSQLITE_NORMALIZE_CLI ** and link it against the SQLite library. */ #include <sqlite3.h> #include <string.h> /* ** Implementation note: ** ** Much of the tokenizer logic is copied out of the tokenize.c source file ** of SQLite. That logic could be simplified for this particular application, ** but that would impose a risk of introducing subtle errors. It is best to ** keep the code as close to the original as possible. ** ** The tokenize code is in sync with the SQLite core as of 2018-01-08. ** Any future changes to the core tokenizer might require corresponding ** adjustments to the tokenizer logic in this module. */ /* Character classes for tokenizing ** ** In the sqlite3GetToken() function, a switch() on aiClass[c] is implemented ** using a lookup table, whereas a switch() directly on c uses a binary search. |
︙ | ︙ | |||
568 569 570 571 572 573 574 575 576 577 | break; } } } while( j>0 && z[j-1]==' ' ){ j--; } if( i>0 && z[j-1]!=';' ){ z[j++] = ';'; } z[j] = 0; return z; } | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | > > > > | 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 | break; } } } while( j>0 && z[j-1]==' ' ){ j--; } if( i>0 && z[j-1]!=';' ){ z[j++] = ';'; } z[j] = 0; /* Make a second pass converting "in(...)" where the "..." is not a ** SELECT statement into "in(?,?,?)" */ for(i=0; i<j; i=n){ char *zIn = strstr(z+i, "in("); int nParen; if( zIn==0 ) break; n = (int)(zIn-z)+3; /* Index of first char past "in(" */ if( n && IdChar(zIn[-1]) ) continue; if( strncmp(zIn, "in(select",9)==0 && !IdChar(zIn[9]) ) continue; if( strncmp(zIn, "in(with",7)==0 && !IdChar(zIn[7]) ) continue; for(nParen=1, k=0; z[n+k]; k++){ if( z[n+k]=='(' ) nParen++; if( z[n+k]==')' ){ nParen--; if( nParen==0 ) break; } } /* k is the number of bytes in the "..." within "in(...)" */ if( k<5 ){ z = sqlite3_realloc64(z, j+(5-k)+1); if( z==0 ) return 0; memmove(z+n+5, z+n+k, j-(n+k)); }else if( k>5 ){ memmove(z+n+5, z+n+k, j-(n+k)); } j = j-k+5; z[j] = 0; memcpy(z+n, "?,?,?", 5); } return z; } /* ** For testing purposes, or to build a stand-alone SQL normalizer program, ** compile this one source file with the -DSQLITE_NORMALIZE_CLI and link ** it against any SQLite library. The resulting command-line program will ** run sqlite3_normalize() over the text of all files named on the command- ** line and show the result on standard output. */ #ifdef SQLITE_NORMALIZE_CLI #include <stdio.h> #include <stdlib.h> /* ** Break zIn up into separate SQL statements and run sqlite3_normalize() ** on each one. Print the result of each run. */ static void normalizeFile(char *zIn){ int i; if( zIn==0 ) return; for(i=0; zIn[i]; i++){ char cSaved; if( zIn[i]!=';' ) continue; cSaved = zIn[i+1]; |
︙ | ︙ | |||
600 601 602 603 604 605 606 607 608 609 610 611 612 613 | i = -1; }else{ zIn[i+1] = cSaved; } } } int main(int argc, char **argv){ int i; FILE *in; char *zBuf = 0; sqlite3_int64 sz, got; for(i=1; i<argc; i++){ | > > > > | 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 | i = -1; }else{ zIn[i+1] = cSaved; } } } /* ** The main routine for "sql_normalize". Read files named on the ** command-line and run the text of each through sqlite3_normalize(). */ int main(int argc, char **argv){ int i; FILE *in; char *zBuf = 0; sqlite3_int64 sz, got; for(i=1; i<argc; i++){ |
︙ | ︙ | |||
632 633 634 635 636 637 638 | }else{ zBuf[got] = 0; normalizeFile(zBuf); } } sqlite3_free(zBuf); } | | | 689 690 691 692 693 694 695 696 | }else{ zBuf[got] = 0; normalizeFile(zBuf); } } sqlite3_free(zBuf); } #endif /* SQLITE_NORMALIZE_CLI */ |