Menu
▾
▴
SF.net SVN: frontierkernel: [1717] ODBs/trunk/frontierRoot/system/verbs/ builtins/mySql
|
From: <cre...@us...> - 2007-07-20 19:51:38
|
Revision: 1717
http://frontierkernel.svn.sourceforge.net/frontierkernel/?rev=1717&view=rev
Author: creecode
Date: 2007-07-20 12:51:39 -0700 (Fri, 20 Jul 2007)
Log Message:
-----------
minor tweaks, tighten up language, references, no functional changes
Modified Paths:
--------------
ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/easyQuery.fvc
ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/examples/query.fvc
ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getTableNames.fvc
Modified: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/easyQuery.fvc
===================================================================
--- ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/easyQuery.fvc 2007-07-11 05:28:22 UTC (rev 1716)
+++ ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/easyQuery.fvc 2007-07-20 19:51:39 UTC (rev 1717)
@@ -1,34 +1,28 @@
FrontierVcsFile:3:scpt:system.verbs.builtins.mySql.easyQuery
-on easyQuery ( databaseId, queryString, maxRows = 0 ) {
+on easyQuery ( databaseId, query, maxRows = 0 ) {
«Changes
+ «7/20/07; 12:38:56 PM by TAC
+ «changed method for checking if maxRows is a number
«6/2/07; 12:00:00 AM by DG
- «only get rows if compiledQuery is greater than zero
+ «only get rows if queryId is greater than zero
«5/29/07; 12:00:00 AM by DG
«created
- local ( compiledQuery, dataSet = { }, row, rowCount = 0 );
+ local ( queryId, dataSet = { }, row, rowCount = 0 );
- on isNum ( s ) {
- local ( ch, i );
-
- for i = 1 to string.length ( s ) {
- ch = string.mid ( s, i, 1 );
-
- if ( ch < '0' ) or ( ch > '9' ) {
- return ( false )}};
-
- return ( true )};
+ bundle { // is maxRow a number?
+ try {
+ number ( maxRows )}
+ else {
+ scriptError ( "mySql.easyQuery requires a numeric value for maxRows." )}};
- if not ( isNum ( maxRows ) ) {
- scriptError ( "mySql.easyQuery requires a numeric value for maxRows." )};
+ queryId = mySql.compileQuery ( databaseId, query ); // this will scriptError on its own if it fails
- compiledQuery = mySql.compileQuery ( databaseId, queryString ); // this will scriptError on its own if it fails
-
- if compiledQuery > 0 {
+ if queryId > 0 {
loop {
- result = mySql.getRow ( compiledQuery );
+ result = mySql.getRow ( queryId );
if result == 0 { // MySQL's code for no more rows
break};
@@ -40,7 +34,7 @@
dataSet [ rowCount ] = result};
- mySql.clearQuery ( compiledQuery )};
+ mySql.clearQuery ( queryId )};
return ( dataSet )}
Modified: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/examples/query.fvc
===================================================================
--- ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/examples/query.fvc 2007-07-11 05:28:22 UTC (rev 1716)
+++ ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/examples/query.fvc 2007-07-20 19:51:39 UTC (rev 1717)
@@ -4,21 +4,18 @@
«5/29/07; 12:00:00 AM by DG
«created
-local ( databaseId, databaseName = "States", password = "", port = 3306, queryId, result, server = "127.0.0.1", user = "root" );
+local ( databaseId, databaseName = "States", host = "127.0.0.1", password = "", port = 3306, query = "SELECT * FROM States", queryId, result, user = "root" );
result = mySql.init ( );
-databaseId = mySql.connect ( server, user, password, databaseName, port );
+databaseId = mySql.connect ( host, user, password, databaseName, port );
if mySql.getDatabaseNames ( databaseId ) contains "States" {
- queryId = mySql.compileQuery ( databaseId, "select * from States" );
+ queryId = mySql.compileQuery ( databaseId, query );
dialog.alert ( "Selected row count: " + mySql.getSelectedRowCount ( queryId ) );
-
dialog.alert ( "Column count: " + mySql.getColumnCount ( databaseId ) );
-
dialog.alert ( "Query warnings: " + mySql.getQueryWarningCount ( databaseId ) );
-
dialog.alert ( "Query info: " + mySql.getQueryInfo ( databaseId ) );
loop {
@@ -33,7 +30,7 @@
result = mySql.close ( databaseId );
- result = mysql.end ( );
+ result = mySql.end ( );
msg ( result )}
else {
Modified: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getTableNames.fvc
===================================================================
--- ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getTableNames.fvc 2007-07-11 05:28:22 UTC (rev 1716)
+++ ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getTableNames.fvc 2007-07-20 19:51:39 UTC (rev 1717)
@@ -6,12 +6,12 @@
«5/29/07; 12:00:00 AM by DG
«created
- local ( compiledQuery, dataSet = { }, query = "SHOW tables", result, rowCount = 1, rowList );
+ local ( dataSet = { }, query = "SHOW tables", queryId, result, rowCount = 1, rowList );
- compiledQuery = mySql.compileQuery ( databaseId, query );
+ queryId = mySql.compileQuery ( databaseId, query );
loop {
- result = mySql.getRow ( compiledQuery );
+ result = mySql.getRow ( queryId );
if result == 0 {
break};
@@ -20,7 +20,7 @@
++rowCount};
- mySql.clearQuery ( compiledQuery );
+ mySql.clearQuery ( queryId );
return ( dataSet )}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
