Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Added docs for the th1 query API. Added basic th1 argv-handling API. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | th1-query-api |
Files: | files | file ages | folders |
SHA1: |
a8eace9a2adf75c160fdaa6bb05bc710 |
User & Date: | stephan 2012-07-14 10:22:43.064 |
Context
2012-07-14
| ||
10:26 | Fixed a memleak in the cleanup of th1 query_prepare statement. ... (check-in: eb4a373e user: stephan tags: th1-query-api) | |
10:22 | Added docs for the th1 query API. Added basic th1 argv-handling API. ... (check-in: a8eace9a user: stephan tags: th1-query-api) | |
10:17 | Minor improvements to the previous find_option() commit. ... (check-in: 23200840 user: stephan tags: th1-query-api) | |
Changes
Changes to src/th_main.c.
︙ | ︙ | |||
431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 | } if( openRepository ) db_find_and_open_repository(OPEN_OK_NOT_FOUND, 0); } Th_SetResult(interp, g.zRepositoryName, -1); return TH_OK; } #ifdef TH_USE_SQLITE static int queryPrepareCmd( Th_Interp *interp, void *p, int argc, const char **argv, int *argl ){ | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 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 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 | } if( openRepository ) db_find_and_open_repository(OPEN_OK_NOT_FOUND, 0); } Th_SetResult(interp, g.zRepositoryName, -1); return TH_OK; } extern const char *find_option(const char *zLong, const char *zShort, int hasArg); /* ** TH Syntax: ** ** argv_len ** ** Returns the number of command-line arguments. */ static int argvArgcCmd( Th_Interp *interp, void *p, int argc, const char **argv, int *argl ){ Th_SetResultInt( interp, g.argc ); return TH_OK; } #define TH_USE_ARGV #ifdef TH_USE_ARGV /* ** TH Syntax: ** ** argv_getat Index ** ** Returns the raw argument at the given index, throwing if ** out of bounds. */ static int argvGetAtCmd( Th_Interp *interp, void *p, int argc, const char **argv, int *argl ){ char const * zVal; int pos = 0; if( argc != 2 ){ return Th_WrongNumArgs(interp, "argv_get Index"); } if( TH_OK != Th_ToInt(interp, argv[1], argl[1], &pos) ){ return TH_ERROR; } if( pos < 0 || pos >= g.argc ){ Th_ErrorMessage(interp, "Argument out of range:", argv[1], argl[1]); return TH_ERROR; } if( 0 == pos ){/*special case*/ zVal = fossil_nameofexe(); }else{ zVal = (pos>0 && pos<g.argc) ? g.argv[pos] : 0; } Th_SetResult( interp, zVal, zVal ? strlen(zVal) : 0 ); return TH_OK; } /* ** TH Syntax: ** ** argv_getstr longName ??shortName? ?defaultValue?? ** ** Functions more or less like Fossil's find_option(). ** If the given argument is found then its value is returned, ** else defaultValue is returned. If that is not set ** and the option is not found, an error is thrown. ** If defaultValue is provided, shortName must also be provided ** but it may be empty. For example: ** ** set foo [argv_getstr foo "" "hi, world"] ** ** ACHTUNG: find_option() removes any entries it finds from ** g.argv, such that future calls to find_option() will not ** find the same option. */ static int argvFindOptionStringCmd( Th_Interp *interp, void *p, int argc, const char **argv, int *argl ){ enum { BufLen = 100 }; char zLong[BufLen] = {0}; char zShort[BufLen] = {0}; char aBuf[BufLen] = {0}; int hasArg; char const * zVal = NULL; char const * zDefault = NULL; if( 1 < argc ){ assert( argl[1] < BufLen ); snprintf( zLong, BufLen, "%s", argv[1] ); } if( (2 < argc) && (0 < argl[2]) ){ assert( argl[2] < BufLen ); snprintf( zShort, BufLen, "%s", argv[2] ); } if( 3 < argc){ zDefault = argv[3]; } if(0 == zLong[0]){ return Th_WrongNumArgs(interp, "argv_getstr longName ?shortName? ?defaultVal?"); } zVal = find_option( zLong, zShort[0] ? zShort : NULL, 1 ); if(!zVal){ zVal = zDefault; if(!zVal){ Th_ErrorMessage(interp, "Option not found and no default provided:", zLong, -1); return TH_ERROR; } } Th_SetResult( interp, zVal, zVal ? strlen(zVal) : 0 ); return TH_OK; } /* ** TH Syntax: ** ** argv_getbool longName ??shortName? ?defaultValue?? ** ** Works just like argv_getstr but treats any empty value or one ** starting with the digit '0' as a boolean false. ** ** Returns the result as an integer 0 (false) or 1 (true). */ static int argvFindOptionBoolCmd( Th_Interp *interp, void *p, int argc, const char **argv, int *argl ){ enum { BufLen = 100 }; char zLong[BufLen] = {0}; char zShort[BufLen] = {0}; char aBuf[BufLen] = {0}; int hasArg; char const * zVal = NULL; char const * zDefault = NULL; int val; int rc; if( 1 < argc ){ assert( argl[1] < BufLen ); snprintf( zLong, BufLen, "%s", argv[1] ); } if( (2 < argc) && (0 < argl[2]) ){ assert( argl[2] < BufLen ); snprintf( zShort, BufLen, "%s", argv[2] ); } if( 3 < argc){ zDefault = argv[3]; } if(0 == zLong[0]){ return Th_WrongNumArgs(interp, "argv_getbool longName ?shortName? ?defaultVal?"); } zVal = find_option( zLong, zShort[0] ? zShort : NULL, 0 ); if(zVal && !*zVal){ zVal = "1"; } if(!zVal){ zVal = zDefault; if(!zVal){ Th_ErrorMessage(interp, "Option not found and no default provided:", zLong, -1); return TH_ERROR; } } if( !*zVal ){ zVal = "0"; } zVal = (zVal && *zVal && (*zVal!='0')) ? zVal : 0; Th_SetResultInt( interp, zVal ? 1 : 0 ); return TH_OK; } /* ** TH Syntax: ** ** argv_getint longName ?shortName? ?defaultValue? */ static int argvFindOptionIntCmd( Th_Interp *interp, void *p, int argc, const char **argv, int *argl ){ enum { BufLen = 100 }; char zLong[BufLen] = {0}; char zShort[BufLen] = {0}; char aBuf[BufLen] = {0}; int hasArg; char const * zVal = NULL; char const * zDefault = NULL; int val = 0; if( 1 < argc ){ assert( argl[1] < BufLen ); snprintf( zLong, BufLen, "%s", argv[1] ); } if( (2 < argc) && (0 < argl[2]) ){ assert( argl[2] < BufLen ); snprintf( zShort, BufLen, "%s", argv[2] ); } if( 3 < argc){ zDefault = argv[3]; } if(0 == zLong[0]){ return Th_WrongNumArgs(interp, "argv_getint longName ?shortName? ?defaultVal?"); } zVal = find_option( zLong, zShort[0] ? zShort : NULL, 0 ); if(!zVal){ zVal = zDefault; if(!zVal){ Th_ErrorMessage(interp, "Option not found and no default provided:", zLong, -1); return TH_ERROR; } } Th_ToInt(interp, zVal, strlen(zVal), &val); Th_SetResultInt( interp, val ); return TH_OK; } #endif /* end TH_USE_ARGV */ #ifdef TH_USE_SQLITE /* ** TH Syntax: ** ** query_prepare SQL ** ** Returns an opaque statement identifier. */ static int queryPrepareCmd( Th_Interp *interp, void *p, int argc, const char **argv, int *argl ){ |
︙ | ︙ | |||
496 497 498 499 500 501 502 503 504 505 506 507 508 509 | Th_ErrorMessage(interp, "no such statement handle:", arg, -1); } } return pStmt; } static int queryFinalizeCmd( Th_Interp *interp, void *p, int argc, const char **argv, int *argl ){ | > > > > > > > | 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 | Th_ErrorMessage(interp, "no such statement handle:", arg, -1); } } return pStmt; } /* ** TH Syntax: ** ** query_finalize stmtId ** ** sqlite3_finalize()s the given statement. */ static int queryFinalizeCmd( Th_Interp *interp, void *p, int argc, const char **argv, int *argl ){ |
︙ | ︙ | |||
521 522 523 524 525 526 527 528 529 530 531 532 533 534 | } assert( NULL != pStmt ); rc = Th_FinalizeStmt( interp, rc ); Th_SetResultInt( interp, rc ); return TH_OK; } static int queryReportDbErr( Th_Interp * interp ){ char const * msg = sqlite3_errmsg( g.db ); Th_ErrorMessage(interp, "db error:", msg, -1); return TH_ERROR; } /* | > > > | 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 | } assert( NULL != pStmt ); rc = Th_FinalizeStmt( interp, rc ); Th_SetResultInt( interp, rc ); return TH_OK; } /* ** Reports the current sqlite3_errmsg() via TH and returns TH_ERROR. */ static int queryReportDbErr( Th_Interp * interp ){ char const * msg = sqlite3_errmsg( g.db ); Th_ErrorMessage(interp, "db error:", msg, -1); return TH_ERROR; } /* |
︙ | ︙ | |||
573 574 575 576 577 578 579 580 581 582 583 584 585 586 | if( pIndex ){ *pIndex = index; } return 0; } } static int queryStepCmd( Th_Interp *interp, void *p, int argc, const char **argv, int *argl ){ | > > > > > > > > | 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 | if( pIndex ){ *pIndex = index; } return 0; } } /* ** TH Syntax: ** ** query_step stmtId ** ** Steps the given statement handle. Returns 0 at the end of the set, ** a positive value if it fetches a row, and throws on error. */ static int queryStepCmd( Th_Interp *interp, void *p, int argc, const char **argv, int *argl ){ |
︙ | ︙ | |||
604 605 606 607 608 609 610 611 612 613 614 615 616 617 | default: return queryReportDbErr( interp ); } Th_SetResultInt( interp, rc ); return TH_OK; } static int queryColStringCmd( Th_Interp *interp, void *p, int argc, const char **argv, int *argl ){ | > > > > > > > | 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 | default: return queryReportDbErr( interp ); } Th_SetResultInt( interp, rc ); return TH_OK; } /* ** TH Syntax: ** ** query_col_string stmtId Index ** ** Returns the result column value at the given 0-based index. */ static int queryColStringCmd( Th_Interp *interp, void *p, int argc, const char **argv, int *argl ){ |
︙ | ︙ | |||
628 629 630 631 632 633 634 635 636 637 638 639 640 641 | } val = sqlite3_column_text( pStmt, index ); valLen = val ? sqlite3_column_bytes( pStmt, index ) : 0; Th_SetResult( interp, val, valLen ); return TH_OK; } static int queryColIntCmd( Th_Interp *interp, void *p, int argc, const char **argv, int *argl ){ | > > > > > > > | 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 | } val = sqlite3_column_text( pStmt, index ); valLen = val ? sqlite3_column_bytes( pStmt, index ) : 0; Th_SetResult( interp, val, valLen ); return TH_OK; } /* ** TH Syntax: ** ** query_col_int stmtId Index ** ** Returns the result column value at the given 0-based index. */ static int queryColIntCmd( Th_Interp *interp, void *p, int argc, const char **argv, int *argl ){ |
︙ | ︙ | |||
649 650 651 652 653 654 655 656 657 658 659 660 661 662 | if(index < 0){ return TH_ERROR; } Th_SetResultInt( interp, sqlite3_column_int( pStmt, index ) ); return TH_OK; } static int queryColDoubleCmd( Th_Interp *interp, void *p, int argc, const char **argv, int *argl ){ | > > > > > > > | 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 | if(index < 0){ return TH_ERROR; } Th_SetResultInt( interp, sqlite3_column_int( pStmt, index ) ); return TH_OK; } /* ** TH Syntax: ** ** query_col_double stmtId Index ** ** Returns the result column value at the given 0-based index. */ static int queryColDoubleCmd( Th_Interp *interp, void *p, int argc, const char **argv, int *argl ){ |
︙ | ︙ | |||
670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 | if(index < 0){ return TH_ERROR; } Th_SetResultDouble( interp, sqlite3_column_double( pStmt, index ) ); return TH_OK; } static int queryColIsNullCmd( Th_Interp *interp, void *p, int argc, const char **argv, int *argl ){ sqlite3_stmt * pStmt = NULL; double rc = 0; int index = -1; if( argc!=3 ){ return Th_WrongNumArgs(interp, "query_col_is_null StmtHandle Index"); } queryStmtIndexArgs(interp, argc, argv, argl, &pStmt, &index); if(index < 0){ return TH_ERROR; } | > > > > > > > > > | > > > > > > > > > > | 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 | if(index < 0){ return TH_ERROR; } Th_SetResultDouble( interp, sqlite3_column_double( pStmt, index ) ); return TH_OK; } /* ** TH Syntax: ** ** query_col_is_null stmtId Index ** ** Returns non-0 if the given 0-based result column index contains ** an SQL NULL value, else returns 0. */ static int queryColIsNullCmd( Th_Interp *interp, void *p, int argc, const char **argv, int *argl ){ sqlite3_stmt * pStmt = NULL; double rc = 0; int index = -1; if( argc!=3 ){ return Th_WrongNumArgs(interp, "query_col_is_null StmtHandle Index"); } queryStmtIndexArgs(interp, argc, argv, argl, &pStmt, &index); if(index < 0){ return TH_ERROR; } Th_SetResultInt( interp, SQLITE_NULL==sqlite3_column_type( pStmt, index ) ? 1 : 0); return TH_OK; } /* ** TH Syntax: ** ** query_col_type stmtId Index ** ** Returns the sqlite type identifier for the given 0-based result ** column index. The values are available in TH as $SQLITE_NULL, ** $SQLITE_INTEGER, etc. */ static int queryColTypeCmd( Th_Interp *interp, void *p, int argc, const char **argv, int *argl ){ |
︙ | ︙ | |||
712 713 714 715 716 717 718 719 720 721 722 723 724 725 | if(index < 0){ return TH_ERROR; } Th_SetResultInt( interp, sqlite3_column_type( pStmt, index ) ); return TH_OK; } static int queryColCountCmd( Th_Interp *interp, void *p, int argc, const char **argv, int *argl ){ | > > > > > > > | 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 | if(index < 0){ return TH_ERROR; } Th_SetResultInt( interp, sqlite3_column_type( pStmt, index ) ); return TH_OK; } /* ** TH Syntax: ** ** query_col_count stmtId ** ** Returns the number of result columns in the query. */ static int queryColCountCmd( Th_Interp *interp, void *p, int argc, const char **argv, int *argl ){ |
︙ | ︙ | |||
733 734 735 736 737 738 739 740 741 742 743 744 745 746 | return TH_ERROR; } rc = sqlite3_column_count( pStmt ); Th_SetResultInt( interp, rc ); return TH_OK; } static int queryColNameCmd( Th_Interp *interp, void *p, int argc, const char **argv, int *argl ){ | > > > > > > > | 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 | return TH_ERROR; } rc = sqlite3_column_count( pStmt ); Th_SetResultInt( interp, rc ); return TH_OK; } /* ** TH Syntax: ** ** query_col_count stmtId Index ** ** Returns the result column name at the given 0-based index. */ static int queryColNameCmd( Th_Interp *interp, void *p, int argc, const char **argv, int *argl ){ |
︙ | ︙ | |||
765 766 767 768 769 770 771 772 773 774 775 776 777 778 | return TH_ERROR; }else{ Th_SetResult( interp, val, strlen( val ) ); return TH_OK; } } static int queryBindNullCmd( Th_Interp *interp, void *p, int argc, const char **argv, int *argl ){ | > > > > > > > | 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 | return TH_ERROR; }else{ Th_SetResult( interp, val, strlen( val ) ); return TH_OK; } } /* ** TH Syntax: ** ** query_bind_null stmtId Index ** ** Binds a value to the given 1-based parameter index. */ static int queryBindNullCmd( Th_Interp *interp, void *p, int argc, const char **argv, int *argl ){ |
︙ | ︙ | |||
791 792 793 794 795 796 797 798 799 800 801 802 803 804 | return queryReportDbErr( interp ); } Th_SetResultInt( interp, 0 ); return TH_OK; } static int queryBindStringCmd( Th_Interp *interp, void *p, int argc, const char **argv, int *argl ){ | > > > > > > > | 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 | return queryReportDbErr( interp ); } Th_SetResultInt( interp, 0 ); return TH_OK; } /* ** TH Syntax: ** ** query_bind_string stmtId Index Value ** ** Binds a value to the given 1-based parameter index. */ static int queryBindStringCmd( Th_Interp *interp, void *p, int argc, const char **argv, int *argl ){ |
︙ | ︙ | |||
816 817 818 819 820 821 822 823 824 825 826 827 828 829 | if(rc){ return queryReportDbErr( interp ); } Th_SetResultInt( interp, 0 ); return TH_OK; } static int queryBindIntCmd( Th_Interp *interp, void *p, int argc, const char **argv, int *argl ){ | > > > > > > > | 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 | if(rc){ return queryReportDbErr( interp ); } Th_SetResultInt( interp, 0 ); return TH_OK; } /* ** TH Syntax: ** ** query_bind_int stmtId Index Value ** ** Binds a value to the given 1-based parameter index. */ static int queryBindIntCmd( Th_Interp *interp, void *p, int argc, const char **argv, int *argl ){ |
︙ | ︙ | |||
846 847 848 849 850 851 852 853 854 855 856 857 858 859 | if(rc){ return queryReportDbErr( interp ); } Th_SetResultInt( interp, 0 ); return TH_OK; } static int queryBindDoubleCmd( Th_Interp *interp, void *p, int argc, const char **argv, int *argl ){ | > > > > > > > | 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 | if(rc){ return queryReportDbErr( interp ); } Th_SetResultInt( interp, 0 ); return TH_OK; } /* ** TH Syntax: ** ** query_bind_double stmtId Index Value ** ** Binds a value to the given 1-based parameter index. */ static int queryBindDoubleCmd( Th_Interp *interp, void *p, int argc, const char **argv, int *argl ){ |
︙ | ︙ | |||
888 889 890 891 892 893 894 | ** it has not been already. ** ** The interpreter is stored in the g.interp global variable. */ void Th_FossilInit(void){ static PutsCmdData puts_Html = {0, 0, 0}; static PutsCmdData puts_Normal = {1, 0, 0}; | < < > > > > > > > > > > | | | | 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 | ** it has not been already. ** ** The interpreter is stored in the g.interp global variable. */ void Th_FossilInit(void){ static PutsCmdData puts_Html = {0, 0, 0}; static PutsCmdData puts_Normal = {1, 0, 0}; static struct _Command { const char *zName; Th_CommandProc xProc; void *pContext; } aCommand[] = { {"anycap", anycapCmd, 0}, {"combobox", comboboxCmd, 0}, {"enable_output", enableOutputCmd, 0}, {"linecount", linecntCmd, 0}, {"hascap", hascapCmd, 0}, {"hasfeature", hasfeatureCmd, 0}, {"htmlize", htmlizeCmd, 0}, {"date", dateCmd, 0}, {"html", putsCmd, &puts_Html}, {"puts", putsCmd, &puts_Normal}, {"wiki", wikiCmd, 0}, {"repository", repositoryCmd, 0}, #ifdef TH_USE_ARGV {"argv_len", argvArgcCmd, 0}, {"argv_getat", argvGetAtCmd, 0}, {"argv_getstr", argvFindOptionStringCmd, 0}, {"argv_getbool", argvFindOptionBoolCmd, 0}, {"argv_getint", argvFindOptionIntCmd, 0}, #endif #ifdef TH_USE_SQLITE {"query_bind_int", queryBindIntCmd, 0}, {"query_bind_double", queryBindDoubleCmd,0}, {"query_bind_null", queryBindNullCmd, 0}, {"query_bind_string", queryBindStringCmd,0}, {"query_col_count", queryColCountCmd, 0}, {"query_col_double", queryColDoubleCmd, 0}, {"query_col_int", queryColIntCmd, 0}, {"query_col_is_null", queryColIsNullCmd, 0}, {"query_col_name", queryColNameCmd, 0}, {"query_col_string", queryColStringCmd, 0}, {"query_col_type", queryColTypeCmd, 0}, {"query_finalize", queryFinalizeCmd, 0}, {"query_prepare", queryPrepareCmd, 0}, {"query_step", queryStepCmd, 0}, #endif {0, 0, 0} }; if( g.interp==0 ){ int i; g.interp = Th_CreateInterp(&vtab); th_register_language(g.interp); /* Basic scripting commands. */ #ifdef FOSSIL_ENABLE_TCL if( getenv("TH1_ENABLE_TCL")!=0 || db_get_boolean("tcl", 0) ){ th_register_tcl(g.interp, &g.tcl); /* Tcl integration commands. */ } #endif for(i=0; i<sizeof(aCommand)/sizeof(aCommand[0]); i++){ if ( !aCommand[i].zName || !aCommand[i].xProc ) continue; Th_CreateCommand(g.interp, aCommand[i].zName, aCommand[i].xProc, aCommand[i].pContext, 0); } #ifdef TH_USE_SQLITE { enum { BufLen = 100 }; char buf[BufLen]; int i, l; #define SET(K) l = snprintf(buf, BufLen, "%d", K); \ Th_SetVar( g.interp, #K, strlen(#K), buf, l ); SET(SQLITE_BLOB); SET(SQLITE_DONE); SET(SQLITE_ERROR); SET(SQLITE_FLOAT); SET(SQLITE_INTEGER); SET(SQLITE_NULL); SET(SQLITE_OK); |
︙ | ︙ | |||
1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 | sendText(z, i, 0); } return rc; } /* ** COMMAND: test-th-render */ void test_th_render(void){ Blob in; if( g.argc<3 ){ usage("FILE"); } | > > > > > > > > > < > | 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 1481 1482 1483 1484 1485 1486 1487 1488 | sendText(z, i, 0); } return rc; } /* ** COMMAND: test-th-render ** COMMAND: th1 ** ** Processes a file provided on the command line as a TH1-capable ** script/page. Output is sent to stdout or the CGI output buffer, as ** appropriate. The input file is assumed to be text/wiki/HTML content ** which may contain TH1 tag blocks. Each block is executed in the ** same TH1 interpreter instance. ** */ void test_th_render(void){ Blob in; if( g.argc<3 ){ usage("FILE"); assert(0 && "usage() does not return"); } blob_zero(&in); db_open_config(0); /* Needed for global "tcl" setting. */ db_find_and_open_repository(OPEN_ANY_SCHEMA,0) /* for query_xxx tests. */; blob_read_from_file(&in, g.argv[2]); Th_Render(blob_str(&in)); } |
Changes to test/th1-query-api-1.th1.
︙ | ︙ | |||
23 24 25 26 27 28 29 | } set a [xyz] puts "a=${a}" ! \n set stmt [query_prepare {SELECT login, cap FROM user}] set colCount [query_col_count $stmt] puts "query column count: ${colCount}\n" | < | < < | 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 | } set a [xyz] puts "a=${a}" ! \n set stmt [query_prepare {SELECT login, cap FROM user}] set colCount [query_col_count $stmt] puts "query column count: ${colCount}\n" puts "stmt id=${stmt}\n" proc noop {} {} proc incr {name {step 1}} { upvar $name x set x [expr $x+$step] } |
︙ | ︙ | |||
57 58 59 60 61 62 63 | puts $colNames($i) = [query_col_string $stmt $i] } puts "\n" } unset row query_finalize $stmt | < | 54 55 56 57 58 59 60 61 62 63 64 65 66 67 | puts $colNames($i) = [query_col_string $stmt $i] } puts "\n" } unset row query_finalize $stmt proc query_step_each {{stmt} {callback}} { set colNames(0) 0 set colCount [query_col_count $stmt] for {set i 0} {$i < $colCount} {incr i} { set colNames($i) [query_col_name $stmt $i] |
︙ | ︙ | |||
115 116 117 118 119 120 121 122 123 | #set consts $SQLITE_CONSTANTS puts consts = $consts "\n" for {set i 0} {$i < [llength $consts]} {incr i} { set x [lindex $consts $i] puts \$$x = [expr \$$x] "\n" } puts "If you got this far, you win!\n" </th1> | > > > > > > > > > > > > > > > > > > > | 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 | #set consts $SQLITE_CONSTANTS puts consts = $consts "\n" for {set i 0} {$i < [llength $consts]} {incr i} { set x [lindex $consts $i] puts \$$x = [expr \$$x] "\n" } set ARGC [argv_len] puts ARGC = $ARGC "\n" for {set i 0} {$i < $ARGC} {incr i} { puts "argv_getat $i = " [argv_getat $i] \n } set magicDefault hi set optA [argv_getstr AA a $magicDefault] puts "argv_getstr AA = " $optA \n set optA [argv_getbool BB b 0] puts "argv_getbool BB = " $optA \n set exception 0 catch { argv_getint noSuchOptionAndNoDefault } exception puts exception = $exception "\n" puts "If you got this far, you win!\n" </th1> |